Sophie

Sophie

distrib > Mageia > 9 > armv7hl > media > core-release-src > by-pkgid > ca0fe33de533eca03a08951a851a9b54 > files > 1

clipgrab-3.9.7-1.mga9.src.rpm

diff -Nrup a/clipgrab.cpp b/clipgrab.cpp
--- a/clipgrab.cpp	2021-10-08 15:58:07.000000000 +0200
+++ b/clipgrab.cpp	2023-02-22 07:07:01.554008345 +0100
@@ -568,7 +568,7 @@ void ClipGrab::downloadYoutubeDl(bool fo
             return;
         }
     }
-    if (QSettings().value("disableYoutubeDlDownload", false).toBool()) return;
+    if (QSettings().value("disableYoutubeDlDownload", true).toBool()) return;
 
     this->helperDownloaderDialog = new QDialog(QApplication::activeWindow());
     this->helperDownloaderUi = new Ui::HelperDownloader();
@@ -637,7 +637,7 @@ void ClipGrab::startYoutubeDlDownload()
 }
 
 void ClipGrab::updateYoutubeDl() {
-    if (QSettings().value("disableYoutubeDlUpdate", false).toBool()) return;
+    if (QSettings().value("disableYoutubeDlUpdate", true).toBool()) return;
     youtubeDlUpdateProcess = YoutubeDl::instance(QStringList() << "--update");
     youtubeDlUpdateProcess->start();
     connect(youtubeDlUpdateProcess, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), [=] {
diff -Nrup a/youtube_dl.cpp b/youtube_dl.cpp
--- a/youtube_dl.cpp	2021-10-08 15:58:07.000000000 +0200
+++ b/youtube_dl.cpp	2023-02-22 07:13:14.041777344 +0100
@@ -10,27 +10,27 @@ QString YoutubeDl::path = QString();
 QString YoutubeDl::find(bool force) {
     if (!force && !path.isEmpty()) return path;
 
-    // Prefer downloaded youtube-dl
-    QString localPath = QStandardPaths::locate(QStandardPaths::AppDataLocation, "yt-dlp");
-    QProcess* process = instance(localPath, QStringList() << "--version");
+    // Prefer system-wide youtube-dlp installation
+    QString globalPath = QStandardPaths::findExecutable("yt-dlp");
+    QProcess* process = instance(globalPath, QStringList() << "--version");
     process->start();
     process->waitForFinished();
     process->deleteLater();
     if (process->state() != QProcess::NotRunning) process->kill();
     if (process->exitCode() == QProcess::ExitStatus::NormalExit) {
-        path = localPath;
+        path = globalPath;
         return path;
     }
 
-    // Try system-wide youtube-dlp installation
-    QString globalPath = QStandardPaths::findExecutable("yt-dlp");
-    process = instance(globalPath, QStringList() << "--version");
+    // Try downloaded youtube-dlp
+    QString localPath = QStandardPaths::locate(QStandardPaths::AppDataLocation, "yt-dlp");
+    process = instance(localPath, QStringList() << "--version");
     process->start();
     process->waitForFinished();
     process->deleteLater();
     if (process->state() != QProcess::NotRunning) process->kill();
     if (process->exitCode() == QProcess::ExitStatus::NormalExit) {
-        path = globalPath;
+        path = localPath;
         return path;
     }