Switch from youtube-dl to yt-dlp

Author: Andrew Branson

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "qt-json"]
 	path = qt-json
 	url = https://github.com/da4c30ff/qt-json.git
-[submodule "youtube-dl"]
-	path = youtube-dl
-	url = https://github.com/rg3/youtube-dl.git
+[submodule "yt-dlp"]
+	path = yt-dlp
+	url = https://github.com/yt-dlp/yt-dlp.git

sailfish/harbour-quickddit.pro

@@ -110,7 +110,7 @@ include(translations/translations.pri)
     system(qdbusxml2cpp iface/org.quickddit.xml -a app_adaptor -p app_interface)
 }
 
-youtube-dl.files = ../youtube-dl/youtube_dl
-youtube-dl.path = /usr/share/$${TARGET}
+yt-dlp.files = ../yt-dlp/yt_dlp
+yt-dlp.path = /usr/share/$${TARGET}
 
-INSTALLS += youtube-dl
+INSTALLS += yt-dlp

sailfish/qml/VideoViewPage.qml

@@ -210,8 +210,8 @@ AbstractPage {
 
     Component.onCompleted: {
         if (videoUrl === "") {
-            // resolve with youtube-dl
-            console.log("only origUrl set, resolving with youtube-dl...")
+            // resolve with yt-dlp
+            console.log("only origUrl set, resolving with yt-dlp...")
             python.requestVideoUrlFor(origUrl)
         } else {
             mediaPlayer.source = videoUrl
@@ -337,7 +337,7 @@ AbstractPage {
 
         onError: {
             error = true
-            infoBanner.warning(qsTr("youtube-dl error: %1").arg(traceback));
+            infoBanner.warning(qsTr("yt-dlp error: %1").arg(traceback));
         }
 
         onFail: {

sailfish/qml/ytdl_wrapper.py

@@ -3,7 +3,7 @@
 
 from __future__ import unicode_literals
 import pyotherside
-import youtube_dl
+import yt_dlp
 
 downloaddir = '/tmp'
 
@@ -26,7 +26,7 @@ def error(self, msg):
     'logger': logger
 }
 
-ytdl_info = youtube_dl.YoutubeDL(ytdl_info_opts);
+ytdl_info = yt_dlp.YoutubeDL(ytdl_info_opts);
 
 def setDownloadDir(dir):
     downloaddir = dir
@@ -36,7 +36,7 @@ def retrieveVideoInfo(url):
         logger.debug('retrieveVideoUrl ' + str(url))
         info = ytdl_info.extract_info(url, download=False)
         return info
-    except youtube_dl.utils.DownloadError as e:
+    except yt_dlp.utils.DownloadError as e:
         pyotherside.send('fail', ','.join(e.args))
 
 def downloadVideo(url):

sailfish/translations/harbour-quickddit-cs.ts

@@ -1800,7 +1800,7 @@ To add accounts, simply log in. Quickddit will remember succesful logins and lis
     </message>
     <message>
         <location filename="../qml/VideoViewPage.qml" line="340"/>
-        <source>youtube-dl error: %1</source>
+        <source>yt-dlp error: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

sailfish/translations/harbour-quickddit-de.ts

@@ -1787,7 +1787,7 @@ Um Konten hinzuzufügen, logge dich ein. Quickddit merkt sich erfolgreiche Login
     </message>
     <message>
         <location filename="../qml/VideoViewPage.qml" line="340"/>
-        <source>youtube-dl error: %1</source>
+        <source>yt-dlp error: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

sailfish/translations/harbour-quickddit-el.ts

@@ -1785,7 +1785,7 @@ To add accounts, simply log in. Quickddit will remember succesful logins and lis
     </message>
     <message>
         <location filename="../qml/VideoViewPage.qml" line="340"/>
-        <source>youtube-dl error: %1</source>
+        <source>yt-dlp error: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

sailfish/translations/harbour-quickddit-en_GB.ts

@@ -1787,8 +1787,8 @@ To add accounts, simply log in. Quickddit will remember succesful logins and lis
     </message>
     <message>
         <location filename="../qml/VideoViewPage.qml" line="340"/>
-        <source>youtube-dl error: %1</source>
-        <translation>youtube-dl error: %1</translation>
+        <source>yt-dlp error: %1</source>
+        <translation>yt-dlp error: %1</translation>
     </message>
 </context>
 <context>

sailfish/translations/harbour-quickddit-et.ts

@@ -1785,7 +1785,7 @@ To add accounts, simply log in. Quickddit will remember succesful logins and lis
     </message>
     <message>
         <location filename="../qml/VideoViewPage.qml" line="340"/>
-        <source>youtube-dl error: %1</source>
+        <source>yt-dlp error: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

sailfish/translations/harbour-quickddit-fr.ts

@@ -1785,7 +1785,7 @@ To add accounts, simply log in. Quickddit will remember succesful logins and lis
     </message>
     <message>
         <location filename="../qml/VideoViewPage.qml" line="340"/>
-        <source>youtube-dl error: %1</source>
+        <source>yt-dlp error: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>