Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V2024.11.1-next #948

Merged
merged 18 commits into from
Nov 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
with:
pkgs: boost-date-time libnick qtbase qtsvg qttools
triplet: x64-windows
revision: a54c4ba3aef5fe56cf11192f4476aaf057876551
revision: d9e76826d9fd74df19b7855d8abd509cc401ba6e
token: ${{ secrets.GITHUB_TOKEN }}
github-binarycache: true
- name: "Build"
Expand All @@ -47,7 +47,7 @@ jobs:
working-directory: ${{github.workspace}}/inno
run: |
powershell -command "Invoke-WebRequest https://aka.ms/vs/17/release/vc_redist.x64.exe -OutFile vc_redist.x64.exe"
powershell -command "Invoke-WebRequest https://github.com/yt-dlp/yt-dlp/releases/download/2024.11.04/yt-dlp.exe -OutFile yt-dlp.exe"
powershell -command "Invoke-WebRequest https://github.com/yt-dlp/yt-dlp/releases/download/2024.11.18/yt-dlp.exe -OutFile yt-dlp.exe"
powershell -command "Invoke-WebRequest https://github.com/aria2/aria2/releases/download/release-1.37.0/aria2-1.37.0-win-64bit-build1.zip -OutFile aria2.zip"
powershell -command "Invoke-WebRequest https://github.com/GyanD/codexffmpeg/releases/download/7.1/ffmpeg-7.1-full_build.zip -OutFile ffmpeg.zip"
powershell -command "Expand-Archive -Force 'aria2.zip'"
Expand Down
25 changes: 16 additions & 9 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ if (POLICY CMP0141)
set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT "$<IF:$<AND:$<C_COMPILER_ID:MSVC>,$<CXX_COMPILER_ID:MSVC>>,$<$<CONFIG:Debug,RelWithDebInfo>:EditAndContinue>,$<$<CONFIG:Debug,RelWithDebInfo>:ProgramDatabase>>")
endif()

project("org.nickvision.tubeconverter" LANGUAGES C CXX VERSION 2024.11.0 DESCRIPTION "Download web video and audio.")
project("org.nickvision.tubeconverter" LANGUAGES C CXX VERSION 2024.11.1 DESCRIPTION "Download web video and audio.")
set(SHORT_NAME "parabolic")
set(DISPLAY_NAME "Parabolic")
include(GNUInstallDirs)
Expand All @@ -38,16 +38,23 @@ if(EXISTS "${GETTEXT_XGETTEXT_EXECUTABLE}")
endif()
endif()
endif()
if(EXISTS "${ITSTOOL_EXECUTABLE}")
if(EXISTS "${YELP_BUILD_EXECUTABLE}")
set(HAS_YELP TRUE)
endif()
endif()

