Fix which_exe issue

Author: BingLingGroup

autosub/data/locale/zh_CN/LC_MESSAGES/autosub.ffmpeg_utils.mo

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-02 11:00+0800\n"
+"POT-Creation-Date: 2019-11-03 20:25+0800\n"
 "PO-Revision-Date: 2019-07-28 15:09+0800\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -39,22 +39,22 @@ msgstr "输入你视频的帧率。任何非法的值会被当作\".srt\"格式
 msgid "Use \".srt\" instead."
 msgstr "改用\".srt\"格式。"
 
-#: autosub/ffmpeg_utils.py:210
+#: autosub/ffmpeg_utils.py:217
 msgid ""
 "Warning: Dependency ffmpeg-normalize not found on this machine. Try default "
 "method."
 msgstr ""
 "警告：依赖ffmpeg-normalize未在这台电脑上找到。尝试默认的方法去转换格式。"
 
-#: autosub/ffmpeg_utils.py:222
+#: autosub/ffmpeg_utils.py:229
 msgid ""
 "There is already a file with the same name in this location: \"{dest_name}\"."
 msgstr "在此处已有同名文件：\"{dest_name}\"。"
 
-#: autosub/ffmpeg_utils.py:225
+#: autosub/ffmpeg_utils.py:232
 msgid "Input a new path (including directory and file name) for output file.\n"
 msgstr "为输出文件输入一个新的路径（包括路径和文件名）。\n"
 
-#: autosub/ffmpeg_utils.py:243 autosub/ffmpeg_utils.py:276
+#: autosub/ffmpeg_utils.py:250 autosub/ffmpeg_utils.py:283
 msgid "Audio pre-processing failed. Try default method."
 msgstr "音频预处理失败。尝试默认的方法去转换格式。"

autosub/data/locale/zh_CN/LC_MESSAGES/autosub.ffmpeg_utils.po

@@ -157,26 +157,33 @@ def ffprobe_check_file(filename):
     return True
 
 
-def which_exe(program_name):
+def is_exe(file_path):
     """
-    Return the path for a given executable.
+    Checks whether a file is executable.
     """
-    def is_exe(file_path):
-        """
-        Checks whether a file is executable.
-        """
-        return os.path.isfile(file_path) and os.access(file_path, os.X_OK)
+    return os.path.isfile(file_path) and os.access(file_path, os.X_OK)
 
-    fpath = os.path.split(program_name)[0]
-    if fpath:
-        if is_exe(program_name):
-            return program_name
+
+def which_exe(program_path):
+    """
+    Return the path for a given executable.
+    """
+    program_dir = os.path.split(program_path)[0]
+    if program_dir:
+        # if program directory exists
+        if is_exe(program_path):
+            return program_path
     else:
+        # else find the program path
         for path in os.environ["PATH"].split(os.pathsep):
             path = path.strip('"')
-            exe_file = os.path.join(path, program_name)
-            if is_exe(exe_file):
-                return exe_file
+            program = os.path.join(path, program_path)
+            if is_exe(program):
+                return program
+        # if program located locally
+        program_name = os.path.join(constants.APP_PATH, os.path.basename(program_path))
+        if is_exe(program_name):
+            return program_name
     return None
 
 

autosub/ffmpeg_utils.py

@@ -1,19 +1,74 @@
 [
-  { "name": "Type: Bug", "color": "#FF6E40" },
-  { "name": "Type: Duplicated", "color": "#B0BEC5" },
-  { "name": "Type: Maintenance", "color": "#A5D6A7" },
-  { "name": "Type: Enhancement", "color": "#80DEEA" },
-  { "name": "Type: Question", "color": "#69F0AE" },
-  { "name": "Type: Invalid", "color": "#B0BEC5" },
-  { "name": "Type: Help Wanted", "color": "#FFE082" },
-  { "name": "Priority: Low", "color": "#9FA8DA" },
-  { "name": "Priority: Medium", "color": "#CE93D8" },
-  { "name": "Priority: High", "color": "#EF9A9A" },
-  { "name": "Priority: Critical", "color": "#F48FB1" },
-  { "name": "Status: Abandoned", "color": "#BCAAA4" },
-  { "name": "Status: Accepted", "color": "#E6EE9C" },
-  { "name": "Status: Blocked", "color": "#B0BEC5" },
-  { "name": "Status: Completed", "color": "#FDF6E3" },
-  { "name": "Status: In Progress", "color": "#EEE8D5" },
-  { "name": "Status: Review Needed", "color": "#FFF59D" }
-]
+  {
+    "name": "Priority: Critical",
+    "color": "#F48FB1"
+  },
+  {
+    "name": "Priority: High",
+    "color": "#EF9A9A"
+  },
+  {
+    "name": "Priority: Low",
+    "color": "#9FA8DA"
+  },
+  {
+    "name": "Priority: Medium",
+    "color": "#CE93D8"
+  },
+  {
+    "name": "Status: Abandoned",
+    "color": "#BCAAA4"
+  },
+  {
+    "name": "Status: Accepted",
+    "color": "#a5d6a7"
+  },
+  {
+    "name": "Status: Blocked",
+    "color": "#B0BEC5"
+  },
+  {
+    "name": "Status: Completed",
+    "color": "#FDF6E3"
+  },
+  {
+    "name": "Status: In Progress",
+    "color": "#EEE8D5"
+  },
+  {
+    "name": "Status: Review Needed",
+    "color": "#FFF59D"
+  },
+  {
+    "name": "Type: Bug",
+    "color": "#FF6E40"
+  },
+  {
+    "name": "Type: Duplicated",
+    "color": "#B0BEC5"
+  },
+  {
+    "name": "Type: Enhancement",
+    "color": "#80DEEA"
+  },
+  {
+    "name": "Type: Help Wanted",
+    "color": "#FFE082"
+  },
+  {
+    "name": "Type: Invalid",
+    "color": "#B0BEC5"
+  },
+  {
+    "name": "Type: Maintenance",
+    "color": "#80cbc4"
+  },
+  {
+    "name": "Type: Pin",
+    "color": "#00b0ff"
+  },
+  {
+    "name": "Type: Question",
+    "color": "#E6EE9C"
+  }
+]

docs/issue_labels.json

@@ -1,9 +1,9 @@
-pysubs2==0.2.4
-langcodes_py2==1.2.0
 googletrans==2.4.0
-requests==2.21.0
 wcwidth==0.1.7
+langcodes_py2==1.2.0
 auditok==0.1.5
-google_api_python_client==1.7.10
+pysubs2==0.2.4
+requests==2.21.0
+google_api_python_client==1.7.11
 langcodes==1.4.1
-progressbar2==3.42.0
+progressbar2==3.47.0