Merge branch 'bugfix-crash-batch' into develop

Author: setvisible

3rd/yt-dlp/bin/yt-dlp

@@ -1 +1 @@
-2025.02.19
+2025.03.21

3rd/yt-dlp/bin/yt-dlp.exe

@@ -39,7 +39,8 @@ const std::chrono::milliseconds TIMEOUT_COUNT_DOWN(1000);
 const std::chrono::milliseconds TIMEOUT_INFO(150);
 
 const int SELECTION_DISPLAY_LIMIT = 10;
-const int MSEC_SPEED_DISPLAY_TIME = 2000;
+const int METRICS_TIMEOUT_MSEC = 500;
+const int METRICS_LOOP_COUNTER = 4; // 2000 msec (4*500) is enough to read values
 
 const int MSEC_AUTO_SAVE = 3000; ///< Autosave the queue every 3 seconds.
 

3rd/yt-dlp/version

@@ -49,12 +49,13 @@ Scheduler::Scheduler(QObject *parent) : QObject(parent)
     , m_queueModel(new QueueModel(this))
     , m_networkManager(new NetworkManager(this))
     , m_snapshot(new Snapshot(this))
-    , m_speedTimer(new QTimer(this))
+    , m_metricsTimer(new QTimer(this))
 {
-    connect(this, SIGNAL(jobFinished(AbstractJob*)),
-            this, SLOT(startNext(AbstractJob*)));
+    connect(this, SIGNAL(jobFinished(AbstractJob*)), this, SLOT(startNext(AbstractJob*)));
 
-    connect(m_speedTimer, SIGNAL(timeout()), this, SLOT(onSpeedTimerTimeout()));
+    connect(m_metricsTimer, SIGNAL(timeout()), this, SLOT(onMetricsTimerTimeout()));
+    m_metricsTimer->setSingleShot(false);
+    m_metricsTimer->start(METRICS_TIMEOUT_MSEC);
 }
 
 Scheduler::~Scheduler()
@@ -293,24 +294,34 @@ QList<AbstractJob*> Scheduler::runningJobs() const
 
 /******************************************************************************
  ******************************************************************************/
-void Scheduler::onSpeedTimerTimeout()
+qreal Scheduler::totalSpeed()
 {
-    m_speedTimer->stop();
-    m_previouSpeed = 0;
-    emit onJobChanged();
+    return m_metricsSpeed;
 }
 
-qreal Scheduler::totalSpeed()
+void Scheduler::onMetricsTimerTimeout()
 {
     qreal speed = 0;
     for (auto job : jobs()) {
-        speed += qMax(job->speed(), qreal(0));
+        speed += qMax(job->speed(), qreal(0)); // speed is negative for pending jobs
     }
+
     if (speed > 0) {
-        m_previouSpeed = speed;
-        m_speedTimer->start(MSEC_SPEED_DISPLAY_TIME);
+        m_metricsLoopCount = 0;
+    } else {
+        // When speed is 0 (i.e. all jobs are finished), the metrics aren't updated immediatelty.
+        // Instead, the previous metrics is kept as-is for a couple of seconds,
+        // to let us read the values, then it's updated.
+        if (m_metricsLoopCount < METRICS_LOOP_COUNTER) {
+            m_metricsLoopCount++;
+            return;
+        }
+    }
+
+    if (m_metricsSpeed != speed) {
+        m_metricsSpeed = speed;
+        emit metricsChanged();
     }
-    return m_previouSpeed;
 }
 
 /******************************************************************************

src/constants.h

@@ -80,6 +80,7 @@ class Scheduler : public QObject, public IScheduler
     QAbstractItemModel *model() const;
 
 signals:
+    void metricsChanged();
     void jobFinished(AbstractJob *job);
     void jobRenamed(QString oldName, QString newName, bool success);
 
@@ -93,8 +94,7 @@ private slots:
     void startNext(AbstractJob *job);
 
     void onSettingsChanged();
-
-    void onSpeedTimerTimeout();
+    void onMetricsTimerTimeout();
 
 private:
     QueueModel *m_queueModel = nullptr;
@@ -104,8 +104,9 @@ private slots:
     NetworkManager *m_networkManager = nullptr;
     Settings *m_settings = nullptr;
 
-    qreal m_previouSpeed = 0;
-    QTimer* m_speedTimer = nullptr;
+    QTimer *m_metricsTimer = nullptr;
+    qreal m_metricsSpeed = 0;
+    int m_metricsLoopCount = 0;
 
     // Pool
     int m_maxSimultaneousDownloads = 4;

src/core/scheduler.cpp

@@ -338,7 +338,7 @@ QList<AbstractJob*> AddBatchDialog::createJobFiles(const QUrl &inputUrl) const
     QList<AbstractJob*> items;
     const QStringList urls = Regex::interpret(inputUrl);
     for (auto url : urls) {
-        items << createJobFiles(url);
+        items << createJobFile(url);
     }
     return items;
 }

src/core/scheduler.h

@@ -141,6 +141,7 @@ MainWindow::MainWindow(QWidget *parent): QMainWindow(parent)
 
     /* Connect the SceneManager to the MainWindow. */
     /* The SceneManager centralizes the changes. */
+    connect(m_scheduler, SIGNAL(metricsChanged()), this, SLOT(onMetricsChanged()));
     connect(m_scheduler, SIGNAL(jobFinished(AbstractJob*)), this, SLOT(onJobFinished(AbstractJob*)));
     connect(m_scheduler, SIGNAL(jobRenamed(QString,QString,bool)), this, SLOT(onJobRenamed(QString,QString,bool)), Qt::QueuedConnection);
 
@@ -924,6 +925,11 @@ void MainWindow::onDataChanged()
     m_scheduler->activateSnapshot();
 }
 
+void MainWindow::onMetricsChanged()
+{
+    refreshTitleAndStatus();
+}
+
 void MainWindow::onJobFinished(AbstractJob *job)
 {
     refreshMenus();

src/dialogs/addbatchdialog.cpp

@@ -113,6 +113,7 @@ public slots:
 
 private slots:
     void onDataChanged();
+    void onMetricsChanged();
     void onJobFinished(AbstractJob *job);
     void onJobRenamed(const QString &oldName, const QString &newName, bool success);
     void onSelectionChanged();

src/mainwindow.cpp

@@ -1 +1 @@
-4.2.0
+4.2.1