Updated Pipeline To Support Multi-OS & Added Support for PyPI Release

coldsofttech · Apr 13, 2024 · a692ace · a692ace
1 parent 034c8f8
commit a692ace
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 40 deletions.
diff --git a/src/__init__.py b/src/__init__.py
@@ -459,13 +459,15 @@ def _open_license(self, event) -> None:
         webbrowser.open(self.license_link)
 
 
-def main():
+def display_settings():
     if platform.system().lower() == 'linux':
-        if platform.dist()[0].lower() == 'ubuntu':
-            if os.environ.get('DISPLAY', '') == '':
-                print('No display found. Using: 0.0')
-                os.environ.__setitem__('DISPLAY', ':0.0')
+        if os.environ.get('DISPLAY', '') == '':
+            print('No display found. Using: 0.0')
+            os.environ.__setitem__('DISPLAY', ':0.0')
+
 
+def main():
+    display_settings()
     root = tk.Tk()
     M3U8DownloaderUI(root)
     root.mainloop()

diff --git a/tests/unit/test_aboutui.py b/tests/unit/test_aboutui.py
@@ -1,24 +1,17 @@
-import os
-import platform
 import tkinter as tk
 import unittest
 from unittest.mock import patch
 
 import pytest
 
-from src import AboutUI
+from src import AboutUI, display_settings
 
 
 class TestAboutUI(unittest.TestCase):
     """Unit test cases for AboutUI"""
 
     def setUp(self):
-        if platform.system().lower() == 'linux':
-            if platform.dist()[0].lower() == 'ubuntu':
-                if os.environ.get('DISPLAY', '') == '':
-                    print('No display found. Using: 0.0')
-                    os.environ.__setitem__('DISPLAY', ':0.0')
-
+        display_settings()
         self.root = tk.Tk()
 
     def tearDown(self):

diff --git a/tests/unit/test_downloadthread.py b/tests/unit/test_downloadthread.py
@@ -1,24 +1,18 @@
 import json
 import os
-import platform
 import tkinter as tk
 import unittest
 
 import pytest
 
-from src import M3U8DownloaderUI, DownloadThread
+from src import M3U8DownloaderUI, DownloadThread, display_settings
 
 
 class TestDownloadThread(unittest.TestCase):
     """Unit test cases for DownloadThread class."""
 
     def setUp(self):
-        if platform.system().lower() == 'linux':
-            if platform.dist()[0].lower() == 'ubuntu':
-                if os.environ.get('DISPLAY', '') == '':
-                    print('No display found. Using: 0.0')
-                    os.environ.__setitem__('DISPLAY', ':0.0')
-
+        display_settings()
         self.input_url = 'https://raw.githubusercontent.com/coldsofttech/pym3u8downloader/main/tests/files/index.m3u8'
         self.output_file = 'video.mp4'
         self.root = tk.Tk()

diff --git a/tests/unit/test_m3u8downloaderui.py b/tests/unit/test_m3u8downloaderui.py
@@ -1,24 +1,17 @@
-import os
-import platform
 import tkinter as tk
 import unittest
 from unittest.mock import patch, MagicMock
 
 import pytest
 
-from src import M3U8DownloaderUI
+from src import M3U8DownloaderUI, display_settings
 
 
 class TestM3U8DownloaderUI(unittest.TestCase):
     """Unit test cases for M3U8DownloaderUI"""
 
     def setUp(self):
-        if platform.system().lower() == 'linux':
-            if platform.dist()[0].lower() == 'ubuntu':
-                if os.environ.get('DISPLAY', '') == '':
-                    print('No display found. Using: 0.0')
-                    os.environ.__setitem__('DISPLAY', ':0.0')
-
+        display_settings()
         self.root = tk.Tk()
         self.source = M3U8DownloaderUI(self.root)
         self.input_url = 'https://raw.githubusercontent.com/coldsofttech/pym3u8downloader/main/tests/files/index.m3u8'

diff --git a/tests/unit/test_stdoutredirector.py b/tests/unit/test_stdoutredirector.py
@@ -1,23 +1,16 @@
-import os
-import platform
 import tkinter as tk
 import unittest
 
 import pytest
 
-from src import StdoutRedirector
+from src import StdoutRedirector, display_settings
 
 
 class TestStdoutRedirector(unittest.TestCase):
     """Unit test cases for StdoutRedirector"""
 
     def setUp(self):
-        if platform.system().lower() == 'linux':
-            if platform.dist()[0].lower() == 'ubuntu':
-                if os.environ.get('DISPLAY', '') == '':
-                    print('No display found. Using: 0.0')
-                    os.environ.__setitem__('DISPLAY', ':0.0')
-
+        display_settings()
         self.root = tk.Tk()
         self.text_variable = tk.StringVar()
         self.stdout_redirector = StdoutRedirector(self.text_variable)