Fix #825 properly

xupefei · xupefei · commit a91261435abf · 2021-03-07T19:02:08.000+01:00
diff --git a/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/AnimatedImage/AnimatedImage.cs b/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/AnimatedImage/AnimatedImage.cs
@@ -50,10 +50,10 @@ public void Dispose()
 
         private static AnimationProvider InitAnimationProvider(Uri path, MetaProvider meta)
         {
-            var ext = Path.GetExtension(path.OriginalString).ToLower();
+            var ext = Path.GetExtension(path.LocalPath).ToLower();
             var type = Providers.First(p => p.Key.Contains(ext) || p.Key.Contains("*")).Value;
 
-            var provider = type.CreateInstance<AnimationProvider>(path.OriginalString, meta);
+            var provider = type.CreateInstance<AnimationProvider>(path, meta);
 
             return provider;
         }
diff --git a/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/AnimatedImage/AnimationProvider.cs b/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/AnimatedImage/AnimationProvider.cs
@@ -25,13 +25,13 @@ namespace QuickLook.Plugin.ImageViewer.AnimatedImage
 {
     internal abstract class AnimationProvider : IDisposable
     {
-        protected AnimationProvider(string path, MetaProvider meta)
+        protected AnimationProvider(Uri path, MetaProvider meta)
         {
             Path = path;
             Meta = meta;
         }
 
-        public string Path { get; }
+        public Uri Path { get; }
 
         public MetaProvider Meta { get; }
 
diff --git a/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/AnimatedImage/Providers/APngProvider.cs b/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/AnimatedImage/Providers/APngProvider.cs
@@ -37,16 +37,16 @@ internal class APngProvider : AnimationProvider
         private int _lastEffectivePreviousPreviousFrameIndex;
         private NativeProvider _nativeImageProvider;
 
-        public APngProvider(string path, MetaProvider meta) : base(path, meta)
+        public APngProvider(Uri path, MetaProvider meta) : base(path, meta)
         {
-            if (!IsAnimatedPng(path))
+            if (!IsAnimatedPng(path.LocalPath))
             {
                 _nativeImageProvider = new NativeProvider(path, meta);
                 Animator = _nativeImageProvider.Animator;
                 return;
             }
 
-            var decoder = new APNGBitmap(path);
+            var decoder = new APNGBitmap(path.LocalPath);
 
             _baseFrame = decoder.DefaultImage;
             _frames = new List<FrameInfo>(decoder.Frames.Length);
diff --git a/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/AnimatedImage/Providers/DcrawProvider.cs b/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/AnimatedImage/Providers/DcrawProvider.cs
@@ -21,7 +21,7 @@ namespace QuickLook.Plugin.ImageViewer.AnimatedImage.Providers
 {
     internal class DcrawProvider : NativeProvider
     {
-        public DcrawProvider(string path, MetaProvider meta) : base(path, meta)
+        public DcrawProvider(Uri path, MetaProvider meta) : base(path, meta)
         {
             throw new NotImplementedException();
         }
diff --git a/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/AnimatedImage/Providers/GifProvider.cs b/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/AnimatedImage/Providers/GifProvider.cs
@@ -33,15 +33,15 @@ internal class GifProvider : AnimationProvider
         private bool _isPlaying;
         private NativeProvider _nativeProvider;
 
-        public GifProvider(string path, MetaProvider meta) : base(path, meta)
+        public GifProvider(Uri path, MetaProvider meta) : base(path, meta)
         {
-            if (!ImageAnimator.CanAnimate(Image.FromFile(path)))
+            if (!ImageAnimator.CanAnimate(Image.FromFile(path.LocalPath)))
             {
                 _nativeProvider = new NativeProvider(path, meta);
                 return;
             }
 
-            _fileHandle = (Bitmap) Image.FromFile(path);
+            _fileHandle = (Bitmap) Image.FromFile(path.LocalPath);
 
             _fileHandle.SetResolution(DpiHelper.DefaultDpi * DpiHelper.GetCurrentScaleFactor().Horizontal,
                 DpiHelper.DefaultDpi * DpiHelper.GetCurrentScaleFactor().Vertical);
diff --git a/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/AnimatedImage/Providers/ImageMagickProvider.cs b/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/AnimatedImage/Providers/ImageMagickProvider.cs
@@ -30,7 +30,7 @@ namespace QuickLook.Plugin.ImageViewer.AnimatedImage.Providers
 {
     internal class ImageMagickProvider : AnimationProvider
     {
-        public ImageMagickProvider(string path, MetaProvider meta) : base(path, meta)
+        public ImageMagickProvider(Uri path, MetaProvider meta) : base(path, meta)
         {
             Animator = new Int32AnimationUsingKeyFrames();
             Animator.KeyFrames.Add(new DiscreteInt32KeyFrame(0,
@@ -90,7 +90,7 @@ public override Task<BitmapSource> GetRenderedFrame(int index)
 
                 try
                 {
-                    using (var mi = new MagickImage(Path, settings))
+                    using (var mi = new MagickImage(Path.LocalPath, settings))
                     {
                         var profile = mi.GetColorProfile();
                         if (mi.ColorSpace == ColorSpace.RGB || mi.ColorSpace == ColorSpace.sRGB ||
diff --git a/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/AnimatedImage/Providers/NativeProvider.cs b/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/AnimatedImage/Providers/NativeProvider.cs
@@ -27,7 +27,7 @@ namespace QuickLook.Plugin.ImageViewer.AnimatedImage.Providers
 {
     internal class NativeProvider : AnimationProvider
     {
-        public NativeProvider(string path, MetaProvider meta) : base(path, meta)
+        public NativeProvider(Uri path, MetaProvider meta) : base(path, meta)
         {
             Animator = new Int32AnimationUsingKeyFrames();
             Animator.KeyFrames.Add(new DiscreteInt32KeyFrame(0,
@@ -55,7 +55,7 @@ public override Task<BitmapSource> GetThumbnail(Size renderSize)
                 {
                     var img = new BitmapImage();
                     img.BeginInit();
-                    img.UriSource = new Uri(Path);
+                    img.UriSource = Path;
                     img.CacheOption = BitmapCacheOption.OnLoad;
                     // specific renderSize to avoid .net's double to int conversion
                     img.DecodePixelWidth = rotate ? decodeHeight : decodeWidth;
@@ -94,7 +94,7 @@ public override Task<BitmapSource> GetRenderedFrame(int index)
                 {
                     var img = new BitmapImage();
                     img.BeginInit();
-                    img.UriSource = new Uri(Path);
+                    img.UriSource = Path;
                     img.CacheOption = BitmapCacheOption.OnLoad;
                     img.DecodePixelWidth = (int) (rotate ? fullSize.Height : fullSize.Width);
                     img.DecodePixelHeight = (int) (rotate ? fullSize.Width : fullSize.Height);
diff --git a/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/Helper.cs b/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/Helper.cs
@@ -15,7 +15,10 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+using System;
+using System.IO;
 using System.Reflection;
+using System.Text;
 using System.Windows.Media.Imaging;
 using QuickLook.Common.Helpers;
 
@@ -37,5 +40,32 @@ public static void DpiHack(BitmapSource img)
             dpiX?.SetValue(img, newDpiX);
             dpiY?.SetValue(img, newDpiY);
         }
+
+        public static Uri FilePathToFileUrl(string filePath)
+        {
+            var uri = new StringBuilder();
+            foreach (var v in filePath)
+                if (v >= 'a' && v <= 'z' || v >= 'A' && v <= 'Z' || v >= '0' && v <= '9' ||
+                    v == '+' || v == '/' || v == ':' || v == '.' || v == '-' || v == '_' || v == '~' ||
+                    v > '\x80')
+                    uri.Append(v);
+                else if (v == Path.DirectorySeparatorChar || v == Path.AltDirectorySeparatorChar)
+                    uri.Append('/');
+                else
+                    uri.Append($"%{(int) v:X2}");
+            if (uri.Length >= 2 && uri[0] == '/' && uri[1] == '/') // UNC path
+                uri.Insert(0, "file:");
+            else
+                uri.Insert(0, "file:///");
+
+            try
+            {
+                return new Uri(uri.ToString());
+            }
+            catch
+            {
+                return null;
+            }
+        }
     }
 }
diff --git a/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/Plugin.cs b/QuickLook.Plugin/QuickLook.Plugin.ImageViewer/Plugin.cs
@@ -86,7 +86,7 @@ public void View(string path, ContextObject context)
                 ? $"{Path.GetFileName(path)}"
                 : $"{size.Width}×{size.Height}: {Path.GetFileName(path)}";
 
-            _ip.ImageUriSource = new Uri(path);
+            _ip.ImageUriSource = Helper.FilePathToFileUrl(path);
         }
 
         public void Cleanup()

Original file line number	Diff line number	Diff line change
`@@ -50,10 +50,10 @@ public void Dispose()`
`50`	`50`
`51`	`51`	`private static AnimationProvider InitAnimationProvider(Uri path, MetaProvider meta)`
`52`	`52`	`{`
`53`		`- var ext = Path.GetExtension(path.OriginalString).ToLower();`
	`53`	`+ var ext = Path.GetExtension(path.LocalPath).ToLower();`
`54`	`54`	`var type = Providers.First(p => p.Key.Contains(ext) \|\| p.Key.Contains("*")).Value;`
`55`	`55`
`56`		`- var provider = type.CreateInstance<AnimationProvider>(path.OriginalString, meta);`
	`56`	`+ var provider = type.CreateInstance<AnimationProvider>(path, meta);`
`57`	`57`
`58`	`58`	`return provider;`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,13 +25,13 @@ namespace QuickLook.Plugin.ImageViewer.AnimatedImage`
`25`	`25`	`{`
`26`	`26`	`internal abstract class AnimationProvider : IDisposable`
`27`	`27`	`{`
`28`		`- protected AnimationProvider(string path, MetaProvider meta)`
	`28`	`+ protected AnimationProvider(Uri path, MetaProvider meta)`
`29`	`29`	`{`
`30`	`30`	`Path = path;`
`31`	`31`	`Meta = meta;`
`32`	`32`	`}`
`33`	`33`
`34`		`- public string Path { get; }`
	`34`	`+ public Uri Path { get; }`
`35`	`35`
`36`	`36`	`public MetaProvider Meta { get; }`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -37,16 +37,16 @@ internal class APngProvider : AnimationProvider`
`37`	`37`	`private int _lastEffectivePreviousPreviousFrameIndex;`
`38`	`38`	`private NativeProvider _nativeImageProvider;`
`39`	`39`
`40`		`- public APngProvider(string path, MetaProvider meta) : base(path, meta)`
	`40`	`+ public APngProvider(Uri path, MetaProvider meta) : base(path, meta)`
`41`	`41`	`{`
`42`		`- if (!IsAnimatedPng(path))`
	`42`	`+ if (!IsAnimatedPng(path.LocalPath))`
`43`	`43`	`{`
`44`	`44`	`_nativeImageProvider = new NativeProvider(path, meta);`
`45`	`45`	`Animator = _nativeImageProvider.Animator;`
`46`	`46`	`return;`
`47`	`47`	`}`
`48`	`48`
`49`		`- var decoder = new APNGBitmap(path);`
	`49`	`+ var decoder = new APNGBitmap(path.LocalPath);`
`50`	`50`
`51`	`51`	`_baseFrame = decoder.DefaultImage;`
`52`	`52`	`_frames = new List<FrameInfo>(decoder.Frames.Length);`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ namespace QuickLook.Plugin.ImageViewer.AnimatedImage.Providers`
`21`	`21`	`{`
`22`	`22`	`internal class DcrawProvider : NativeProvider`
`23`	`23`	`{`
`24`		`- public DcrawProvider(string path, MetaProvider meta) : base(path, meta)`
	`24`	`+ public DcrawProvider(Uri path, MetaProvider meta) : base(path, meta)`
`25`	`25`	`{`
`26`	`26`	`throw new NotImplementedException();`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,15 +33,15 @@ internal class GifProvider : AnimationProvider`
`33`	`33`	`private bool _isPlaying;`
`34`	`34`	`private NativeProvider _nativeProvider;`
`35`	`35`
`36`		`- public GifProvider(string path, MetaProvider meta) : base(path, meta)`
	`36`	`+ public GifProvider(Uri path, MetaProvider meta) : base(path, meta)`
`37`	`37`	`{`
`38`		`- if (!ImageAnimator.CanAnimate(Image.FromFile(path)))`
	`38`	`+ if (!ImageAnimator.CanAnimate(Image.FromFile(path.LocalPath)))`
`39`	`39`	`{`
`40`	`40`	`_nativeProvider = new NativeProvider(path, meta);`
`41`	`41`	`return;`
`42`	`42`	`}`
`43`	`43`
`44`		`- _fileHandle = (Bitmap) Image.FromFile(path);`
	`44`	`+ _fileHandle = (Bitmap) Image.FromFile(path.LocalPath);`
`45`	`45`
`46`	`46`	`_fileHandle.SetResolution(DpiHelper.DefaultDpi * DpiHelper.GetCurrentScaleFactor().Horizontal,`
`47`	`47`	`DpiHelper.DefaultDpi * DpiHelper.GetCurrentScaleFactor().Vertical);`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ namespace QuickLook.Plugin.ImageViewer.AnimatedImage.Providers`
`30`	`30`	`{`
`31`	`31`	`internal class ImageMagickProvider : AnimationProvider`
`32`	`32`	`{`
`33`		`- public ImageMagickProvider(string path, MetaProvider meta) : base(path, meta)`
	`33`	`+ public ImageMagickProvider(Uri path, MetaProvider meta) : base(path, meta)`
`34`	`34`	`{`
`35`	`35`	`Animator = new Int32AnimationUsingKeyFrames();`
`36`	`36`	`Animator.KeyFrames.Add(new DiscreteInt32KeyFrame(0,`
`@@ -90,7 +90,7 @@ public override Task<BitmapSource> GetRenderedFrame(int index)`
`90`	`90`
`91`	`91`	`try`
`92`	`92`	`{`
`93`		`- using (var mi = new MagickImage(Path, settings))`
	`93`	`+ using (var mi = new MagickImage(Path.LocalPath, settings))`
`94`	`94`	`{`
`95`	`95`	`var profile = mi.GetColorProfile();`
`96`	`96`	`if (mi.ColorSpace == ColorSpace.RGB \|\| mi.ColorSpace == ColorSpace.sRGB \|\|`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ namespace QuickLook.Plugin.ImageViewer.AnimatedImage.Providers`
`27`	`27`	`{`
`28`	`28`	`internal class NativeProvider : AnimationProvider`
`29`	`29`	`{`
`30`		`- public NativeProvider(string path, MetaProvider meta) : base(path, meta)`
	`30`	`+ public NativeProvider(Uri path, MetaProvider meta) : base(path, meta)`
`31`	`31`	`{`
`32`	`32`	`Animator = new Int32AnimationUsingKeyFrames();`
`33`	`33`	`Animator.KeyFrames.Add(new DiscreteInt32KeyFrame(0,`
`@@ -55,7 +55,7 @@ public override Task<BitmapSource> GetThumbnail(Size renderSize)`
`55`	`55`	`{`
`56`	`56`	`var img = new BitmapImage();`
`57`	`57`	`img.BeginInit();`
`58`		`- img.UriSource = new Uri(Path);`
	`58`	`+ img.UriSource = Path;`
`59`	`59`	`img.CacheOption = BitmapCacheOption.OnLoad;`
`60`	`60`	`// specific renderSize to avoid .net's double to int conversion`
`61`	`61`	`img.DecodePixelWidth = rotate ? decodeHeight : decodeWidth;`
`@@ -94,7 +94,7 @@ public override Task<BitmapSource> GetRenderedFrame(int index)`
`94`	`94`	`{`
`95`	`95`	`var img = new BitmapImage();`
`96`	`96`	`img.BeginInit();`
`97`		`- img.UriSource = new Uri(Path);`
	`97`	`+ img.UriSource = Path;`
`98`	`98`	`img.CacheOption = BitmapCacheOption.OnLoad;`
`99`	`99`	`img.DecodePixelWidth = (int) (rotate ? fullSize.Height : fullSize.Width);`
`100`	`100`	`img.DecodePixelHeight = (int) (rotate ? fullSize.Width : fullSize.Height);`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public void View(string path, ContextObject context)`
`86`	`86`	`? $"{Path.GetFileName(path)}"`
`87`	`87`	`: $"{size.Width}×{size.Height}: {Path.GetFileName(path)}";`
`88`	`88`
`89`		`- _ip.ImageUriSource = new Uri(path);`
	`89`	`+ _ip.ImageUriSource = Helper.FilePathToFileUrl(path);`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`public void Cleanup()`