Skip to content

Fix for the new base.js #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
freemangordon wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix for the new base.js #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1ed0c02
Fix for the new base.js
freemangordon Mar 4, 2017
4d99c2b
Make function name matching more strict
freemangordon Mar 10, 2017
28bfde1
Fix for the latest base.js changes
freemangordon Aug 30, 2019
5662a8c
update debian/changelog
freemangordon Aug 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
qyoutube (0.1.9-1) unstable; urgency=low

* Fix for the latest base.js changes

-- Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com> Fri, 30 Aug 2019 20:40:11 +0300

qyoutube (0.1.9) unstable; urgency=low

* Refresh access token during revoke operation, if required.
Expand Down
44 changes: 32 additions & 12 deletions src/streamsrequest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,17 +296,36 @@ static QString unescape(const QString &s) {
void extractVideoStreams(QScriptValue decryptionFunction) {
#ifdef QYOUTUBE_DEBUG
qDebug() << "QYouTube::StreamsRequestPrivate::extractVideoStreams: Extracting video streams.";
qDebug() << "QYouTube::StreamsRequestPrivate::extractVideoStreams: decryptFunction" << decryptionFunction.toString();
#endif
Q_Q(StreamsRequest);

QVariantList formats;

QStringList parts = response.split(',', QString::SkipEmptyParts);

foreach (QString part, parts) {
part = unescape(part);
part.replace(QRegExp("(^|&)s="), "&signature=");
QString oldSig = part.section("signature=", 1, 1).section('&', 0, 0);
QRegExp r("sp=(.*)&|sp=(.*)$");
QString sp;

r.setMinimal(true);

if (r.indexIn(part) != -1)
{
if (!r.cap(1).isEmpty())
sp = r.cap(1);
else
sp = r.cap(2);
}
else
sp = "signature";

part.replace(QRegExp("(^|&)s="), "&" + sp + "=");
QString oldSig = part.section(sp + "=", 1, 1).section('&', 0, 0);

part.replace(oldSig, decryptionFunction.call(QScriptValue(), QScriptValueList() << oldSig).toString());

QStringList splitPart = part.split("url=");

if (!splitPart.isEmpty()) {
Expand All @@ -322,8 +341,8 @@ static QString unescape(const QString &s) {
query.addQueryItem(param.section('=', 0, 0), param.section('=', -1));
}

if (!query.hasQueryItem("signature")) {
query.addQueryItem("signature", splitPart.first().section("signature=", 1, 1).section('&', 0, 0));
if (!query.hasQueryItem(sp)) {
query.addQueryItem(sp, splitPart.first().section(sp + "=", 1, 1).section('&', 0, 0));
}

url.setQuery(query);
Expand All @@ -332,16 +351,17 @@ static QString unescape(const QString &s) {
format["url"] = url;
#else
foreach (const QString &param, params) {
url.addQueryItem(param.section('=', 0, 0), param.section('=', -1));
url.addQueryItem(param.section('=', 0, 0), param.section('=', 1));
}

if (!url.hasQueryItem("signature")) {
url.addQueryItem("signature", splitPart.first().section("signature=", 1, 1).section('&', 0, 0));
if (!url.hasQueryItem(sp)) {
url.addQueryItem(sp, splitPart.first().section(sp + "=", 1, 1).section('&', 0, 0));
}

Format format = formatHash.value(url.queryItemValue("itag"));
format["url"] = url;
#endif

formats << format;
}
}
Expand Down Expand Up @@ -443,7 +463,7 @@ static QString unescape(const QString &s) {

if (response.contains("url_encoded_fmt_stream_map\":")) {
QString js = response.section("\"assets\":", 1, 1).section('}', 0, 0) + "}";
response = response.section("url_encoded_fmt_stream_map\":\"", 1, 1).section(",\"", 0, 0)
response = response.section("url_encoded_fmt_stream_map\":\"", 1, 1).section("\",\"", 0, 0)
.trimmed().replace("\\u0026", "&")
.remove(QRegExp("itag=\\d+"));

Expand Down Expand Up @@ -543,8 +563,8 @@ static QString unescape(const QString &s) {
emit q->finished();
return;
}
QRegExp re("[\"']signature[\"'],(\\$[^\\(]+)");

QRegExp re("\\b[cs]\\s*&&\\s*[adf]\\.set\\([^,]+\\s*,\\s*encodeURIComponent\\s*\\(\\s*([a-zA-Z0-9$]+)\\(");

if (re.indexIn(jsresponse) != -1) {
QString funcName = re.cap(1);
Expand Down