From 32fd37ee19e8083fa14914e46c2f40ebb0df1c8e Mon Sep 17 00:00:00 2001
From: Sean Ballinger <sean.ballinger@gmail.com>
Date: Mon, 4 May 2020 23:22:10 -0400
Subject: [PATCH] Use curl in update script

---
 info.plist |  2 ++
 update.py  | 56 ++++++++++++++++++++++++++++--------------------------
 2 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/info.plist b/info.plist
index b763be8..9725456 100644
--- a/info.plist
+++ b/info.plist
@@ -611,6 +611,8 @@ For further info and troubleshooting, visit https://github.com/sballin/alfred-se
 		<key>sortByDate</key>
 		<string>1</string>
 	</dict>
+	<key>variablesdontexport</key>
+	<array/>
 	<key>version</key>
 	<string>2.2.1</string>
 	<key>webaddress</key>
diff --git a/update.py b/update.py
index 1194dc6..79c6d8e 100644
--- a/update.py
+++ b/update.py
@@ -3,7 +3,6 @@
 import json
 import plistlib
 from distutils.version import StrictVersion
-from urllib import request
 
 
 def oneDaySinceLastCheck():
@@ -32,14 +31,17 @@ def updateAvailable(latestVersion):
         return False
 
 
-def userWantsUpdate(updateUrl):
+def userWantsUpdate(updateNotes):
+    '''
+    Show user a confirmation dialog.
+    '''
     retval = os.system("""
-osascript -e 'display dialog "An update is available for the Search Notes workflow. Press OK to download and open this file:
+osascript -e 'display dialog "An update is available for the Search Notes workflow. Press OK to download and open it. Notes for this release:
 
 %s
 
-Daily update checks can be disabled by editing the workflow."'
-""" % updateUrl)
+Daily update checks can be disabled by editing the workflow."' 2>/dev/null
+""" % updateNotes)
     if retval == 0:
         return True
     else:
@@ -50,27 +52,27 @@ def update(updateUrl):
     '''
     Download and open new version of workflow.
     '''
-    r = request.urlopen(updateUrl, timeout=60)
-    if r.status == 200:
-        updateFile = '/tmp/Search.Notes.alfredworkflow'
-        with open(updateFile, 'wb') as f:
-            f.write(r.read())
-        os.system('open ' + updateFile)
+    updateFile = '/tmp/Search.Notes.alfredworkflow'
+    # --location is required in order to follow redirects
+    curlRet = os.system('curl --silent --location --output %s %s' % (updateFile, updateUrl))
+    openRet = 1
+    if curlRet == 0:
+        openRet = os.system('open ' + updateFile)
+    if curlRet != 0 or openRet != 0:
+        os.system("osascript -e 'display dialog \"The Search Notes workflow failed to update.\"' 2>/dev/null")
     
 
-try:
-    if oneDaySinceLastCheck():
-        latestUrl = 'https://api.github.com/repos/sballin/alfred-search-notes-app/releases/latest'
-        r = request.urlopen(latestUrl, timeout=60)
-        if r.status == 200:
-            body = r.read()
-            latest = json.loads(body.decode('utf-8'))
-            latestVersion = latest['tag_name']
-            updateUrl = latest['assets'][0]['browser_download_url']
-            
-            if updateAvailable(latestVersion): 
-                if userWantsUpdate(updateUrl):
-                    update(updateUrl)
-except:
-    pass
-    
+if oneDaySinceLastCheck():
+    latestUrl = 'https://api.github.com/repos/sballin/alfred-search-notes-app/releases/latest'
+    latestFile = 'latest_release.json'
+    retval = os.system('curl --silent --max-time 30 --output %s %s' % (latestFile, latestUrl))
+    if retval == 0:
+        with open(latestFile, 'r') as f:
+            latest = json.load(f)
+        latestVersion = latest['tag_name']
+        updateNotes = latest['body']
+        updateUrl = latest['assets'][0]['browser_download_url']
+        
+        if updateAvailable(latestVersion): 
+            if userWantsUpdate(updateNotes):
+                update(updateUrl)