Revert "Revert "replace youtube-dl with yt-dlp""

This reverts commit e7c9180.
accumulator · Feb 14, 2023 · 0fdf15b · 0fdf15b
1 parent 50b8552
commit 0fdf15b
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/.gitmodules b/.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
diff --git a/sailfish/harbour-quickddit.pro b/sailfish/harbour-quickddit.pro
@@ -136,9 +136,9 @@ harbour {
 }
 
 # kludge needed as qmake cannot control INSTALL permissions
-system(chmod 0644 ../youtube-dl/youtube_dl/__main__.py ../youtube-dl/youtube_dl/YoutubeDL.py)
+system(chmod 0644 ../yt-dlp/yt_dlp/__main__.py ../yt-dlp/yt_dlp/YoutubeDL.py)
 
-youtube-dl.files = ../youtube-dl/youtube_dl
+youtube-dl.files = ../yt-dlp/yt_dlp
 youtube-dl.path = /usr/share/$${TARGET}
 
 INSTALLS += youtube-dl
diff --git a/sailfish/qml/ytdl_wrapper.py b/sailfish/qml/ytdl_wrapper.py
@@ -3,7 +3,7 @@
 
 from __future__ import unicode_literals
 import pyotherside
-import youtube_dl
+import yt_dlp as youtube_dl
 
 downloaddir = '/tmp'
 

diff --git a/youtube-dl b/youtube-dl
diff --git a/yt-dlp b/yt-dlp