Merge pull request #447 from PokeyzRule/master

added openfolder support for macOS and Windows
z411 · Jul 11, 2019 · 44d40a9 · 44d40a9
2 parents f92dd17 + dba15ba
commit 44d40a9
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 9 deletions.
diff --git a/trackma/ui/cli.py b/trackma/ui/cli.py
@@ -525,8 +525,15 @@ def do_openfolder(self, args):
             show = self._get_show(args[0])
             filename = self.engine.get_episode_path(show, 1)
             with open(os.devnull, 'wb') as DEVNULL:
-                subprocess.Popen(["/usr/bin/xdg-open",
-                os.path.dirname(filename)], stdout=DEVNULL, stderr=DEVNULL)
+                if sys.platform == 'darwin':
+                    subprocess.Popen(["open",
+                    os.path.dirname(filename)], stdout=DEVNULL, stderr=DEVNULL)
+                elif sys.platform == 'win32':
+                    subprocess.Popen(["explorer",
+                    os.path.dirname(filename)], stdout=DEVNULL, stderr=DEVNULL)
+                else:
+                    subprocess.Popen(["/usr/bin/xdg-open",
+                    os.path.dirname(filename)], stdout=DEVNULL, stderr=DEVNULL)
         except OSError:
             # xdg-open failed.
             self.display_error("Could not open folder.")

diff --git a/trackma/ui/curses.py b/trackma/ui/curses.py
@@ -363,8 +363,15 @@ def do_openfolder(self):
             show = self.engine.get_show_info(item.showid)
             filename = self.engine.get_episode_path(show, 1)
             with open(os.devnull, 'wb') as DEVNULL:
-                subprocess.Popen(["/usr/bin/xdg-open",
-                os.path.dirname(filename)], stdout=DEVNULL, stderr=DEVNULL)
+                if sys.platform == 'darwin':
+                    subprocess.Popen(["open",
+                    os.path.dirname(filename)], stdout=DEVNULL, stderr=DEVNULL)
+                elif sys.platform == 'win32':
+                    subprocess.Popen(["explorer",
+                    os.path.dirname(filename)], stdout=DEVNULL, stderr=DEVNULL)
+                else:
+                    subprocess.Popen(["/usr/bin/xdg-open",
+                    os.path.dirname(filename)], stdout=DEVNULL, stderr=DEVNULL)
         except OSError:
             # xdg-open failed.
             raise utils.EngineError("Could not open folder.")

diff --git a/trackma/ui/gtk/window.py b/trackma/ui/gtk/window.py
@@ -14,6 +14,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+import sys
 import os
 import subprocess
 import threading
@@ -562,9 +563,18 @@ def _open_folder(self, show_id):
         try:
             filename = self._engine.get_episode_path(show, 1)
             with open(os.devnull, 'wb') as DEVNULL:
-                subprocess.Popen(["/usr/bin/xdg-open", os.path.dirname(filename)],
-                                 stdout=DEVNULL,
-                                 stderr=DEVNULL)
+                if sys.platform == 'darwin':
+                    subprocess.Popen(["open", os.path.dirname(filename)],
+                                     stdout=DEVNULL,
+                                     stderr=DEVNULL)
+                elif sys.platform == 'win32':
+                    subprocess.Popen(["explorer", os.path.dirname(filename)],
+                                     stdout=DEVNULL,
+                                     stderr=DEVNULL)
+                else:
+                    subprocess.Popen(["/usr/bin/xdg-open", os.path.dirname(filename)],
+                                     stdout=DEVNULL,
+                                     stderr=DEVNULL)
         except OSError:
             # xdg-open failed.
             raise utils.EngineError("Could not open folder.")

diff --git a/trackma/ui/qt/mainwindow.py b/trackma/ui/qt/mainwindow.py
@@ -16,6 +16,7 @@
 
 pyqt_version = 5
 
+import sys
 import os
 import datetime
 import subprocess
@@ -1142,8 +1143,15 @@ def s_open_folder(self):
         try:
             filename = self.worker.engine.get_episode_path(show, 1)
             with open(os.devnull, 'wb') as DEVNULL:
-                subprocess.Popen(["/usr/bin/xdg-open",
-                    os.path.dirname(filename)], stdout=DEVNULL, stderr=DEVNULL)
+                if sys.platform == 'darwin':
+                    subprocess.Popen(["open",
+                        os.path.dirname(filename)], stdout=DEVNULL, stderr=DEVNULL)
+                elif sys.platform == 'win32':
+                    subprocess.Popen(["explorer",
+                        os.path.dirname(filename)], stdout=DEVNULL, stderr=DEVNULL)
+                else:
+                    subprocess.Popen(["/usr/bin/xdg-open",
+                        os.path.dirname(filename)], stdout=DEVNULL, stderr=DEVNULL)
         except OSError:
             # xdg-open failed.
             raise utils.EngineError("Could not open folder.")