Ignore case when checking zip extension (#6674)

gave92 · web-flow · commit a38471fe7390 · 2021-11-02T13:01:09.000-04:00
diff --git a/Files.Launcher/Helpers/ShellFolderHelpers.cs b/Files.Launcher/Helpers/ShellFolderHelpers.cs
@@ -34,7 +34,7 @@ public static ShellFileItem GetShellFileItem(ShellItem folderItem)
             {
                 return null;
             }
-            bool isFolder = folderItem.IsFolder && Path.GetExtension(folderItem.Name) != ".zip";
+            bool isFolder = folderItem.IsFolder && !".zip".Equals(Path.GetExtension(folderItem.Name), StringComparison.OrdinalIgnoreCase);
             if (folderItem.Properties == null)
             {
                 return new ShellFileItem(isFolder, folderItem.FileSystemPath, Path.GetFileName(folderItem.Name), folderItem.Name, DateTime.Now, DateTime.Now, DateTime.Now, null, 0, null);
diff --git a/Files/Filesystem/ListedItem.cs b/Files/Filesystem/ListedItem.cs
@@ -204,11 +204,14 @@ private void Img_ImageOpened(object sender, Windows.UI.Xaml.RoutedEventArgs e)
 
                 if (image.PixelWidth > 0)
                 {
-                    LoadFileIcon = true;
-                    PlaceholderDefaultIcon = null;
-                    NeedsPlaceholderGlyph = false;
-                    LoadDefaultIcon = false;
-                    LoadWebShortcutGlyph = false;
+                    Common.Extensions.IgnoreExceptions(() =>
+                    {
+                        LoadFileIcon = true;
+                        PlaceholderDefaultIcon = null;
+                        NeedsPlaceholderGlyph = false;
+                        LoadDefaultIcon = false;
+                        LoadWebShortcutGlyph = false;
+                    }, App.Logger); // 2009482836u
                 }
             }
         }
diff --git a/Files/Filesystem/StorageEnumerators/Win32StorageEnumerator.cs b/Files/Filesystem/StorageEnumerators/Win32StorageEnumerator.cs
@@ -319,7 +319,7 @@ CancellationToken cancellationToken
                     opacity = Constants.UI.DimItemOpacity;
                 }
 
