Add support for more archive types using 7zip

src/Files.FullTrust/MessageHandlers/Win32MessageHandler.cs

@@ -81,7 +81,8 @@ public async Task ParseArgumentsAsync(PipeStream connection, Dictionary<string,
                     var fileIconPath = (string)message["filePath"];
                     var thumbnailSize = (int)(long)message["thumbnailSize"];
                     var isOverlayOnly = (bool)message["isOverlayOnly"];
-                    var (icon, overlay) = await Win32API.StartSTATask(() => Win32API.GetFileIconAndOverlay(fileIconPath, thumbnailSize, true, isOverlayOnly));
+                    var isFolder = (bool)message["isFolder"];
+                    var (icon, overlay) = await Win32API.StartSTATask(() => Win32API.GetFileIconAndOverlay(fileIconPath, thumbnailSize, isFolder, true, isOverlayOnly));
                     await Win32API.SendMessageAsync(connection, new ValueSet()
                     {
                         { "Icon", icon },
@@ -92,7 +93,8 @@ public async Task ParseArgumentsAsync(PipeStream connection, Dictionary<string,
                 case "GetIconWithoutOverlay":
                     var fileIconPath2 = (string)message["filePath"];
                     var thumbnailSize2 = (int)(long)message["thumbnailSize"];
-                    var icon2 = await Win32API.StartSTATask(() => Win32API.GetFileIconAndOverlay(fileIconPath2, thumbnailSize2, false));
+                    var isFolder2 = (bool)message["isFolder"];
+                    var icon2 = await Win32API.StartSTATask(() => Win32API.GetFileIconAndOverlay(fileIconPath2, thumbnailSize2, isFolder2, false));
                     await Win32API.SendMessageAsync(connection, new ValueSet()
                     {
                         { "Icon", icon2.icon },

src/Files.FullTrust/Win32API.cs

@@ -163,7 +163,7 @@ public static string[] CommandLineToArgs(string commandLine)
 
         private static readonly object lockObject = new object();
 
-        public static (string icon, string overlay) GetFileIconAndOverlay(string path, int thumbnailSize, bool getOverlay = true, bool onlyGetOverlay = false)
+        public static (string icon, string overlay) GetFileIconAndOverlay(string path, int thumbnailSize, bool isFolder, bool getOverlay = true, bool onlyGetOverlay = false)
         {
             string iconStr = null, overlayStr = null;
 
@@ -195,8 +195,7 @@ public static (string icon, string overlay) GetFileIconAndOverlay(string path, i
                 var useFileAttibutes = !onlyGetOverlay && iconStr == null; // Cannot access file, use file attributes
                 var ret = ShellFolderExtensions.GetStringAsPidl(path, out var pidl) ? 
                     Shell32.SHGetFileInfo(pidl, 0, ref shfi, Shell32.SHFILEINFO.Size, Shell32.SHGFI.SHGFI_PIDL | flags) :
-                    // TODO: pass FileAttributes.Directory for folders (add "isFolder" parameter)
-                    Shell32.SHGetFileInfo(path, 0, ref shfi, Shell32.SHFILEINFO.Size, flags | (useFileAttibutes ? Shell32.SHGFI.SHGFI_USEFILEATTRIBUTES : 0));
+                    Shell32.SHGetFileInfo(path, isFolder ? FileAttributes.Directory : 0, ref shfi, Shell32.SHFILEINFO.Size, flags | (useFileAttibutes ? Shell32.SHGFI.SHGFI_USEFILEATTRIBUTES : 0));
                 if (ret == IntPtr.Zero)
                 {
                     return (iconStr, null);
@@ -235,6 +234,13 @@ public static (string icon, string overlay) GetFileIconAndOverlay(string path, i
                                 }
                             }
                         }
+                        else if (isFolder)
+                        {
+                            // Could not icon, load generic icon
+                            var icons = ExtractSelectedIconsFromDLL(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.System), "imageres.dll"), new[] { 2 }, thumbnailSize);
+                            var generic = icons.SingleOrDefault(x => x.Index == 2);
+                            iconStr = generic?.IconData;
+                        }
                         else
                         {
                             // Could not icon, load generic icon

src/Files.Package/Files.Package.wapproj

@@ -100,6 +100,12 @@
     <ProjectReference Include="..\Files.FullTrust\Files.FullTrust.csproj" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="7z.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="7z64.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Assets\AppTilesDev\BadgeLogo.scale-100.png" />
     <Content Include="Assets\AppTilesDev\BadgeLogo.scale-125.png" />
     <Content Include="Assets\AppTilesDev\BadgeLogo.scale-150.png" />
@@ -482,11 +488,11 @@
     <Content Include="Assets\AppTilesDev\Wide310x150Logo.scale-150.png" />
     <Content Include="Assets\AppTilesDev\Wide310x150Logo.scale-200.png" />
     <Content Include="Assets\AppTilesDev\Wide310x150Logo.scale-400.png" />
+    <None Include="nupkgs\SevenZipSharp.1.0.0.nupkg" />
     <Content Include="Package.appinstaller" />
   </ItemGroup>
   <ItemGroup>
     <None Include="nupkgs\microsoft.management.infrastructure.runtime.win.2.0.1.nupkg" />
-    <None Include="nupkgs\SharpZipLib.1.3.4.nupkg" />
   </ItemGroup>
   <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
 </Project>

src/Files.Package/Package.appxmanifest

@@ -69,9 +69,12 @@
               </uap5:Extension>
               <Extension Category="windows.updateTask" EntryPoint="BackgroundTasks.UpdateTask" />
               <uap:Extension Category="windows.fileTypeAssociation">
-                <uap:FileTypeAssociation Name="zip">
+                <uap:FileTypeAssociation Name="archives">
                   <uap:SupportedFileTypes>
                     <uap:FileType>.zip</uap:FileType>
+                    <uap:FileType>.7z</uap:FileType>
+                    <uap:FileType>.rar</uap:FileType>
+                    <uap:FileType>.tar</uap:FileType>
                   </uap:SupportedFileTypes>
                 </uap:FileTypeAssociation>
               </uap:Extension>

src/Files.Shared/Extensions/LinqExtensions.cs

@@ -42,6 +42,24 @@ public static class LinqExtensions
             return defaultValue;
         }
 
+        public static async Task<TValue?> GetAsync<TKey, TValue>(this IDictionary<TKey, TValue> dictionary, TKey key, Func<Task<TValue?>> defaultValueFunc)
+        {
+            if (dictionary is null || key is null)
+            {
+                return await defaultValueFunc();
+            }
+            if (!dictionary.ContainsKey(key))
+            {
+                var defaultValue = await defaultValueFunc();
+                if (defaultValue is TValue value)
+                {
+                    dictionary.Add(key, value);
+                }
+                return defaultValue;
+            }
+            return dictionary[key];
+        }
+
         public static async Task<IEnumerable<T>> WhereAsync<T>(this IEnumerable<T> source, Func<T, Task<bool>> predicate)
         {
             var results = await Task.WhenAll(source.Select(async x => (x, await predicate(x))));

src/Files.Uwp/Files.Uwp.csproj

@@ -1594,15 +1594,12 @@
     <PackageReference Include="Newtonsoft.Json">
       <Version>13.0.1</Version>
     </PackageReference>
-    <PackageReference Include="SharpZipLib">
-      <Version>1.3.4</Version>
+    <PackageReference Include="SevenZipSharp">
+      <Version>1.0.0</Version>
     </PackageReference>
     <PackageReference Include="SQLitePCLRaw.bundle_green">
       <Version>2.1.0</Version>
     </PackageReference>
-    <PackageReference Include="Ude.NetStandard">
-      <Version>1.2.0</Version>
-    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <AppxManifest Include="..\Files.Package\Package.appxmanifest">
@@ -1628,7 +1625,6 @@
       <Name>Windows Desktop Extensions for the UWP</Name>
     </SDKReference>
   </ItemGroup>
-  <ItemGroup />
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '17.0' ">
     <VisualStudioVersion>17.0</VisualStudioVersion>
   </PropertyGroup>

src/Files.Uwp/Filesystem/BaseStorage/BaseStorageFile.cs

@@ -95,7 +95,7 @@ public static IAsyncOperation<BaseStorageFile> GetFileFromPathAsync(string path)
 
         public async Task<string> ReadTextAsync(int maxLength = -1)
         {
-            using var inputStream = await OpenSequentialReadAsync();
+            using var inputStream = await OpenReadAsync();
             using var dataReader = new DataReader(inputStream);
             StringBuilder builder = new();
             uint bytesRead, bytesToRead;
@@ -104,7 +104,7 @@ public async Task<string> ReadTextAsync(int maxLength = -1)
                 bytesToRead = maxLength < 0 ? 4096 : (uint)Math.Min(maxLength, 4096);
                 bytesRead = await dataReader.LoadAsync(bytesToRead);
                 builder.Append(dataReader.ReadString(bytesRead));
-            } while (bytesRead > 0);
+            } while (bytesRead > 0 && inputStream.Position < inputStream.Size);
             return builder.ToString();
         }
 

src/Files.Uwp/Filesystem/BaseStorage/IBaseStorageFolder.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.IO;
 using Windows.Foundation;
 using Windows.Storage;
 using Windows.Storage.FileProperties;
@@ -38,4 +39,11 @@ public interface IBaseStorageFolder : IStorageItem2, IStorageFolder, IStorageFol
         new BaseStorageFileQueryResult CreateFileQueryWithOptions(QueryOptions queryOptions);
         new BaseStorageFolderQueryResult CreateFolderQueryWithOptions(QueryOptions queryOptions);
     }
+
+    public interface ICreateFileWithStream
+    {
+        IAsyncOperation<BaseStorageFile> CreateFileAsync(Stream contents, string desiredName);
+
+        IAsyncOperation<BaseStorageFile> CreateFileAsync(Stream contents, string desiredName, CreationCollisionOption options);
+    }
 }

src/Files.Uwp/Filesystem/Search/FolderSearch.cs

@@ -349,7 +349,8 @@ private ListedItem GetListedItemAsync(string itemPath, WIN32_FIND_DATA findData)
         {
             ListedItem listedItem = null;
             var isHidden = ((FileAttributes)findData.dwFileAttributes & FileAttributes.Hidden) == FileAttributes.Hidden;
-            if (((FileAttributes)findData.dwFileAttributes & FileAttributes.Directory) != FileAttributes.Directory)
+            var isFolder = ((FileAttributes)findData.dwFileAttributes & FileAttributes.Directory) == FileAttributes.Directory;
+            if (!isFolder)
             {
                 string itemFileExtension = null;
                 string itemType = null;
@@ -371,7 +372,7 @@ private ListedItem GetListedItemAsync(string itemPath, WIN32_FIND_DATA findData)
                     Opacity = isHidden ? Constants.UI.DimItemOpacity : 1
                 };
             }
-            else if (((FileAttributes)findData.dwFileAttributes & FileAttributes.Directory) == FileAttributes.Directory)
+            else
             {
                 if (findData.cFileName != "." && findData.cFileName != "..")
                 {
@@ -388,7 +389,7 @@ private ListedItem GetListedItemAsync(string itemPath, WIN32_FIND_DATA findData)
             }
             if (listedItem != null && MaxItemCount > 0) // Only load icon for searchbox suggestions
             {
-                _ = FileThumbnailHelper.LoadIconFromPathAsync(listedItem.ItemPath, ThumbnailSize, ThumbnailMode.ListView)
+                _ = FileThumbnailHelper.LoadIconFromPathAsync(listedItem.ItemPath, ThumbnailSize, ThumbnailMode.ListView, isFolder)
                     .ContinueWith((t) =>
                     {
                         if (t.IsCompletedSuccessfully && t.Result != null)

src/Files.Uwp/Filesystem/StorageEnumerators/Win32StorageEnumerator.cs

@@ -368,7 +368,7 @@ CancellationToken cancellationToken
             }
             else
             {
-                if (".zip".Equals(itemFileExtension, StringComparison.OrdinalIgnoreCase) && await ZipStorageFolder.CheckDefaultZipApp(itemPath))
+                if (ZipStorageFolder.IsZipPath(itemPath) && await ZipStorageFolder.CheckDefaultZipApp(itemPath))
                 {
                     return new ZipItem(null)
                     {

src/Files.Uwp/Filesystem/StorageItems/FtpStorageFile.cs

@@ -165,10 +165,18 @@ public override IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destin
                 }
 
                 BaseStorageFolder destFolder = destinationFolder.AsBaseStorageFolder();
-                BaseStorageFile file = await destFolder.CreateFileAsync(desiredNewName, option.Convert());
 
-                var stream = await file.OpenStreamForWriteAsync();
-                return await ftpClient.DownloadAsync(stream, FtpPath, token: cancellationToken) ? file : null;
+                if (destFolder is ICreateFileWithStream cwsf)
+                {
+                    using var inStream = await ftpClient.OpenReadAsync(FtpPath, cancellationToken);
+                    return await cwsf.CreateFileAsync(inStream, desiredNewName, option.Convert());
+                }
+                else
+                {
+                    BaseStorageFile file = await destFolder.CreateFileAsync(desiredNewName, option.Convert());
+                    using var stream = await file.OpenStreamForWriteAsync();
+                    return await ftpClient.DownloadAsync(stream, FtpPath, token: cancellationToken) ? file : null;
+                }
             });
         }
 

src/Files.Uwp/Filesystem/StorageItems/SystemStorageFile.cs

@@ -69,14 +69,22 @@ public override IAsyncOperation<BaseStorageFile> CopyAsync(IStorageFolder destin
                         // File created by CreateFileAsync will get immediately deleted on MTP?! (#7206)
                         return await File.CopyAsync(sysFolder.Folder, desiredNewName, option);
                     }
-                    var destFile = await destFolder.CreateFileAsync(desiredNewName, option.Convert());
-                    using (var inStream = await this.OpenStreamForReadAsync())
-                    using (var outStream = await destFile.OpenStreamForWriteAsync())
+                    else if (destFolder is ICreateFileWithStream cwsf)
                     {
-                        await inStream.CopyToAsync(outStream);
-                        await outStream.FlushAsync();
+                        using var inStream = await this.OpenStreamForReadAsync();
+                        return await cwsf.CreateFileAsync(inStream, desiredNewName, option.Convert());
+                    }
+                    else
+                    {
+                        var destFile = await destFolder.CreateFileAsync(desiredNewName, option.Convert());
+                        using (var inStream = await this.OpenStreamForReadAsync())
+                        using (var outStream = await destFile.OpenStreamForWriteAsync())
+                        {
+                            await inStream.CopyToAsync(outStream);
+                            await outStream.FlushAsync();
+                        }
+                        return destFile;
                     }
-                    return destFile;
                 }
                 catch (UnauthorizedAccessException ex) // shortcuts & .url
                 {