From 7fbb0fbf8eea5341db5b40a60fbb86403f86c850 Mon Sep 17 00:00:00 2001 From: Dan F-M Date: Tue, 2 Jul 2019 18:02:32 -0400 Subject: [PATCH] more reliable ordering --- info.plist | 172 ++++++++++++++++++++++++++++++++----------------- parse_query.py | 8 +-- run_search.py | 9 +-- 3 files changed, 119 insertions(+), 70 deletions(-) diff --git a/info.plist b/info.plist index 4662110..5398b1d 100644 --- a/info.plist +++ b/info.plist @@ -8,7 +8,33 @@ Internet connections - 88F638D8-273F-4E10-979E-6CFBCBC1AD83 + 0851CD52-A32F-450D-9CE2-99F95F4EFD55 + + + destinationuid + DAFF399E-22B6-4655-BD72-BD3870F30A91 + modifiers + 0 + modifiersubtext + + vitoclose + + + + 1A874EFE-642F-479B-A4BE-CBEDE574FF42 + + + destinationuid + BB651561-1A0A-42DB-8B5C-A41D5ADA51B6 + modifiers + 0 + modifiersubtext + + vitoclose + + + + BB651561-1A0A-42DB-8B5C-A41D5ADA51B6 destinationuid @@ -48,51 +74,65 @@ config - alfredfiltersresults - - alfredfiltersresultsmatchmode - 0 - argumenttreatemptyqueryasnil - - argumenttrimmode - 0 + browser + + spaces + + url + {query} + utf8 + + + type + alfred.workflow.action.openurl + uid + 11D5721D-E45C-4D45-82C8-2CC370002271 + version + 1 + + + config + argumenttype 0 - escaping - 110 keyword ads - queuedelaycustom - 3 - queuedelayimmediatelyinitially + subtext + + text + Execute search on the ADS website + withspace - queuedelaymode - 0 - queuemode - 1 - runningsubtext - Searching for papers... + + type + alfred.workflow.input.keyword + uid + 1A874EFE-642F-479B-A4BE-CBEDE574FF42 + version + 1 + + + config + + concurrently + + escaping + 110 script $ADS_PYTHON parse_query.py {query} scriptargtype 0 scriptfile - subtext - - title - Execute search on ADS website type 0 - withspace - type - alfred.workflow.input.scriptfilter + alfred.workflow.action.script uid - 88F638D8-273F-4E10-979E-6CFBCBC1AD83 + BB651561-1A0A-42DB-8B5C-A41D5ADA51B6 version - 3 + 2 config @@ -109,7 +149,28 @@ type alfred.workflow.action.openurl uid - 11D5721D-E45C-4D45-82C8-2CC370002271 + 407E7C1B-5537-436F-8D97-71204E3433D3 + version + 1 + + + config + + argumenttype + 0 + keyword + ads + subtext + + text + Execute search in Alfred + withspace + + + type + alfred.workflow.input.keyword + uid + 0851CD52-A32F-450D-9CE2-99F95F4EFD55 version 1 @@ -128,8 +189,6 @@ 0 escaping 110 - keyword - ads queuedelaycustom 3 queuedelayimmediatelyinitially @@ -162,25 +221,6 @@ version 3 - - config - - browser - - spaces - - url - {query} - utf8 - - - type - alfred.workflow.action.openurl - uid - 407E7C1B-5537-436F-8D97-71204E3433D3 - version - 1 - readme Search for papers using SAO/NASA Astrophysics Data System @@ -189,30 +229,44 @@ 11D5721D-E45C-4D45-82C8-2CC370002271 xpos - 220 + 385 ypos - 60 + 70 407E7C1B-5537-436F-8D97-71204E3433D3 xpos - 220 + 380 + ypos + 200 + + 0851CD52-A32F-450D-9CE2-99F95F4EFD55 + + xpos + 40 ypos - 180 + 200 - 88F638D8-273F-4E10-979E-6CFBCBC1AD83 + 1A874EFE-642F-479B-A4BE-CBEDE574FF42 xpos 40 ypos - 60 + 70 + + BB651561-1A0A-42DB-8B5C-A41D5ADA51B6 + + xpos + 220 + ypos + 70 DAFF399E-22B6-4655-BD72-BD3870F30A91 xpos - 45 + 215 ypos - 180 + 200 variables diff --git a/parse_query.py b/parse_query.py index 3f3497f..9b9039e 100644 --- a/parse_query.py +++ b/parse_query.py @@ -39,12 +39,6 @@ def parse_query_string(query): if __name__ == "__main__": - import json query = " ".join(sys.argv[1:]) query = parse_query_string(query) - results = dict(items=[dict( - title="Execute search on ADS website", - subtitle=query, - arg="https://ui.adsabs.harvard.edu/search/q="+query, - )]) - sys.stdout.write(json.dumps(results)) + sys.stdout.write("https://ui.adsabs.harvard.edu/search/q="+query) diff --git a/run_search.py b/run_search.py index 75212e1..e3b0005 100644 --- a/run_search.py +++ b/run_search.py @@ -90,9 +90,6 @@ def set_ratelimit(ratelimit): return_error("Your ADS rate limit has been reached", "https://github.com/andycasey/ads") - # Wait for it... - time.sleep(0.8) - # Perform the search sort = "citation_count+desc" if "year:" in query_string: @@ -103,7 +100,11 @@ def set_ratelimit(ratelimit): fl=["title", "author", "year", "pubdate", "bibcode"], max_pages=1, rows=5) - papers = [] + papers = [dict( + title="Execute query on the ADS website", + subtitle=query_string, + arg="https://ui.adsabs.harvard.edu/search/q="+query_string, + )] for paper in request: papers.append(dict( title="{0} ({1})".format(paper.title[0], paper.year),