allow non-ascii characters

chrisbro · Jun 24, 2017 · a9c9a2f · a9c9a2f
1 parent 97959a6
commit a9c9a2f
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 39 deletions.
diff --git a/README.md b/README.md
@@ -38,6 +38,7 @@ To install, download a [released alfred-bear workflow](https://github.com/chrisb
 ## Versions
 
 **0.2.0**
+* Now allows non-ASCII characters.
 * Searching by tag now displays not only tags that match the search query, but notes that match those tags as well.
 * Searching by tag now works with *or* without the '#' symbol in front of the tag.
 

diff --git a/create.py b/create.py
@@ -58,13 +58,13 @@ def create_query_output(title, tags):
 
     query_string = ''
     if title:
-        query_string += 'title=' + quote(title)
-        query_string += '&text=' + quote(title)
+        query_string += 'title=' + quote(title.encode('utf-8'))
+        query_string += '&text=' + quote(title.encode('utf-8'))
 
     if tags:
         tags_string = ''
         for tag in tags:
-            tags_string += quote(tag) + ','
+            tags_string += quote(tag.encode('utf-8')) + ','
         query_string = strip_tags_from_string(tags, query_string)
         tags_string = tags_string[:-1]
         query_string += '&tags=' + tags_string
@@ -79,7 +79,7 @@ def strip_tags_from_string(tags, query):
     Yanks out all the hashtags from a string.
     """
     for tag in tags:
-        query = query.replace(quote('#' + tag), '')
+        query = query.replace(quote('#' + tag.encode('utf-8')), '')
         query = query.replace('#' + tag, '')
     return query
 

diff --git a/info.plist b/info.plist
@@ -120,37 +120,6 @@
 			<key>version</key>
 			<integer>2</integer>
 		</dict>
-		<dict>
-			<key>config</key>
-			<dict>
-				<key>concurrently</key>
-				<false/>
-				<key>escaping</key>
-				<integer>102</integer>
-				<key>script</key>
-				<string>orig_query={query}
-echo $orig_query
-if [[ $orig_query == ":t:"* ]]; then
-	new_query=${orig_query:3}
-	open "bear://x-callback-url/open-tag?name=$new_query"
-else
-	new_query=${orig_query:3}
-	open "bear://x-callback-url/open-note?id=$new_query"
-fi</string>
-				<key>scriptargtype</key>
-				<integer>0</integer>
-				<key>scriptfile</key>
-				<string></string>
-				<key>type</key>
-				<integer>0</integer>
-			</dict>
-			<key>type</key>
-			<string>alfred.workflow.action.script</string>
-			<key>uid</key>
-			<string>34803D0C-B70E-4032-96FA-E0A5E179236A</string>
-			<key>version</key>
-			<integer>2</integer>
-		</dict>
 		<dict>
 			<key>config</key>
 			<dict>
@@ -204,7 +173,15 @@ fi</string>
 				<key>escaping</key>
 				<integer>102</integer>
 				<key>script</key>
-				<string>open "bear://x-callback-url/create?{query}"</string>
+				<string>orig_query={query}
+echo $orig_query
+if [[ $orig_query == ":t:"* ]]; then
+	new_query=${orig_query:3}
+	open "bear://x-callback-url/open-tag?name=$new_query"
+else
+	new_query=${orig_query:3}
+	open "bear://x-callback-url/open-note?id=$new_query"
+fi</string>
 				<key>scriptargtype</key>
 				<integer>0</integer>
 				<key>scriptfile</key>
@@ -215,7 +192,7 @@ fi</string>
 			<key>type</key>
 			<string>alfred.workflow.action.script</string>
 			<key>uid</key>
-			<string>B7C7DDC1-B797-4FF0-8AA0-0362C306C19A</string>
+			<string>34803D0C-B70E-4032-96FA-E0A5E179236A</string>
 			<key>version</key>
 			<integer>2</integer>
 		</dict>
@@ -264,6 +241,29 @@ fi</string>
 			<key>version</key>
 			<integer>2</integer>
 		</dict>
+		<dict>
+			<key>config</key>
+			<dict>
+				<key>concurrently</key>
+				<false/>
+				<key>escaping</key>
+				<integer>102</integer>
+				<key>script</key>
+				<string>open "bear://x-callback-url/create?{query}"</string>
+				<key>scriptargtype</key>
+				<integer>0</integer>
+				<key>scriptfile</key>
+				<string></string>
+				<key>type</key>
+				<integer>0</integer>
+			</dict>
+			<key>type</key>
+			<string>alfred.workflow.action.script</string>
+			<key>uid</key>
+			<string>B7C7DDC1-B797-4FF0-8AA0-0362C306C19A</string>
+			<key>version</key>
+			<integer>2</integer>
+		</dict>
 	</array>
 	<key>readme</key>
 	<string># Bear Alfred Workflow
@@ -327,7 +327,7 @@ To install, download a released alfred-bear.alfredworkflow and double-click to o
 		</dict>
 	</dict>
 	<key>version</key>
-	<string>0.1.0</string>
+	<string>0.2.0</string>
 	<key>webaddress</key>
 	<string>https://github.com/chrisbro/alfred-bear</string>
 </dict>

diff --git a/search.py b/search.py
@@ -69,6 +69,7 @@ def execute_search_query(args):
     query = None
     if args.query:
         query = args.query[0]
+        query = query.encode('utf-8')
 
         if SINGLE_QUOTE in query:
             query = query.replace(SINGLE_QUOTE, ESC_SINGLE_QUOTE)

diff --git a/version b/version
@@ -1 +1 @@
-0.1.0
+0.2.0