Browse zip archives & other things

Files.Launcher/MessageHandlers/FileOperationsHandler.cs

@@ -158,7 +158,7 @@ await Win32API.StartSTATask(() =>
                                     shellOperationResult.Items.Add(new ShellOperationItemResult()
                                     {
                                         Succeeded = e.Result.Succeeded,
-                                        Source = e.SourceItem.FileSystemPath,
+                                        Source = e.SourceItem.FileSystemPath ?? e.SourceItem.ParsingName,
                                         Destination = e.DestItem?.FileSystemPath,
                                         HRresult = (int)e.Result
                                     });
@@ -224,7 +224,7 @@ await Win32API.StartSTATask(() =>
                                     shellOperationResult.Items.Add(new ShellOperationItemResult()
                                     {
                                         Succeeded = e.Result.Succeeded,
-                                        Source = e.SourceItem.FileSystemPath,
+                                        Source = e.SourceItem.FileSystemPath ?? e.SourceItem.ParsingName,
                                         Destination = !string.IsNullOrEmpty(e.Name) ? Path.Combine(Path.GetDirectoryName(e.SourceItem.FileSystemPath), e.Name) : null,
                                         HRresult = (int)e.Result
                                     });
@@ -288,8 +288,8 @@ await Win32API.StartSTATask(() =>
                                     shellOperationResult.Items.Add(new ShellOperationItemResult()
                                     {
                                         Succeeded = e.Result.Succeeded,
-                                        Source = e.SourceItem.FileSystemPath,
-                                        Destination = e.DestFolder != null && !string.IsNullOrEmpty(e.Name) ? Path.Combine(e.DestFolder.FileSystemPath, e.Name) : null,
+                                        Source = e.SourceItem.FileSystemPath ?? e.SourceItem.ParsingName,
+                                        Destination = e.DestFolder?.FileSystemPath != null && !string.IsNullOrEmpty(e.Name) ? Path.Combine(e.DestFolder.FileSystemPath, e.Name) : null,
                                         HRresult = (int)e.Result
                                     });
                                 };
@@ -363,8 +363,8 @@ await Win32API.StartSTATask(() =>
                                     shellOperationResult.Items.Add(new ShellOperationItemResult()
                                     {
                                         Succeeded = e.Result.Succeeded,
-                                        Source = e.SourceItem.FileSystemPath,
-                                        Destination = e.DestFolder != null && !string.IsNullOrEmpty(e.Name) ? Path.Combine(e.DestFolder.FileSystemPath, e.Name) : null,
+                                        Source = e.SourceItem.FileSystemPath ?? e.SourceItem.ParsingName,
+                                        Destination = e.DestFolder?.FileSystemPath != null && !string.IsNullOrEmpty(e.Name) ? Path.Combine(e.DestFolder.FileSystemPath, e.Name) : null,
                                         HRresult = (int)e.Result
                                     });
                                 };
@@ -566,8 +566,8 @@ private void UpdateFileTageDb(object sender, ShellFileOperations.ShellFileOpEven
                 {
                     "delete" => e.DestItem?.FileSystemPath,
                     "rename" => (!string.IsNullOrEmpty(e.Name) ? Path.Combine(Path.GetDirectoryName(e.SourceItem.FileSystemPath), e.Name) : null),
-                    "copy" => (e.DestFolder != null && !string.IsNullOrEmpty(e.Name) ? Path.Combine(e.DestFolder.FileSystemPath, e.Name) : null),
-                    _ => (e.DestFolder != null && !string.IsNullOrEmpty(e.Name) ? Path.Combine(e.DestFolder.FileSystemPath, e.Name) : null)
+                    "copy" => (e.DestFolder?.FileSystemPath != null && !string.IsNullOrEmpty(e.Name) ? Path.Combine(e.DestFolder.FileSystemPath, e.Name) : null),
+                    _ => (e.DestFolder?.FileSystemPath != null && !string.IsNullOrEmpty(e.Name) ? Path.Combine(e.DestFolder.FileSystemPath, e.Name) : null)
                 };
                 if (destination == null)
                 {

Files.Launcher/Program.cs

@@ -1,5 +1,4 @@
 using Files.Common;
-using FilesFullTrust.Helpers;
 using FilesFullTrust.MessageHandlers;
 using Newtonsoft.Json;
 using System;
@@ -235,7 +234,7 @@ private static async Task ParseArgumentsAsync(Dictionary<string, object> message
                     {
                         await Win32API.SendMessageAsync(connection, new ValueSet() { { "Success", -1 } }, message.Get("RequestID", (string)null));
                     }
-                    break;                
+                    break;
 
                 default:
                     foreach (var mh in messageHandlers)

Files/BaseLayout.cs

@@ -771,10 +771,14 @@ protected async void FileList_DragItemsStarting(object sender, DragItemsStarting
                 {
                     if (item.PrimaryItemAttribute == StorageItemTypes.File)
                     {
-                        selectedStorageItems.Add(await new FtpStorageFile(ParentShellPageInstance.FilesystemViewModel, ftpItem).ToStorageFileAsync());
+                        selectedStorageItems.Add(await new FtpStorageFile(ftpItem).ToStorageFileAsync());
+                    }
+                    else if (item.PrimaryItemAttribute == StorageItemTypes.Folder)
+                    {
+                        selectedStorageItems.Add(new FtpStorageFolder(ftpItem));
                     }
                 }
-                else if (item.PrimaryItemAttribute == StorageItemTypes.File)
+                else if (item.PrimaryItemAttribute == StorageItemTypes.File || item is ZipItem)
                 {
                     result = await ParentShellPageInstance.FilesystemViewModel.GetFileFromPathAsync(item.ItemPath)
                         .OnSuccess(t => selectedStorageItems.Add(t));

Files/DataModels/FilesystemItemsOperationDataModel.cs

@@ -66,7 +66,7 @@ public async Task<List<FilesystemOperationItemViewModel>> ToItems(Action updateP
             // Add conflicting items first
             foreach (var item in ConflictingItems)
             {
-                var iconData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(item.SourcePath, 64u);
+                var iconData = await FileThumbnailHelper.LoadIconFromPathAsync(item.SourcePath, 64u, Windows.Storage.FileProperties.ThumbnailMode.ListView);
 
                 items.Add(new FilesystemOperationItemViewModel(updatePrimaryButtonEnabled, optionGenerateNewName, optionReplaceExisting, optionSkip)
                 {
@@ -84,7 +84,7 @@ public async Task<List<FilesystemOperationItemViewModel>> ToItems(Action updateP
             // Then add non-conflicting items
             foreach (var item in nonConflictingItems)
             {
-                var iconData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(item.SourcePath, 64u);
+                var iconData = await FileThumbnailHelper.LoadIconFromPathAsync(item.SourcePath, 64u, Windows.Storage.FileProperties.ThumbnailMode.ListView);
 
                 items.Add(new FilesystemOperationItemViewModel(updatePrimaryButtonEnabled, optionGenerateNewName, optionReplaceExisting, optionSkip)
                 {

Files/DataModels/ShellNewEntry.cs

@@ -1,4 +1,6 @@
 using Files.Filesystem;
+using Files.Filesystem.StorageItems;
+using Files.Helpers;
 using System;
 using System.IO;
 using System.Threading.Tasks;
@@ -16,19 +18,19 @@ public class ShellNewEntry
         public byte[] Data { get; set; }
         public string Template { get; set; }
 
-        public async Task<FilesystemResult<StorageFile>> Create(string filePath, IShellPage associatedInstance)
+        public async Task<FilesystemResult<BaseStorageFile>> Create(string filePath, IShellPage associatedInstance)
         {
-            var parentFolder = await associatedInstance.FilesystemViewModel.GetFolderFromPathAsync(Path.GetDirectoryName(filePath));
+            var parentFolder = await associatedInstance.FilesystemViewModel.GetFolderFromPathAsync(PathNormalization.GetParentDir(filePath));
             if (parentFolder)
             {
                 return await Create(parentFolder, Path.GetFileName(filePath));
             }
-            return new FilesystemResult<StorageFile>(null, parentFolder.ErrorCode);
+            return new FilesystemResult<BaseStorageFile>(null, parentFolder.ErrorCode);
         }
 
-        public async Task<FilesystemResult<StorageFile>> Create(StorageFolder parentFolder, string fileName)
+        public async Task<FilesystemResult<BaseStorageFile>> Create(BaseStorageFolder parentFolder, string fileName)
         {
-            FilesystemResult<StorageFile> createdFile = null;
+            FilesystemResult<BaseStorageFile> createdFile = null;
             if (!fileName.EndsWith(this.Extension))
             {
                 fileName += this.Extension;
@@ -39,14 +41,19 @@ public async Task<FilesystemResult<StorageFile>> Create(StorageFolder parentFold
             }
             else
             {
-                createdFile = await FilesystemTasks.Wrap(() => StorageFile.GetFileFromPathAsync(Template).AsTask())
+                createdFile = await FilesystemTasks.Wrap(() => StorageFileExtensions.DangerousGetFileFromPathAsync(Template))
                     .OnSuccess(t => t.CopyAsync(parentFolder, fileName, NameCollisionOption.GenerateUniqueName).AsTask());
             }
             if (createdFile)
             {
                 if (this.Data != null)
                 {
-                    await FileIO.WriteBytesAsync(createdFile.Result, this.Data);
+                    //await FileIO.WriteBytesAsync(createdFile.Result, this.Data); // Calls unsupported OpenTransactedWriteAsync
+                    using (var fileStream = await createdFile.Result.OpenStreamForWriteAsync())
+                    {
+                        await fileStream.WriteAsync(Data, 0, Data.Length);
+                        await fileStream.FlushAsync();
+                    }
                 }
             }
             return createdFile;

Files/DataModels/SidebarPinnedModel.cs

@@ -294,7 +294,7 @@ public async Task AddItemToSidebarAsync(string path)
                     locationItem.IconData = iconData;
                     locationItem.Icon = await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(() => locationItem.IconData.ToBitmapAsync());
                 }
-                else
+                if (locationItem.IconData == null)
                 {
                     locationItem.IconData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(path, 24u);
                     if (locationItem.IconData != null)

Files/Files.csproj

@@ -178,8 +178,15 @@
     <Compile Include="Filesystem\Permissions\FileSystemAccessRuleForUI.cs" />
     <Compile Include="Filesystem\Permissions\RulesForUser.cs" />
     <Compile Include="Filesystem\Permissions\UserGroup.cs" />
+    <Compile Include="Filesystem\StorageItems\BaseQueryResults.cs" />
+    <Compile Include="Filesystem\StorageItems\BaseStorageItem.cs" />
     <Compile Include="Filesystem\StorageItems\FtpStorageFile.cs" />
     <Compile Include="Filesystem\StorageItems\FtpStorageFolder.cs" />
+    <Compile Include="Filesystem\StorageItems\StreamWithContentType.cs" />
+    <Compile Include="Filesystem\StorageItems\SystemStorageFile.cs" />
+    <Compile Include="Filesystem\StorageItems\SystemStorageFolder.cs" />
+    <Compile Include="Filesystem\StorageItems\ZipStorageFile.cs" />
+    <Compile Include="Filesystem\StorageItems\ZipStorageFolder.cs" />
     <Compile Include="Helpers\FtpHelpers.cs" />
     <Compile Include="Helpers\ItemListDisplayHelpers\GroupedCollection.cs" />
     <Compile Include="Helpers\ItemListDisplayHelpers\GroupingHelper.cs" />

Files/Filesystem/FileTagsHelper.cs

@@ -1,4 +1,5 @@
 using Common;
+using Files.Filesystem.StorageItems;
 using Files.Helpers;
 using Files.Models.Settings;
 using Microsoft.Toolkit.Uwp;
@@ -49,12 +50,12 @@ public static void WriteFileTag(string filePath, string tag)
 
         public static async Task<ulong?> GetFileFRN(IStorageItem item)
         {
-            if (item is StorageFolder folderItem)
+            if (item is BaseStorageFolder folderItem && folderItem.Properties != null)
             {
                 var extraProperties = await folderItem.Properties.RetrievePropertiesAsync(new string[] { "System.FileFRN" });
                 return (ulong?)extraProperties["System.FileFRN"];
             }
-            else if (item is StorageFile fileItem)
+            else if (item is BaseStorageFile fileItem && fileItem.Properties != null)
             {
                 var extraProperties = await fileItem.Properties.RetrievePropertiesAsync(new string[] { "System.FileFRN" });
                 return (ulong?)extraProperties["System.FileFRN"];