Merge branch 'stable'

* stable:
  (maint) remove unneeded imports
  (GH-258) FileTypeDetectorService

src/chocolatey.console/Program.cs

@@ -17,15 +17,13 @@ namespace chocolatey.console
 {
     using System;
     using System.Collections.Generic;
-    using System.Diagnostics.CodeAnalysis;
     using System.IO;
     using System.Linq;
     using infrastructure.adapters;
     using infrastructure.app;
     using infrastructure.app.builders;
     using infrastructure.app.configuration;
     using infrastructure.app.runners;
-    using infrastructure.app.services;
     using infrastructure.commandline;
     using infrastructure.configuration;
     using infrastructure.extractors;

src/chocolatey.resources/chocolatey.resources.csproj

@@ -128,6 +128,9 @@
   <ItemGroup>
     <EmbeddedResource Include="helpers\functions\Get-ToolsLocation.ps1" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="tools\die.zip" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.

src/chocolatey/chocolatey.csproj

@@ -89,6 +89,8 @@
     <Compile Include="infrastructure.app\domain\installers\IzPackInstaller.cs" />
     <Compile Include="infrastructure.app\domain\RegistryValueKindType.cs" />
     <Compile Include="infrastructure.app\events\HandlePackageResultCompletedMessage.cs" />
+    <Compile Include="infrastructure.app\services\FileTypeDetectorService.cs" />
+    <Compile Include="infrastructure.app\services\IFileTypeDetectorService.cs" />
     <Compile Include="infrastructure\commandline\ReadKeyTimeout.cs" />
     <Compile Include="infrastructure\commands\Execute.cs" />
     <Compile Include="GetChocolatey.cs" />

src/chocolatey/infrastructure.app/registration/ContainerBinding.cs

@@ -63,6 +63,7 @@ public void RegisterComponents(Container container)
             container.Register<IChocolateyConfigSettingsService, ChocolateyConfigSettingsService>(Lifestyle.Singleton);
             container.Register<IChocolateyPackageService, ChocolateyPackageService>(Lifestyle.Singleton);
             container.Register<IAutomaticUninstallerService, AutomaticUninstallerService>(Lifestyle.Singleton);
+            container.Register<IFileTypeDetectorService, FileTypeDetectorService>(Lifestyle.Singleton);
             container.Register<ICommandExecutor, CommandExecutor>(Lifestyle.Singleton);
             container.Register(() => new CustomString(string.Empty));
 

src/chocolatey/infrastructure.app/services/FileTypeDetectorService.cs

@@ -0,0 +1,110 @@
+// Copyright © 2011 - Present RealDimensions Software, LLC
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// 
+// You may obtain a copy of the License at
+// 
+// 	http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+namespace chocolatey.infrastructure.app.services
+{
+    using System;
+    using System.Runtime.InteropServices;
+    using System.Security;
+    using System.Text;
+    using configuration;
+    using filesystem;
+    using infrastructure.commands;
+    using platforms;
+
+    public class FileTypeDetectorService : IFileTypeDetectorService
+    {
+        private readonly IFileSystem _fileSystem;
+        private readonly ChocolateyConfiguration _configuration;
+
+        private const int DIE_SHOWERRORS = 0x00000001;
+        private const int DIE_SHOWOPTIONS = 0x00000002;
+        private const int DIE_SHOWVERSION = 0x00000004;
+        private const int DIE_SHOWENTROPY = 0x00000008;
+        private const int DIE_SINGLELINEOUTPUT = 0x00000010;
+        private const int DIE_SHOWFILEFORMATONCE = 0x00000020;
+
+        public FileTypeDetectorService(IFileSystem fileSystem, ChocolateyConfiguration configuration)
+        {
+            _fileSystem = fileSystem;
+            _configuration = configuration;
+        }
+
+        //http://stackoverflow.com/a/8861895/18475
+        //http://stackoverflow.com/a/2864714/18475
+        [DllImport("kernel32.dll", SetLastError = true)]
+        private static extern bool SetDllDirectory(string lpPathName);
+
+        public struct DieInternal
+        {
+            [SuppressUnmanagedCodeSecurity]
+            [DllImport("diedll", CallingConvention = CallingConvention.StdCall, EntryPoint = "_DIE_scanExW@20", SetLastError = true)]
+            internal static extern int scanExW_0([MarshalAs(UnmanagedType.LPWStr)] string pwszFileName, sbyte[] pszOutBuffer, int nOutBufferSize, uint nFlags, [MarshalAs(UnmanagedType.LPWStr)] string pwszDataBase);
+        }
+
+        public string scan_file(string filePath)
+        {
+            var dieDllLocation = _fileSystem.combine_paths(ApplicationParameters.InstallLocation, "tools", "detector");
+            var databaseLocation = _fileSystem.combine_paths(ApplicationParameters.InstallLocation, "tools", "detector", "db");
+            if (!_fileSystem.directory_exists(databaseLocation))
+            {
+                var dieZipLocation = _fileSystem.combine_paths(ApplicationParameters.InstallLocation, "tools", "die.zip");
+                unzip_die_files(dieZipLocation, dieDllLocation);
+            }
+
+            filePath = _fileSystem.get_full_path(filePath);
+
+            if (Platform.get_platform() != PlatformType.Windows)
+            {
+                this.Log().Debug("Unable to detect file types when not on Windows");
+                return string.Empty;
+            }
+            if (!_fileSystem.file_exists(filePath))
+            {
+                this.Log().Warn("File not found at '{0}'. Unable to detect type for inexistent file.".format_with(filePath));
+                return string.Empty;
+            }
+
+            try
+            {
+                var successPath = SetDllDirectory(dieDllLocation);
+                var outputBuffer = new sbyte[1024];
+                int outputBufferSize = outputBuffer.Length;
+                const uint flags = DIE_SINGLELINEOUTPUT;
+
+                var success = DieInternal.scanExW_0(filePath, outputBuffer, outputBufferSize, flags, databaseLocation);
+                byte[] outputBytes = Array.ConvertAll(outputBuffer, (a) => (byte)a);
+
+                //http://stackoverflow.com/a/2581397/18475
+                // var output = Encoding.UTF8.GetString(outputBytes).Replace("\0", string.Empty).trim_safe();
+                var output = Encoding.UTF8.GetString(outputBytes).to_string().Trim('\0');
+
+                return output;
+            }
+            catch (Exception ex)
+            {
+                this.Log().Warn("Unable to detect type for '{0}':{1} {2}".format_with(_fileSystem.get_file_name(filePath), Environment.NewLine, ex.Message));
+                return string.Empty;
+            }
+        }
+
+        private void unzip_die_files(string zipPath, string extractDirectory)
+        {
+            //todo: replace with https://github.com/adamhathcock/sharpcompress
+            var sevenZip = _fileSystem.combine_paths(ApplicationParameters.InstallLocation, "tools", "7za.exe");
+            CommandExecutor.execute_static(sevenZip, "x -aoa -o\"{0}\" -y \"{1}\"".format_with(extractDirectory, zipPath), 30, _fileSystem.get_current_directory(), (s, e) => { }, (s, e) => { }, false, false);
+        }
+    }
+}

src/chocolatey/infrastructure.app/services/IFileTypeDetectorService.cs

@@ -0,0 +1,30 @@
+// Copyright © 2011 - Present RealDimensions Software, LLC
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// 
+// You may obtain a copy of the License at
+// 
+// 	http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+namespace chocolatey.infrastructure.app.services
+{
+    /// <summary>
+    /// Detects file types.
+    /// </summary>
+    public interface IFileTypeDetectorService
+    {
+        /// <summary>
+        /// Detects file types and returns the output for further parsing.
+        /// </summary>
+        /// <param name="filePath">The file path.</param>
+        /// <returns>The results of detecting the file type</returns>
+        string scan_file(string filePath);
+    }
+}