From c08a0136f6e59da468018395dcd627a77ec47203 Mon Sep 17 00:00:00 2001 From: Josh Klontz Date: Tue, 10 Jun 2014 11:52:10 -0400 Subject: [PATCH] download now outputs metadata templates as well --- app/br-download/br-download.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/br-download/br-download.cpp b/app/br-download/br-download.cpp index 17284cd..f1b41b8 100644 --- a/app/br-download/br-download.cpp +++ b/app/br-download/br-download.cpp @@ -50,7 +50,7 @@ static bool json = false; static bool permissive = false; static bool url_provided = false; -static void process(QString url, QNetworkAccessManager &nam) +static void process(QString url, const QByteArray &metadata, QNetworkAccessManager &nam) { url = url.simplified(); if (url.isEmpty()) @@ -88,6 +88,11 @@ static void process(QString url, QNetworkAccessManager &nam) const QByteArray hash = QCryptographicHash::hash(data, QCryptographicHash::Md5); br_append_utemplate_contents(stdout, reinterpret_cast(hash.data()), reinterpret_cast(hash.data()), 3, data.size(), reinterpret_cast(data.data())); + + if (!metadata.isEmpty()) { + const QByteArray metadataHash = QCryptographicHash::hash(metadata, QCryptographicHash::Md5); + br_append_utemplate_contents(stdout, reinterpret_cast(hash.data()), reinterpret_cast(metadataHash.data()), 2, metadata.size() + 1 /* include null terminator */, reinterpret_cast(metadata.data())); + } } int main(int argc, char *argv[]) @@ -99,7 +104,7 @@ int main(int argc, char *argv[]) if (!strcmp(argv[i], "-help" )) { help(); exit(EXIT_SUCCESS); } else if (!strcmp(argv[i], "-json" )) json = true; else if (!strcmp(argv[i], "-permissive")) permissive = true; - else { url_provided = true; process(argv[i], nam); } + else { url_provided = true; process(argv[i], QByteArray(), nam); } } if (!url_provided) { @@ -109,6 +114,7 @@ int main(int argc, char *argv[]) const QByteArray line = file.readLine(); process(json ? QJsonDocument::fromJson(line).object().value("URL").toString() : QString::fromLocal8Bit(line), + json ? line.simplified() : QByteArray(), nam); } } -- libgit2 0.21.4