-                if (itemFileExtension == ".zip" && await ZipStorageFolder.CheckDefaultZipApp(itemPath))
+                if (".zip".Equals(itemFileExtension, StringComparison.OrdinalIgnoreCase) && await ZipStorageFolder.CheckDefaultZipApp(itemPath))
                 {
                     return new ZipItem(null, dateReturnFormat)
                     {
diff --git a/Files/Filesystem/StorageItems/ZipStorageFile.cs b/Files/Filesystem/StorageItems/ZipStorageFile.cs
@@ -391,7 +391,7 @@ public override IAsyncOperation<BaseStorageFolder> GetParentAsync()
 
         public static IAsyncOperation<BaseStorageFile> FromPathAsync(string path)
         {
-            var marker = path.IndexOf(".zip");
+            var marker = path.IndexOf(".zip", StringComparison.OrdinalIgnoreCase);
             if (marker != -1)
             {
                 var containerPath = path.Substring(0, marker + ".zip".Length);
diff --git a/Files/Filesystem/StorageItems/ZipStorageFolder.cs b/Files/Filesystem/StorageItems/ZipStorageFolder.cs
@@ -507,7 +507,7 @@ public static IAsyncOperation<BaseStorageFolder> FromPathAsync(string path)
         {
             return AsyncInfo.Run<BaseStorageFolder>(async (cancellationToken) =>
             {
-                var marker = path.IndexOf(".zip");
+                var marker = path.IndexOf(".zip", StringComparison.OrdinalIgnoreCase);
                 if (marker != -1)
                 {
                     var containerPath = path.Substring(0, marker + ".zip".Length);
@@ -526,7 +526,7 @@ public static IAsyncOperation<BaseStorageFolder> FromPathAsync(string path)
 
         public static bool IsZipPath(string path)
         {
-            var marker = path.IndexOf(".zip");
+            var marker = path.IndexOf(".zip", StringComparison.OrdinalIgnoreCase);
             if (marker != -1)
             {
                 marker += ".zip".Length;
diff --git a/Files/Helpers/ZipHelpers.cs b/Files/Helpers/ZipHelpers.cs
@@ -112,18 +112,26 @@ public static async Task ExtractArchive(BaseStorageFile archive, BaseStorageFold
                     {
                         int currentBlockSize = 0;
 
-                        using (Stream entryStream = zipFile.GetInputStream(entry))
+                        try
                         {
-                            while ((currentBlockSize = await entryStream.ReadAsync(buffer, 0, buffer.Length)) > 0)
+                            using (Stream entryStream = zipFile.GetInputStream(entry))
                             {
-                                await destinationStream.WriteAsync(buffer, 0, currentBlockSize);
-
-                                if (cancellationToken.IsCancellationRequested) // Check if cancelled
+                                while ((currentBlockSize = await entryStream.ReadAsync(buffer, 0, buffer.Length)) > 0)
                                 {
-                                    return;
+                                    await destinationStream.WriteAsync(buffer, 0, currentBlockSize);
+
+                                    if (cancellationToken.IsCancellationRequested) // Check if cancelled
+                                    {
+                                        return;
+                                    }
                                 }
                             }
                         }
+                        catch (Exception ex)
+                        {
+                            App.Logger.Warn(ex, $"Error extracting file: {filePath}");
+                            return; // TODO: handle error
+                        }
                     }
 
                     entriesFinished++;
diff --git a/Files/Services/Implementation/FileTagsSettingsService.cs b/Files/Services/Implementation/FileTagsSettingsService.cs
@@ -33,6 +33,11 @@ public IList<FileTag> FileTagList
 
         public FileTag GetTagById(string uid)
         {
+            if (FileTagList.Any(x => x.Uid == null))
+            {
+                // Tags file is invalid, regenerate
+                FileTagList = s_defaultFileTags;
+            }
             var tag = FileTagList.SingleOrDefault(x => x.Uid == uid);
             if (!string.IsNullOrEmpty(uid) && tag == null)
             {

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public static ShellFileItem GetShellFileItem(ShellItem folderItem)`
`34`	`34`	`{`
`35`	`35`	`return null;`
`36`	`36`	`}`
`37`		`- bool isFolder = folderItem.IsFolder && Path.GetExtension(folderItem.Name) != ".zip";`
	`37`	`+ bool isFolder = folderItem.IsFolder && !".zip".Equals(Path.GetExtension(folderItem.Name), StringComparison.OrdinalIgnoreCase);`
`38`	`38`	`if (folderItem.Properties == null)`
`39`	`39`	`{`
`40`	`40`	`return new ShellFileItem(isFolder, folderItem.FileSystemPath, Path.GetFileName(folderItem.Name), folderItem.Name, DateTime.Now, DateTime.Now, DateTime.Now, null, 0, null);`
Original file line number	Diff line number	Diff line change
`@@ -204,11 +204,14 @@ private void Img_ImageOpened(object sender, Windows.UI.Xaml.RoutedEventArgs e)`
`204`	`204`
`205`	`205`	`if (image.PixelWidth > 0)`
`206`	`206`	`{`
`207`		`- LoadFileIcon = true;`
`208`		`- PlaceholderDefaultIcon = null;`
`209`		`- NeedsPlaceholderGlyph = false;`
`210`		`- LoadDefaultIcon = false;`
`211`		`- LoadWebShortcutGlyph = false;`
	`207`	`+ Common.Extensions.IgnoreExceptions(() =>`
	`208`	`+ {`
	`209`	`+ LoadFileIcon = true;`
	`210`	`+ PlaceholderDefaultIcon = null;`
	`211`	`+ NeedsPlaceholderGlyph = false;`
	`212`	`+ LoadDefaultIcon = false;`
	`213`	`+ LoadWebShortcutGlyph = false;`
	`214`	`+ }, App.Logger); // 2009482836u`
`212`	`215`	`}`
`213`	`216`	`}`
`214`	`217`	`}`
Original file line number	Diff line number	Diff line change
`@@ -319,7 +319,7 @@ CancellationToken cancellationToken`
`319`	`319`	`opacity = Constants.UI.DimItemOpacity;`
`320`	`320`	`}`
`321`	`321`
`322`		`- if (itemFileExtension == ".zip" && await ZipStorageFolder.CheckDefaultZipApp(itemPath))`
	`322`	`+ if (".zip".Equals(itemFileExtension, StringComparison.OrdinalIgnoreCase) && await ZipStorageFolder.CheckDefaultZipApp(itemPath))`
`323`	`323`	`{`
`324`	`324`	`return new ZipItem(null, dateReturnFormat)`
`325`	`325`	`{`
Original file line number	Diff line number	Diff line change
`@@ -391,7 +391,7 @@ public override IAsyncOperation<BaseStorageFolder> GetParentAsync()`
`391`	`391`
`392`	`392`	`public static IAsyncOperation<BaseStorageFile> FromPathAsync(string path)`
`393`	`393`	`{`
`394`		`- var marker = path.IndexOf(".zip");`
	`394`	`+ var marker = path.IndexOf(".zip", StringComparison.OrdinalIgnoreCase);`
`395`	`395`	`if (marker != -1)`
`396`	`396`	`{`
`397`	`397`	`var containerPath = path.Substring(0, marker + ".zip".Length);`
Original file line number	Diff line number	Diff line change
`@@ -507,7 +507,7 @@ public static IAsyncOperation<BaseStorageFolder> FromPathAsync(string path)`
`507`	`507`	`{`
`508`	`508`	`return AsyncInfo.Run<BaseStorageFolder>(async (cancellationToken) =>`
`509`	`509`	`{`
`510`		`- var marker = path.IndexOf(".zip");`
	`510`	`+ var marker = path.IndexOf(".zip", StringComparison.OrdinalIgnoreCase);`
`511`	`511`	`if (marker != -1)`
`512`	`512`	`{`
`513`	`513`	`var containerPath = path.Substring(0, marker + ".zip".Length);`
`@@ -526,7 +526,7 @@ public static IAsyncOperation<BaseStorageFolder> FromPathAsync(string path)`
`526`	`526`
`527`	`527`	`public static bool IsZipPath(string path)`
`528`	`528`	`{`
`529`		`- var marker = path.IndexOf(".zip");`
	`529`	`+ var marker = path.IndexOf(".zip", StringComparison.OrdinalIgnoreCase);`
`530`	`530`	`if (marker != -1)`
`531`	`531`	`{`
`532`	`532`	`marker += ".zip".Length;`
Original file line number	Diff line number	Diff line change
`@@ -112,18 +112,26 @@ public static async Task ExtractArchive(BaseStorageFile archive, BaseStorageFold`
`112`	`112`	`{`
`113`	`113`	`int currentBlockSize = 0;`
`114`	`114`
`115`		`- using (Stream entryStream = zipFile.GetInputStream(entry))`
	`115`	`+ try`
`116`	`116`	`{`
`117`		`- while ((currentBlockSize = await entryStream.ReadAsync(buffer, 0, buffer.Length)) > 0)`
	`117`	`+ using (Stream entryStream = zipFile.GetInputStream(entry))`
`118`	`118`	`{`
`119`		`- await destinationStream.WriteAsync(buffer, 0, currentBlockSize);`
`120`		`-`
`121`		`- if (cancellationToken.IsCancellationRequested) // Check if cancelled`
	`119`	`+ while ((currentBlockSize = await entryStream.ReadAsync(buffer, 0, buffer.Length)) > 0)`
`122`	`120`	`{`
`123`		`- return;`
	`121`	`+ await destinationStream.WriteAsync(buffer, 0, currentBlockSize);`
	`122`	`+`
	`123`	`+ if (cancellationToken.IsCancellationRequested) // Check if cancelled`
	`124`	`+ {`
	`125`	`+ return;`
	`126`	`+ }`
`124`	`127`	`}`
`125`	`128`	`}`
`126`	`129`	`}`
	`130`	`+ catch (Exception ex)`
	`131`	`+ {`
	`132`	`+ App.Logger.Warn(ex, $"Error extracting file: {filePath}");`
	`133`	`+ return; // TODO: handle error`
	`134`	`+ }`
`127`	`135`	`}`
`128`	`136`
`129`	`137`	`entriesFinished++;`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,11 @@ public IList<FileTag> FileTagList`
`33`	`33`
`34`	`34`	`public FileTag GetTagById(string uid)`
`35`	`35`	`{`
	`36`	`+ if (FileTagList.Any(x => x.Uid == null))`
	`37`	`+ {`
	`38`	`+ // Tags file is invalid, regenerate`
	`39`	`+ FileTagList = s_defaultFileTags;`
	`40`	`+ }`
`36`	`41`	`var tag = FileTagList.SingleOrDefault(x => x.Uid == uid);`
`37`	`42`	`if (!string.IsNullOrEmpty(uid) && tag == null)`
`38`	`43`	`{`