use absolute redis path on macOS, rm useless try except

xxyzz · Jan 2, 2021 · 11b6adf · 11b6adf
1 parent c433707
commit 11b6adf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/__init__.py b/__init__.py
@@ -7,7 +7,7 @@ class WordDumbDumb(InterfaceActionBase):
     description = 'Create Kindle Word Wise file.'
     supported_platforms = ['linux', 'osx', 'windows']
     author = 'xxyzz'
-    version = (2, 0, 1)
+    version = (2, 0, 2)
     minimum_calibre_version = (5, 0, 0)  # Python3
     actual_plugin = 'calibre_plugins.worddumb.ui:WordDumb'
 

diff --git a/database.py b/database.py
@@ -69,12 +69,11 @@ def insert_lemma(data, ll_conn):
 
 def start_redis_server(db_path):
     import subprocess
-    subprocess.Popen(['redis-server', '--dir', db_path])
+    import platform
+    if platform.system() == 'Darwin':
+        subprocess.Popen(['/usr/local/bin/redis-server', '--dir', db_path])
+    else:
+        subprocess.Popen(['redis-server', '--dir', db_path])
 
     import redis
-    while True:
-        try:
-            r = redis.Redis()
-            return r
-        except ConnectionRefusedError:
-            pass
+    return redis.Redis()