Try to add linux arm support

quintenvandamme · Jun 28, 2024 · cc12d8b · cc12d8b
1 parent 9c8deb9
commit cc12d8b
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 25 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,7 +14,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v5
       with:
         python-version: '3.11'
         check-latest: true
@@ -31,14 +31,36 @@ jobs:
         artifacts: "./out/*"
         allowUpdates: true
         tag: "continious-build"
+
+  Linux_aarch64:
+    runs-on: ubuntu-latest
+    package-suffix: linux-aarch64
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.11'
+        check-latest: true
+
+    - name: Build TV Downloader
+      run: python build.py build
+
+    - name: Upload Binary
+      uses: ncipollo/release-action@v1
+      with:
+        artifacts: "./out/*"
+        allowUpdates: true
+        tag: "continious-build"
 
   Windows_x86_64:
     runs-on: windows-latest
 
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v5
       with:
         python-version: '3.11'
         check-latest: true

diff --git a/README.md b/README.md
@@ -29,7 +29,7 @@ Tv Downloader is een tool om video's van verschillende websites te downloaden.
 | -- | ---- | -------- | ------------ |
 | Linux | x86_64 | [tvdownloader-linux-x86_64](https://github.com/quintenvandamme/tv_downloader/releases/download/continious-build/tvdownloader-Linux-x86_64) | [![Build Binary](https://github.com/quintenvandamme/tv_downloader/actions/workflows/build.yml/badge.svg?branch=main)](https://github.com/quintenvandamme/tv_downloader/actions/workflows/build.yml) |s
 | Linux | x86_64 | [tvdownloader-linux-x86_64.AppImage](https://github.com/quintenvandamme/tv_downloader/releases/download/continious-build/tvdownloader-Linux-x86_64.AppImage) | [![Build Binary](https://github.com/quintenvandamme/tv_downloader/actions/workflows/build.yml/badge.svg?branch=main)](https://github.com/quintenvandamme/tv_downloader/actions/workflows/build.yml) |
-| Windows | x86_64 | [tvdownloader-win32-x86_64.exe](https://github.com/quintenvandamme/tv_downloader/releases/download/continious-build/tvdownloader-win32-x86_64.exe) |[![Build](https://github.com/quintenvandamme/tv_downloader/actions/workflows/build.yml/badge.svg)](https://github.com/quintenvandamme/tv_downloader/actions/workflows/build.yml)|
+| Windows | x86_64 | [tvdownloader-windows-x86_64.exe](https://github.com/quintenvandamme/tv_downloader/releases/download/continious-build/tvdownloader-windows-x86_64.exe) |[![Build](https://github.com/quintenvandamme/tv_downloader/actions/workflows/build.yml/badge.svg)](https://github.com/quintenvandamme/tv_downloader/actions/workflows/build.yml)|
 
 ## Bouwen
 

diff --git a/gui/get_videos/download.py b/gui/get_videos/download.py
@@ -27,7 +27,7 @@ def download_video(url,outputFile,ffmpeg_path,progressBar):
         ]
 
         process = subprocess.Popen(
-            command, stdout=subprocess.PIPE, stderr=subprocess.STDOUT
+            command, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=False
         )
 
         for line in process.stdout:

diff --git a/gui/lang/lang.py b/gui/lang/lang.py
@@ -34,6 +34,7 @@ def get(self, key):
     "about-text": "TV Downloader is an application that allows you to download videos from various news websites.",
     "version": "Version",
     "Ok": "Ok",
+    "no-description": "No description available",
 }
 
 nl = {
@@ -50,4 +51,5 @@ def get(self, key):
     "about-text": "TV Downloader is een applicatie die het mogelijk maakt om video\'s van verschillende nieuwswebsites te downloaden.",
     "version": "Versie",
     "Ok": "Ok",
+    "no-description": "Geen beschrijving beschikbaar",
 }
diff --git a/gui/main.py b/gui/main.py
@@ -57,6 +57,9 @@ def __init__(self, video, list_widget):
         if len(description_text) > 200:
             description_text = description_text[:200] + '...'
 
+        if description_text == '':
+            description_text = lang.get('no-description')
+
         description_label = QLabel(description_text)
         description_label.setWordWrap(True)
         # set maximum length of description
@@ -245,7 +248,7 @@ def __init__(self, parent):
         version_layout = QHBoxLayout()
 
         # Create a version label
-        version_text = QLabel(f'{lang.get("version")} 0.1.1 (beta)')
+        version_text = QLabel(f'{lang.get("version")} 0.1.2 (beta)')
         version_layout.addWidget(version_text, stretch=1000)
 
         # Add a close button
@@ -260,23 +263,4 @@ def __init__(self, parent):
 
 if __name__ == '__main__':
     app = MainApplication()
-    app.run()
-
-# test
-# https://www.hln.be/buitenland/live-gijzeling-in-nederlands-cafe-voorbij-vier-slachtoffers-vrijgelaten-gijzelnemer-geboeid-door-de-politie~a0dfda52/
-# https://www.vrt.be/vrtmax/a-z/vrt-nws-journaal/2024/vrt-nws-journaal-vrt-nws-journaal-laat-20240421/
-# https://focus-wtv.be/nieuws/miss-belgie-west-vlaamse-finalisten-vallen-niet-in-de-prijzen
-# https://www.bruzz.be/actua/politiek/vlaams-minister-van-brussel-regering-blinkt-uit-passiviteit-en-inertie-2024-02-21
-# https://www.tvoost.be/nieuws/jan-tratnik-wint-omloop-oliver-naesen-heel-knap-vierde-als-je-vooraf-de-benen-niet-kan-inschatten-is-dit-een-mooi-resultaat-165206
-# https://www.tvl.be/nieuws/jongeren-die-voor-het-eerst-stemmen-weten-weinig-of-niets-over-de-verkiezingen-165198
-# https://www.robtv.be/nieuws/weekwas-zaterdag-24-februari-165193
-# https://www.hln.be/video/productie/we-hebben-de-ram-bij-de-horens-gevat-letterlijk-428950
-# https://www.nieuwsblad.be/cnt/dmf20240225_94177728
-# https://www.vrt.be/vrtmax/a-z/vrt-nws-journaal/2024/vrt-nws-journaal-vrt-nws-journaal-13u-20240225
-# https://www.rtv.be/regionale-sport/wout-van-aert-wil-meteen-scoren-tijdens-openingsweekend
-# https://www.vrt.be/vrtnws/nl/kijk/2024/02/25/d7d-oekraine-oorlog-iryna-mudra-gevlucht-met-zoon-nooit-opgeven-/
-# https://www.vrt.be/vrtnws/nl/2024/02/26/liveblog-boerenprotest/
-# https://www.gva.be/cnt/dmf20240229_96365490
-# https://www.ringtv.be/felicitaties-voor-drie-jarigen-die-op-schrikkeldag-jarig-zijn
-# https://www.standaard.be/cnt/dmf20231113_92216398
-# https://www.vrt.be/vrtnws/nl/2024/02/29/poetin-toespraak-parlement/
+    app.run()
diff --git a/gui/settings/settings.py b/gui/settings/settings.py
@@ -7,6 +7,7 @@
 
 class Settings:
     def __init__(self):
+        print(settings_file_path)
         self.config = configparser.ConfigParser()
         self._create()
         self._read()