noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-21 22:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

minor streamlink quality option fix (#664)

Browse source
This commit is contained in:
Confuseh 2018-08-14 16:36:20 +01:00 committed by fourtf
parent 902fe684c0
commit d7566665d8
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/util/StreamLink.cpp
View file

@ -4,6 +4,7 @@
#include "Helpers.hpp" #include "Helpers.hpp"
#include "singletons/Settings.hpp" #include "singletons/Settings.hpp"
#include "widgets/dialogs/QualityPopup.hpp" #include "widgets/dialogs/QualityPopup.hpp"
#include "debug/Log.hpp"
#include <QErrorMessage> #include <QErrorMessage>
#include <QFileInfo> #include <QFileInfo>
@ -83,7 +84,7 @@ QProcess *createStreamlinkProcess()
if (err == QProcess::FailedToStart) { if (err == QProcess::FailedToStart) {
showStreamlinkNotFoundError(); showStreamlinkNotFoundError();
} else { } else {
qDebug() << "Error occured: " << err; // log("Error occured {}", err);
} }
p->deleteLater(); p->deleteLater();
@ -109,7 +110,7 @@ void getStreamQualities(const QString &channelURL,
p, static_cast<void (QProcess::*)(int)>(&QProcess::finished), p, static_cast<void (QProcess::*)(int)>(&QProcess::finished),
[=](int res) { [=](int res) {
if (res != 0) { if (res != 0) {
qDebug() << "Got error code" << res; log("Got error code {}", res);
// return; // return;
} }
QString lastLine = QString(p->readAllStandardOutput()); QString lastLine = QString(p->readAllStandardOutput());
@ -121,7 +122,15 @@ void getStreamQualities(const QString &channelURL,
for (int i = split.length() - 1; i >= 0; i--) { for (int i = split.length() - 1; i >= 0; i--) {
QString option = split.at(i); QString option = split.at(i);
if (option.endsWith(" (worst)")) { if (option == "best)") {
// As it turns out, sometimes, one quality option can
// be the best and worst quality at the same time.
// Since we start loop from the end, we can check
// that and act accordingly
option = split.at(--i);
// "900p60 (worst"
options << option.left(option.length() - 7);
} else if (option.endsWith(" (worst)")) {
options << option.left(option.length() - 8); options << option.left(option.length() - 8);
} else if (option.endsWith(" (best)")) { } else if (option.endsWith(" (best)")) {
options << option.left(option.length() - 7); options << option.left(option.length() - 7);