Better handle multi-file arguments on Windows

mronkko · Dec 13, 2019 · 4972856 · 4972856
1 parent 28b413e
commit 4972856
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 45 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
-builds
+builds
+github.token
diff --git a/build.sh b/build.sh
@@ -1,8 +1,4 @@
 #!/bin/bash
 
+"C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin\Roslyn\csc.exe" /target:winexe /out:./chrome/content/Bridge.exe "./chrome/content/Bridge.cs"
 zip -r builds/zoteroquicklook.zoteroplugin chrome defaults install.rdf chrome.manifest -x .*
-mv install.rdf install-base.rdf
-mv install-altwindows.rdf install.rdf
-zip -r builds/zoteroquicklook-altwindows.zoteroplugin chrome defaults install.rdf chrome.manifest -x .*
-mv install.rdf install-altwindows.rdf
-mv install-base.rdf install.rdf
diff --git a/chrome/content/Bridge.cs b/chrome/content/Bridge.cs
@@ -10,7 +10,7 @@ internal static class Program
     {
         private static void Main(string[] args)
         {
-            if (args.Length != 1)
+            if (args.Length == 0)
             {
                 MessageBox.Show("Usage: Bridge.exe \"<path of a file/folder>\"");
                 return;
@@ -42,7 +42,7 @@ private static void SendMessage(string pipeMessage, string path = null)
             }
             catch (Exception e)
             {
-                MessageBox.Show("QuickLook not found. Please install QuickLook (http://pooi.moe/QuickLook/) or specify a custom view command instead.");
+                MessageBox.Show("QuickLook cannot be reached. Please run/install QuickLook (http://pooi.moe/QuickLook/) or specify a custom view command instead.");
             }
         }
     }

diff --git a/chrome/content/Bridge.exe b/chrome/content/Bridge.exe
diff --git a/chrome/content/zoteroquicklook.js b/chrome/content/zoteroquicklook.js
@@ -453,10 +453,16 @@ Checks the attachment file or writes a content of a note to a file and then push
 
 		// A boolean indicating if we have notes this far.
 		var notesFound=false;
-
 		var filesFound=false;
 
-		//Combine all filenames into an array
+		if (!Zotero.isWin || this.customviewcommand !== "") {
+
+		} else {
+
+		}
+
+		// Combine all filenames into an array
+		// Note that for default Windows behavior, only the first time will be displayed
 
 		for (item in items){
 

diff --git a/install-altwindows.rdf b/install-altwindows.rdf
diff --git a/install.rdf b/install.rdf
@@ -4,7 +4,7 @@
 		<em:id>zoteroquicklook@gmail.com</em:id>
 		<em:type>2</em:type> <!-- type=extension -->
 		<em:name>ZoteroQuickLook</em:name>
-		<em:version>1.4.1</em:version>
+		<em:version>1.4.2</em:version>
 		<em:creator>Mikko Ronkko</em:creator>
 		<em:contributor>Brenton M. Wiernik</em:contributor>
 		<em:description>Quick Look Utility for Zotero.</em:description>

diff --git a/update-altwindows.rdf b/update-altwindows.rdf
@@ -5,21 +5,21 @@
       <rdf:Seq>
         <rdf:li>
           <rdf:Description>
-            <em:version>1.4.1</em:version>
+            <em:version>1.4.2</em:version>
             <em:targetApplication>
               <rdf:Description>
                 <em:id>zotero@chnm.gmu.edu</em:id>
                 <em:minVersion>4.0</em:minVersion>
                 <em:maxVersion>5.*</em:maxVersion>
-                <em:updateLink>https://github.com/mronkko/ZoteroQuickLook/releases/download/1.4.1/zoteroquicklook-altwindows.zoteroplugin</em:updateLink>
+                <em:updateLink>https://github.com/mronkko/ZoteroQuickLook/releases/download/1.4.2/zoteroquicklook.zoteroplugin</em:updateLink>
               </rdf:Description>
             </em:targetApplication>
             <em:targetApplication>
               <rdf:Description>
                 <em:id>juris-m@juris-m.github.io</em:id>
                 <em:minVersion>4.0</em:minVersion>
                 <em:maxVersion>5.*</em:maxVersion>
-                <em:updateLink>https://github.com/mronkko/ZoteroQuickLook/releases/download/1.4.1/zoteroquicklook-altwindows.zoteroplugin</em:updateLink>
+                <em:updateLink>https://github.com/mronkko/ZoteroQuickLook/releases/download/1.4.2/zoteroquicklook.zoteroplugin</em:updateLink>
               </rdf:Description>
             </em:targetApplication>
           </rdf:Description>

diff --git a/update.rdf b/update.rdf
@@ -5,21 +5,21 @@
       <rdf:Seq>
         <rdf:li>
           <rdf:Description>
-            <em:version>1.4.1</em:version>
+            <em:version>1.4.2</em:version>
             <em:targetApplication>
               <rdf:Description>
                 <em:id>zotero@chnm.gmu.edu</em:id>
                 <em:minVersion>4.0</em:minVersion>
                 <em:maxVersion>5.*</em:maxVersion>
-                <em:updateLink>https://github.com/mronkko/ZoteroQuickLook/releases/download/1.4.1/zoteroquicklook.zoteroplugin</em:updateLink>
+                <em:updateLink>https://github.com/mronkko/ZoteroQuickLook/releases/download/1.4.2/zoteroquicklook.zoteroplugin</em:updateLink>
               </rdf:Description>
             </em:targetApplication>
             <em:targetApplication>
               <rdf:Description>
                 <em:id>juris-m@juris-m.github.io</em:id>
                 <em:minVersion>4.0</em:minVersion>
                 <em:maxVersion>5.*</em:maxVersion>
-                <em:updateLink>https://github.com/mronkko/ZoteroQuickLook/releases/download/1.4.1/zoteroquicklook.zoteroplugin</em:updateLink>
+                <em:updateLink>https://github.com/mronkko/ZoteroQuickLook/releases/download/1.4.2/zoteroquicklook.zoteroplugin</em:updateLink>
               </rdf:Description>
             </em:targetApplication>
           </rdf:Description>