Fixed generation fails if Notepad++ installation path contains specia…

…l characters
chcg · May 22, 2022 · f104cc2 · f104cc2
1 parent 1a3a431
commit f104cc2
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,2 +1,5 @@
+# 1.0.1.2 (22.05.2022)
+- Fixed generation fails if Notepad++ installation path contains special characters
+
 # 1.0.0.1 (21.05.2022)
 - Initial release
diff --git a/PlantUmlViewer/PlantUmlViewer/PlantUmlViewer.cs b/PlantUmlViewer/PlantUmlViewer/PlantUmlViewer.cs
@@ -35,8 +35,8 @@ private enum CommandId
 
         public PlantUmlViewer()
         {
-            assemblyDirectory = Path.GetDirectoryName(
-                new Uri(Assembly.GetExecutingAssembly().CodeBase).AbsolutePath);
+            assemblyDirectory = Uri.UnescapeDataString(Path.GetDirectoryName(
+                new Uri(Assembly.GetExecutingAssembly().CodeBase).AbsolutePath));
 
             notepadPp = new NotepadPPGateway();
             editor = new ScintillaGateway(PluginBase.GetCurrentScintilla());
@@ -74,8 +74,10 @@ public void CommandMenuInit()
 
         public void SetToolBarIcon()
         {
-            toolbarIcons tbIcons = new toolbarIcons();
-            tbIcons.hToolbarBmp = Properties.Resources.Icon.GetHbitmap();
+            toolbarIcons tbIcons = new toolbarIcons
+            {
+                hToolbarBmp = Properties.Resources.Icon.GetHbitmap()
+            };
             IntPtr pTbIcons = Marshal.AllocHGlobal(Marshal.SizeOf(tbIcons));
             Marshal.StructureToPtr(tbIcons, pTbIcons, false);
             Win32.SendMessage(PluginBase.nppData._nppHandle, (uint)NppMsg.NPPM_ADDTOOLBARICON,

diff --git a/PlantUmlViewer/PlantUmlViewer/Properties/AssemblyInfo.cs b/PlantUmlViewer/PlantUmlViewer/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.1")]
-[assembly: AssemblyFileVersion("1.0.0.1")]
+[assembly: AssemblyVersion("1.0.1.2")]
+[assembly: AssemblyFileVersion("1.0.1.2")]
diff --git a/tools/create_release.py b/tools/create_release.py
@@ -33,7 +33,7 @@ def create_plugin_list_entry(version, architecture, hash):
         'version': '{version}'.format(version=version),
         'npp-compatible-versions': '[8.3,]',
         'id': '{hash}'.format(hash=hash),
-        'repository': 'https://github.com/Fruchtzwerg94/PlantUmlViewer/releases/{version}/PlantUmlViewer_v{version}_{architecture}.zip'
+        'repository': 'https://github.com/Fruchtzwerg94/PlantUmlViewer/releases/download/{version}/PlantUmlViewer_v{version}_{architecture}.zip'
             .format(version=version, architecture=architecture),
         'description': 'A Notepad++ plugin to generate view and export PlantUML diagrams.',
         'author': 'Philipp Schmidt',