Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package minitube for openSUSE:Factory checked in at 2021-09-16 23:14:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/minitube (Old) and /work/SRC/openSUSE:Factory/.minitube.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "minitube" Thu Sep 16 23:14:54 2021 rev:27 rq:919446 version:3.9.1 Changes: -------- --- /work/SRC/openSUSE:Factory/minitube/minitube.changes 2021-06-26 21:25:45.791367083 +0200 +++ /work/SRC/openSUSE:Factory/.minitube.new.1899/minitube.changes 2021-09-16 23:17:36.907981133 +0200 @@ -1,0 +2,6 @@ +Tue Sep 14 17:30:55 UTC 2021 - Carsten Ziepke <kiel...@gmail.com> + +- Update to 3.91: + https://github.com/flaviotordini/minitube/compare/3.9...3.9.1 + +------------------------------------------------------------------- Old: ---- minitube-3.9.tar.xz New: ---- minitube-3.9.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ minitube.spec ++++++ --- /var/tmp/diff_new_pack.RE4PCS/_old 2021-09-16 23:17:37.359981601 +0200 +++ /var/tmp/diff_new_pack.RE4PCS/_new 2021-09-16 23:17:37.363981605 +0200 @@ -17,7 +17,7 @@ Name: minitube -Version: 3.9 +Version: 3.9.1 Release: 0 Summary: Native YouTube Client License: GPL-3.0-or-later ++++++ _service ++++++ --- /var/tmp/diff_new_pack.RE4PCS/_old 2021-09-16 23:17:37.399981642 +0200 +++ /var/tmp/diff_new_pack.RE4PCS/_new 2021-09-16 23:17:37.399981642 +0200 @@ -4,7 +4,7 @@ <param name="url">https://github.com/flaviotordini/minitube.git</param> <param name="filename">minitube</param> <param name="versionformat">@PARENT_TAG@</param> - <param name="revision">3.9</param> + <param name="revision">3.9.1</param> </service> <service mode="disabled" name="recompress"> <param name="file">*.tar</param> ++++++ minitube-3.9.tar.xz -> minitube-3.9.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/minitube-3.9/lib/http/src/networkhttpreply.cpp new/minitube-3.9.1/lib/http/src/networkhttpreply.cpp --- old/minitube-3.9/lib/http/src/networkhttpreply.cpp 2021-06-22 01:31:51.000000000 +0200 +++ new/minitube-3.9.1/lib/http/src/networkhttpreply.cpp 2021-09-13 13:02:36.000000000 +0200 @@ -18,8 +18,13 @@ } void NetworkHttpReply::setupReply() { +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + connect(networkReply, &QNetworkReply::errorOccurred, this, &NetworkHttpReply::replyError, + Qt::UniqueConnection); +#else connect(networkReply, SIGNAL(error(QNetworkReply::NetworkError)), SLOT(replyError(QNetworkReply::NetworkError)), Qt::UniqueConnection); +#endif connect(networkReply, SIGNAL(finished()), SLOT(replyFinished()), Qt::UniqueConnection); connect(networkReply, SIGNAL(downloadProgress(qint64, qint64)), SLOT(downloadProgress(qint64, qint64)), Qt::UniqueConnection); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/minitube-3.9/lib/promises/emptypromise.h new/minitube-3.9.1/lib/promises/emptypromise.h --- old/minitube-3.9/lib/promises/emptypromise.h 2021-06-22 01:31:51.000000000 +0200 +++ new/minitube-3.9.1/lib/promises/emptypromise.h 2021-09-13 13:02:36.000000000 +0200 @@ -8,16 +8,16 @@ public: explicit EmptyPromise(QObject *parent = nullptr) : QObject(parent) { - connect(this, &EmptyPromise::success, this, &QObject::deleteLater); - connect(this, &EmptyPromise::error, this, &QObject::deleteLater); + connect(this, &EmptyPromise::resolve, this, &QObject::deleteLater); + connect(this, &EmptyPromise::reject, this, &QObject::deleteLater); }; - template <typename Functor> EmptyPromise &onSuccess(Functor func) { - connect(this, &EmptyPromise::success, this, func); + template <typename Functor> EmptyPromise &then(Functor func) { + connect(this, &EmptyPromise::resolve, this, func); return *this; } - template <typename Functor> EmptyPromise &onError(Functor func) { - connect(this, &EmptyPromise::error, this, func); + template <typename Functor> EmptyPromise &onFailed(Functor func) { + connect(this, &EmptyPromise::reject, this, func); return *this; } template <typename Functor> EmptyPromise &finally(Functor func) { @@ -26,8 +26,8 @@ } signals: - void success(); - void error(const QString &message); + void resolve(); + void reject(const QString &message); }; #endif // EMPTYPROMISE_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/minitube-3.9/lib/updater/src/updater.cpp new/minitube-3.9.1/lib/updater/src/updater.cpp --- old/minitube-3.9/lib/updater/src/updater.cpp 2021-06-22 01:31:51.000000000 +0200 +++ new/minitube-3.9.1/lib/updater/src/updater.cpp 2021-09-13 13:02:36.000000000 +0200 @@ -109,7 +109,7 @@ } label->setText(t); }; - connect(this, &Updater::statusChanged, this, onStatusChange); + connect(this, &Updater::statusChanged, label, onStatusChange); onStatusChange(status); } return label; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/minitube-3.9/minitube.pro new/minitube-3.9.1/minitube.pro --- old/minitube-3.9/minitube.pro 2021-06-22 01:31:51.000000000 +0200 +++ new/minitube-3.9.1/minitube.pro 2021-09-13 13:02:36.000000000 +0200 @@ -1,7 +1,7 @@ CONFIG += c++17 exceptions_off rtti_off object_parallel_to_source TEMPLATE = app -VERSION = 3.9 +VERSION = 3.9.1 DEFINES += APP_VERSION="$$VERSION" APP_NAME = Minitube diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/minitube-3.9/org.tordini.flavio.minitube.metainfo.xml new/minitube-3.9.1/org.tordini.flavio.minitube.metainfo.xml --- old/minitube-3.9/org.tordini.flavio.minitube.metainfo.xml 2021-06-22 01:31:51.000000000 +0200 +++ new/minitube-3.9.1/org.tordini.flavio.minitube.metainfo.xml 2021-09-13 13:02:36.000000000 +0200 @@ -37,6 +37,10 @@ <url type="donation">https://flavio.tordini.org/donate</url> <url type="translate">https://www.transifex.com/flaviotordini/minitube/</url> <releases> + <release version="3.9" date="2021-06-22"/> + <release version="3.8.2" date="2021-04-02"/> + <release version="3.8.1" date="2021-02-26"/> + <release version="3.8" date="2021-02-19"/> <release version="3.7" date="2020-12-30"/> </releases> <content_rating type="oars-1.1"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/minitube-3.9/src/subscriptionimportview.cpp new/minitube-3.9.1/src/subscriptionimportview.cpp --- old/minitube-3.9/src/subscriptionimportview.cpp 2021-06-22 01:31:51.000000000 +0200 +++ new/minitube-3.9.1/src/subscriptionimportview.cpp 2021-09-13 13:02:36.000000000 +0200 @@ -46,26 +46,40 @@ tip->setFont(FontUtils::medium()); layout->addWidget(tip); - auto button = new QPushButton("Open subscriptions.json"); + auto button = new QPushButton("Open subscriptions.csv"); button->setDefault(true); connect(this, &View::didAppear, button, [button] { button->setFocus(); }); button->setFocus(); button->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); connect(button, &QPushButton::clicked, this, [this] { auto dir = QStandardPaths::writableLocation(QStandardPaths::DownloadLocation); - QString fileName = QFileDialog::getOpenFileName(this, tr("Open subscriptions.json"), dir, - tr("JSON Files (*.json)")); + QString fileName = QFileDialog::getOpenFileName(this, tr("Open subscriptions.csv"), dir, + tr("YouTube data (*.csv *.json)")); if (!fileName.isEmpty()) { auto w = MainWindow::instance(); QString msg; QFile file(fileName); if (file.open(QFile::ReadOnly)) { int count = 0; - const auto array = QJsonDocument::fromJson(file.readAll()).array(); - for (const auto &i : array) { - auto id = i["snippet"]["resourceId"]["channelId"].toString(); - qDebug() << "Subscribing to" << id; - if (YTChannel::subscribe(id)) count++; + if (QFileInfo(fileName).suffix().toLower() == "csv") { + int lineNumber = 1; + while (!file.atEnd()) { + QByteArray line = file.readLine(); + if (lineNumber > 1) { + auto fields = line.split(','); + auto id = fields.first(); + qDebug() << "Subscribing to" << id; + if (YTChannel::subscribe(id)) count++; + } + lineNumber++; + } + } else { + const auto array = QJsonDocument::fromJson(file.readAll()).array(); + for (const auto &i : array) { + auto id = i["snippet"]["resourceId"]["channelId"].toString(); + qDebug() << "Subscribing to" << id; + if (YTChannel::subscribe(id)) count++; + } } msg = tr("Subscribed to %n channel(s)", "", count); w->showHome();