add_subdirectory("libparabolic")
if(NOT BACKEND_ONLY)
if(WIN32)
add_subdirectory("org.nickvision.tubeconverter.qt")
else()
if(NOT DEFINED UI_PLATFORM)
add_subdirectory("org.nickvision.tubeconverter.gnome")
add_subdirectory("lib${SHORT_NAME}")
if(WIN32)
add_subdirectory("${PROJECT_NAME}.qt")
else()
if(NOT DEFINED UI_PLATFORM)
if(LINUX)
add_subdirectory("${PROJECT_NAME}.gnome")
else()
add_subdirectory("org.nickvision.tubeconverter.${UI_PLATFORM}")
add_subdirectory("${PROJECT_NAME}.qt")
endif()
else()
add_subdirectory("${PROJECT_NAME}.${UI_PLATFORM}")
endif()
endif()
4 changes: 2 additions & 2 deletions docs/html/cs/downloader.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
<div class="contents pagewide">
<p class="p">Na této straně najdete vysvětlení všech možností konfigurace stahování v předvolbách v aplikaci <span class="app">Parabolic</span>.</p>
<div class="terms"><div class="inner"><div class="region"><dl class="terms">
<dt class="terms">Verbose Logging</dt>
<dt class="terms">Podrobné protokolování</dt>
<dd class="terms">
<p class="p">If enabled, more verbose logs will be provided by <span class="code">yt-dlp</span> for each download.</p>
<p class="p">Pokud je tato funkce povolena, budou programem <span class="code">yt-dlp</span> poskytnuty podrobnější protokoly.</p>
<div class="note note-advanced" title="Pokročilé">
<svg height="24" width="24" version="1.1">
<g>
Expand Down
6 changes: 3 additions & 3 deletions docs/html/cs/downloads.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<path class="yelp-svg-fill" d="m4 3h16c0.554 0 1 0.446 1 1v11h-6v6h-11c-0.554 0-1-0.446-1-1v-16c0-0.554 0.446-1 1-1z"></path>
<path class="yelp-svg-fill" d="m17 16h4l-5 5v-4c0-0.554 0.446-1 1-1z"></path>
</g>
</svg><div class="inner"><div class="region"><div class="contents"><p class="p">Parabolic will detect downloads that should be resumed and avoid this setting when recovering or retrying failed downloads</p></div></div></div>
</svg><div class="inner"><div class="region"><div class="contents"><p class="p">Parabolic rozpozná stahování, která mají být obnovena a vyhne se tomuto nastavení při obnově nebo opakování neúspěšných stahování</p></div></div></div>
</div>
<div class="note note-advanced" title="Pokročilé">
<svg height="24" width="24" version="1.1">
Expand Down Expand Up @@ -151,9 +151,9 @@
</svg><div class="inner"><div class="region"><div class="contents"><p class="p">Výchozí: jakýkoli</p></div></div></div>
</div>
</dd>
<dt class="terms">Preferred Subtitle Format</dt>
<dt class="terms">Preferovaný formát titulků</dt>
<dd class="terms">
<p class="p">The file format Parabolic should ensure all downloaded subtitles are downloaded as.</p>
<p class="p">Formát souboru, ve kterém má aplikace Parabolic zajistit stahování všech titulků.</p>
<div class="note note-advanced" title="Pokročilé">
<svg height="24" width="24" version="1.1">
<g>
Expand Down
10 changes: 5 additions & 5 deletions docs/html/cs/newDownload.html
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,13 @@
<path class="yelp-svg-fill" d="m8.2435 7.0719-1.9004-3.3145 1.4143-1.4143 3.1596 1.7457z"></path>
<path class="yelp-svg-fill" d="m11.072 11.757-3.3146 1.9-1.4143-1.414 1.7457-3.1602z"></path>
</g>
</svg><div class="inner"><div class="region"><div class="contents"><p class="p">Selecting the <span class="code">Video (Generic)</span> or <span class="code">Audio (Generic)</span> file types will cause Parabolic to download the media in the original file type of the media without performing any conversions.</p></div></div></div>
</svg><div class="inner"><div class="region"><div class="contents"><p class="p">Vybráním typu souboru <span class="code">Video (obecné)</span> nebo <span class="code">Zvuk (obecný)</span> stáhne aplikace Parabolic média v původním typu souboru bez vykonání jakýchkoli konverzí.</p></div></div></div>
</div>
</dd>
<dt class="terms">Kvalita</dt>
<dd class="terms">
<p class="p">Pokud je typem souboru typ videa, budou uvedené kvality odpovídat rozlišení dostupných médií.</p>
<p class="p">If the file type is an audio type, the listed qualities will be the audio bitrates of the media available.</p>
<p class="p">Pokud je typem souboru typ zvuku, budou uvedené kvality odpovídat datovým tokům dostupných médií.</p>
<div class="note" title="Upozornění">
<svg height="24" width="24" version="1.1">
<g>
Expand All @@ -110,16 +110,16 @@
</svg><div class="inner"><div class="region"><div class="contents"><p class="p">Dříve použitý stav bude zapamatován a předvolen pro další stahování.</p></div></div></div>
</div>
</dd>
<dt class="terms">Subtitles</dt>
<dt class="terms">Titulky</dt>
<dd class="terms">
<p class="p">The list of subtitles available by the media that can be selected for download by the user. Further subtitle settings can be configured in <span class="link"><a href="downloads.html" title="Stahování">preferences</a></span>.</p>
<p class="p">Seznam titulků v médiu dostupných ke stažení uživatelem. Další nastavení titulků najdete v <span class="link"><a href="downloads.html" title="Stahování">předvolbách</a></span>.</p>
<div class="note" title="Upozornění">
<svg height="24" width="24" version="1.1">
<g>
<path class="yelp-svg-fill" d="m4 3h16c0.554 0 1 0.446 1 1v11h-6v6h-11c-0.554 0-1-0.446-1-1v-16c0-0.554 0.446-1 1-1z"></path>
<path class="yelp-svg-fill" d="m17 16h4l-5 5v-4c0-0.554 0.446-1 1-1z"></path>
</g>
</svg><div class="inner"><div class="region"><div class="contents"><p class="p">The previously selected subtitles will be remembered and pre-selected for the next download.</p></div></div></div>
</svg><div class="inner"><div class="region"><div class="contents"><p class="p">Dříve vybrané titulky budou zapamatovány a předem zvoleny pro další stahování.</p></div></div></div>
</div>
</dd>
<dt class="terms">Rozdělit kapitoly</dt>
Expand Down
4 changes: 2 additions & 2 deletions docs/html/es/downloader.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
<div class="contents pagewide">
<p class="p">Esta página explica todas las opciones para configurar el Downloader en las preferencias de <span class="app">Parabolic</span>.</p>
<div class="terms"><div class="inner"><div class="region"><dl class="terms">
<dt class="terms">Verbose Logging</dt>
<dt class="terms">Registro detallado</dt>
<dd class="terms">
<p class="p">If enabled, more verbose logs will be provided by <span class="code">yt-dlp</span> for each download.</p>
<p class="p">Si se activa, <span class="code">yt-dlp</span> proporcionará más registros detallados para cada descarga.</p>
<div class="note note-advanced" title="Avanzada">
<svg height="24" width="24" version="1.1">
<g>
Expand Down
6 changes: 3 additions & 3 deletions docs/html/es/downloads.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<path class="yelp-svg-fill" d="m4 3h16c0.554 0 1 0.446 1 1v11h-6v6h-11c-0.554 0-1-0.446-1-1v-16c0-0.554 0.446-1 1-1z"></path>
<path class="yelp-svg-fill" d="m17 16h4l-5 5v-4c0-0.554 0.446-1 1-1z"></path>
</g>
</svg><div class="inner"><div class="region"><div class="contents"><p class="p">Parabolic will detect downloads that should be resumed and avoid this setting when recovering or retrying failed downloads</p></div></div></div>
</svg><div class="inner"><div class="region"><div class="contents"><p class="p">Parabolic detectará las descargas que deban reanudarse y evitará esta configuración al recuperar o reintentar descargas fallidas</p></div></div></div>
</div>
<div class="note note-advanced" title="Avanzada">
<svg height="24" width="24" version="1.1">
Expand Down Expand Up @@ -151,9 +151,9 @@
</svg><div class="inner"><div class="region"><div class="contents"><p class="p">Por defecto: Cualquiera</p></div></div></div>
</div>
</dd>
<dt class="terms">Preferred Subtitle Format</dt>
<dt class="terms">Formato de subtítulos preferido</dt>
<dd class="terms">
<p class="p">The file format Parabolic should ensure all downloaded subtitles are downloaded as.</p>
<p class="p">El formato de archivo en el que se supone que Parabolic debe descargar todos los subtítulos.</p>
<div class="note note-advanced" title="Avanzada">
<svg height="24" width="24" version="1.1">
<g>
Expand Down
10 changes: 5 additions & 5 deletions docs/html/es/newDownload.html
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,13 @@
<path class="yelp-svg-fill" d="m8.2435 7.0719-1.9004-3.3145 1.4143-1.4143 3.1596 1.7457z"></path>
<path class="yelp-svg-fill" d="m11.072 11.757-3.3146 1.9-1.4143-1.414 1.7457-3.1602z"></path>
</g>
</svg><div class="inner"><div class="region"><div class="contents"><p class="p">Selecting the <span class="code">Video (Generic)</span> or <span class="code">Audio (Generic)</span> file types will cause Parabolic to download the media in the original file type of the media without performing any conversions.</p></div></div></div>
</svg><div class="inner"><div class="region"><div class="contents"><p class="p">Al seleccionar los tipos de archivo <span class="code"> Video (Genérico) </span> o <span class="code"> Audio (Genérico) </span>, Parabolic descargará el contenido multimedia en el tipo de archivo original del mismo sin realizar ninguna conversión.</p></div></div></div>
</div>
</dd>
<dt class="terms">Calidad</dt>
<dd class="terms">
<p class="p">Si el tipo de archivo es de vídeo, las calidades indicadas serán las resoluciones de los medios disponibles.</p>
<p class="p">If the file type is an audio type, the listed qualities will be the audio bitrates of the media available.</p>
<p class="p">Si el tipo de archivo es de audio, las calidades indicadas serán las tasas de bits de audio de los medios disponibles.</p>
<div class="note" title="Nota">
<svg height="24" width="24" version="1.1">
<g>
Expand All @@ -110,16 +110,16 @@
</svg><div class="inner"><div class="region"><div class="contents"><p class="p">El estado usado anteriormente será recordado y preseleccionado para la siguiente descarga.</p></div></div></div>
</div>
</dd>
<dt class="terms">Subtitles</dt>
<dt class="terms">Subtítulos</dt>
<dd class="terms">
<p class="p">The list of subtitles available by the media that can be selected for download by the user. Further subtitle settings can be configured in <span class="link"><a href="downloads.html" title="Descargas">preferences</a></span>.</p>
<p class="p">Lista de subtítulos disponibles en el medio que el usuario puede seleccionar para descargar. Se pueden configurar más ajustes de subtítulos en <span class="link"><a href="downloads.html" title="Descargas"> preferencias </a></span> .</p>
<div class="note" title="Nota">
<svg height="24" width="24" version="1.1">
<g>
<path class="yelp-svg-fill" d="m4 3h16c0.554 0 1 0.446 1 1v11h-6v6h-11c-0.554 0-1-0.446-1-1v-16c0-0.554 0.446-1 1-1z"></path>
<path class="yelp-svg-fill" d="m17 16h4l-5 5v-4c0-0.554 0.446-1 1-1z"></path>
</g>
</svg><div class="inner"><div class="region"><div class="contents"><p class="p">The previously selected subtitles will be remembered and pre-selected for the next download.</p></div></div></div>
</svg><div class="inner"><div class="region"><div class="contents"><p class="p">Los subtítulos previamente seleccionados serán recordados y preseleccionados para la próxima descarga.</p></div></div></div>
</div>
</dd>
<dt class="terms">Separar los capítulos</dt>
Expand Down
4 changes: 2 additions & 2 deletions docs/html/fr/downloader.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
<div class="contents pagewide">
<p class="p">Cette page explique toutes les options pour configurer le téléchargeur dans les préférences de <span class="app">Parabolic</span>.</p>
<div class="terms"><div class="inner"><div class="region"><dl class="terms">
<dt class="terms">Verbose Logging</dt>
<dt class="terms">Journalisation verbeuse</dt>
<dd class="terms">
<p class="p">If enabled, more verbose logs will be provided by <span class="code">yt-dlp</span> for each download.</p>
<p class="p">Si cette option est activée, des journaux plus verbeux seront fournis par <span class="code">yt-dlp</span> pour chaque téléchargement.</p>
<div class="note note-advanced" title="Avancé">
<svg height="24" width="24" version="1.1">
<g>
Expand Down
6 changes: 3 additions & 3 deletions docs/html/fr/downloads.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<path class="yelp-svg-fill" d="m4 3h16c0.554 0 1 0.446 1 1v11h-6v6h-11c-0.554 0-1-0.446-1-1v-16c0-0.554 0.446-1 1-1z"></path>
<path class="yelp-svg-fill" d="m17 16h4l-5 5v-4c0-0.554 0.446-1 1-1z"></path>
</g>
</svg><div class="inner"><div class="region"><div class="contents"><p class="p">Parabolic will detect downloads that should be resumed and avoid this setting when recovering or retrying failed downloads</p></div></div></div>
</svg><div class="inner"><div class="region"><div class="contents"><p class="p">Parabolic détectera les téléchargements qui devraient être repris et évitera ce paramètre lors de la récupération ou de la nouvelle tentative de téléchargement ayant échoué</p></div></div></div>
</div>
<div class="note note-advanced" title="Avancé">
<svg height="24" width="24" version="1.1">
Expand Down Expand Up @@ -151,9 +151,9 @@
</svg><div class="inner"><div class="region"><div class="contents"><p class="p">Par défaut : N’importe lequel</p></div></div></div>
</div>
</dd>
<dt class="terms">Preferred Subtitle Format</dt>
<dt class="terms">Format de sous-titres préféré</dt>
<dd class="terms">
<p class="p">The file format Parabolic should ensure all downloaded subtitles are downloaded as.</p>
<p class="p">Le format de fichier que tous les sous-titres téléchargés devraient adopter.</p>
<div class="note note-advanced" title="Avancé">
<svg height="24" width="24" version="1.1">
<g>
Expand Down
10 changes: 5 additions & 5 deletions docs/html/fr/newDownload.html
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,13 @@
<path class="yelp-svg-fill" d="m8.2435 7.0719-1.9004-3.3145 1.4143-1.4143 3.1596 1.7457z"></path>
<path class="yelp-svg-fill" d="m11.072 11.757-3.3146 1.9-1.4143-1.414 1.7457-3.1602z"></path>
</g>
</svg><div class="inner"><div class="region"><div class="contents"><p class="p">Selecting the <span class="code">Video (Generic)</span> or <span class="code">Audio (Generic)</span> file types will cause Parabolic to download the media in the original file type of the media without performing any conversions.</p></div></div></div>
</svg><div class="inner"><div class="region"><div class="contents"><p class="p">La sélection des types de fichiers <span class="code">Vidéo (générique)</span> ou <span class="code">Audio (générique)</span> obligera Parabolic à télécharger le média dans son type de fichier d’origine sans effectuer aucune conversion.</p></div></div></div>
</div>
</dd>
<dt class="terms">Qualité</dt>
<dd class="terms">
<p class="p">Si le type de fichier est une vidéo, la liste des qualités sera celle des résolutions disponibles pour le média.</p>
<p class="p">If the file type is an audio type, the listed qualities will be the audio bitrates of the media available.</p>
<p class="p">Si le type de fichier est un audio, la liste des qualités sera celle des débits binaires audio disponibles pour le média.</p>
<div class="note" title="Note">
<svg height="24" width="24" version="1.1">
<g>
Expand All @@ -110,16 +110,16 @@
</svg><div class="inner"><div class="region"><div class="contents"><p class="p">Les paramètres utilisés précédemment seront mémorisés et présélectionnés pour le prochain téléchargement.</p></div></div></div>
</div>
</dd>
<dt class="terms">Subtitles</dt>
<dt class="terms">Sous-titres</dt>
<dd class="terms">
<p class="p">The list of subtitles available by the media that can be selected for download by the user. Further subtitle settings can be configured in <span class="link"><a href="downloads.html" title="Téléchargements">preferences</a></span>.</p>
<p class="p">La liste des sous-titres disponibles pour le média et pouvant être sélectionnés pour téléchargement par l’utilisateur. D’autres paramètres de sous-titres peuvent être configurés dans les <span class="link"><a href="downloads.html" title="Téléchargements">Préférences</a></span>.</p>
<div class="note" title="Note">
<svg height="24" width="24" version="1.1">
<g>
<path class="yelp-svg-fill" d="m4 3h16c0.554 0 1 0.446 1 1v11h-6v6h-11c-0.554 0-1-0.446-1-1v-16c0-0.554 0.446-1 1-1z"></path>
<path class="yelp-svg-fill" d="m17 16h4l-5 5v-4c0-0.554 0.446-1 1-1z"></path>
</g>
</svg><div class="inner"><div class="region"><div class="contents"><p class="p">The previously selected subtitles will be remembered and pre-selected for the next download.</p></div></div></div>
</svg><div class="inner"><div class="region"><div class="contents"><p class="p">Les sous-titres sélectionnés précédemment seront mémorisés et présélectionnés pour le prochain téléchargement.</p></div></div></div>
</div>
</dd>
<dt class="terms">Diviser en chapitres</dt>
Expand Down
4 changes: 2 additions & 2 deletions docs/html/sk/downloader.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
<div class="contents pagewide">
<p class="p">Na tejto stránke sú vysvetlené všetky možnosti nastavenia Sťahovača v časti Nastavenia v aplikácii <span class="app">Parabolic</span>.</p>
<div class="terms"><div class="inner"><div class="region"><dl class="terms">
<dt class="terms">Verbose Logging</dt>
<dt class="terms">Podrobné zaznamenávanie</dt>
<dd class="terms">
<p class="p">If enabled, more verbose logs will be provided by <span class="code">yt-dlp</span> for each download.</p>
<p class="p">Ak je táto možnosť povolená, <span class="code">yt-dlp</span> bude pri každom sťahovaní poskytovať viac podrobných záznamov.</p>
<div class="note note-advanced" title="Pokročilé">
<svg height="24" width="24" version="1.1">
<g>
Expand Down
Loading
Loading