on Wed, 18 Oct 2017 10:51:51 +0200
It was downloaded from:
diff -Nru clipgrab-3.6.5~trusty1/mainwindow.cpp clipgrab-3.6.6~trusty1/mainwindow.cpp
--- clipgrab-3.6.5~trusty1/mainwindow.cpp 2017-05-11 12:10:12.000000000 +0000
+++ clipgrab-3.6.6~trusty1/mainwindow.cpp 2017-10-11 19:02:27.000000000 +0000
@@ -441,10 +441,8 @@
{
if (ui.downloadTree->currentIndex().row() != -1)
{
- QString targetDir;
- targetDir = cg->getDownloadTargetPath(ui.downloadTree->topLevelItemCount()-1 - ui.downloadTree->currentIndex().row());
- targetDir.remove(targetDir.split("/").last());
- QDesktopServices::openUrl(targetDir);
+ int item = ui.downloadTree->topLevelItemCount() - ui.downloadTree->currentIndex().row() -1;
+ cg->openTargetFolder(item);
}
}
@@ -757,18 +755,17 @@
void MainWindow::processSearchReply()
{
- QWebView* view = new QWebView();
- view->setHtml(searchReply->readAll());
- QWebFrame *dom = view->page()->mainFrame();
+ QWebPage *page = new QWebPage();
+ page->mainFrame()->setHtml(searchReply->readAll());
+ page->triggerAction(QWebPage::Stop);
+ page->deleteLater();
+ QWebElementCollection entries = page->mainFrame()->findAllElements(".yt-lockup");
int limit = 12;
if (searchReply->url().toString() == "https://www.youtube.com") {
limit = 4;
}
-
- QWebElementCollection entries = dom->findAllElements(".yt-lockup");
-
QString searchHtml;
searchHtml.append("");
searchHtml.append("");
@@ -865,10 +862,7 @@
void MainWindow::on_downloadTree_customContextMenuRequested(const QPoint &pos)
{
-
- QTreeWidgetItem* item = ui.downloadTree->itemAt(pos);
int selectedVideo = ui.downloadTree->topLevelItemCount()-1 - ui.downloadTree->indexAt(pos).row();
-
if (selectedVideo == -1 || ui.downloadTree->indexAt(pos).row() == -1)
{
return;
@@ -920,26 +914,7 @@
}
else if (selectedAction == openFolder)
{
- if (cg->isDownloadFinished(selectedVideo))
- {
- #ifdef Q_WS_MAC
- QProcess* finderProcess = new QProcess();
- QStringList arguments;
- arguments << "-e" << "tell application \"Finder\"";
- arguments << "-e" << "reveal POSIX file \"" + cg->getDownloadSaveFileName(selectedVideo) + "\"";
- arguments << "-e" << "activate";
- arguments << "-e" << "end tell";
- finderProcess->start("osascript", arguments);
- return;
- #elif defined(Q_WS_WIN)
- QProcess* explorerProcess = new QProcess();
- explorerProcess->start("explorer.exe /select," + QDir::toNativeSeparators(cg->getDownloadSaveFileName(selectedVideo)));
- return;
- #endif
- }
-
- QString path = QFileInfo(cg->getDownloadTargetPath(selectedVideo)).absoluteDir().path();
- QDesktopServices::openUrl(QUrl::fromLocalFile(path));
+ cg->openTargetFolder(selectedVideo);
}
else if (selectedAction == openDownload)
{
diff -Nru clipgrab-3.6.5~trusty1/resources.qrc clipgrab-3.6.6~trusty1/resources.qrc
--- clipgrab-3.6.5~trusty1/resources.qrc 2017-05-11 12:10:12.000000000 +0000
+++ clipgrab-3.6.6~trusty1/resources.qrc 2017-10-11 19:02:27.000000000 +0000
@@ -34,6 +34,9 @@
clipgrab_si.qm
clipgrab_sv.qm
clipgrab_ko.qm
+ clipgrab_lt.qm
+ clipgrab_hr.qm
+ clipgrab_mk.qm
equifax_secure_ca.crt
diff -Nru clipgrab-3.6.5~trusty1/video_dailymotion.cpp clipgrab-3.6.6~trusty1/video_dailymotion.cpp
--- clipgrab-3.6.5~trusty1/video_dailymotion.cpp 2017-05-11 12:10:12.000000000 +0000
+++ clipgrab-3.6.6~trusty1/video_dailymotion.cpp 2017-10-11 19:02:27.000000000 +0000
@@ -32,6 +32,7 @@
this->_supportsSearch = true;
this->_icon = 0;
this->_urlRegExp << QRegExp("http[s]?://\\w*\\.dailymotion\\.com/video/.*", Qt::CaseInsensitive);
+ this->_urlRegExp << QRegExp("http[s]?://dai\\.ly/.*", Qt::CaseInsensitive);
}
video* video_dailymotion::createNewInstance()
@@ -64,17 +65,18 @@
void video_dailymotion::parseVideo(QString html)
{
QRegExp expression;
- expression = QRegExp("video_title\":\"(.*)\"");
+ expression = QRegExp("\"og:title\" content=\"(.*)\"");
expression.setMinimal(true);
if (expression.indexIn(html) !=-1)
{
_title = QString(expression.cap(1));
+ _title = _title.replace(QRegExp("- Dailymotion$"), "");
html = QUrl::fromEncoded(html.toAscii()).toString(QUrl::None);
- expression = QRegExp("var config\\s*=\\s*(\\{.+\\});");
+ expression = QRegExp("var __PLAYER_CONFIG__\\s*=\\s*(\\{.+\\});");
expression.setMinimal(true);
- qDebug() << expression.indexIn(html);
+
if (expression.indexIn(html)!=-1)
{
QString json = expression.cap(1);
@@ -128,7 +130,6 @@
script.append( "}\n");
view->setHtml("");
QString result = view->page()->mainFrame()->evaluateJavaScript("getUrl()").toString();
- qDebug() << script;
view->deleteLater();
return result;
diff -Nru clipgrab-3.6.5~trusty1/video_heuristic.cpp clipgrab-3.6.6~trusty1/video_heuristic.cpp
--- clipgrab-3.6.5~trusty1/video_heuristic.cpp 2017-05-11 12:10:12.000000000 +0000
+++ clipgrab-3.6.6~trusty1/video_heuristic.cpp 2017-10-11 19:02:27.000000000 +0000
@@ -78,7 +78,7 @@
return;
}
- expression = QRegExp("");
+ expression = QRegExp("");
expression.setMinimal(true);
if (expression.indexIn(html) !=-1)
{
@@ -90,7 +90,7 @@
emit analysingFinished();
return;
}
- expression = QRegExp("\"(http://[^\"%]*\\.(flv|mp4|f4v|webm)[^\"]*)\"");
+ expression = QRegExp("\"(https?://[^\"%]*\\.(flv|mp4|f4v|webm)[^\"]*)\"");
expression.setMinimal(true);
if (expression.indexIn(html) !=-1)
{
@@ -103,7 +103,7 @@
return;
}
- expression = QRegExp("'(http://[^\"'%]*\\.(flv|mp4|f4v|webm)[^\"]*)'");
+ expression = QRegExp("'(https?://[^\"'%]*\\.(flv|mp4|f4v|webm)[^\"]*)'");
expression.setMinimal(true);
if (expression.indexIn(html) !=-1)
{
@@ -132,7 +132,7 @@
}
- expression = QRegExp("'(http://[^\"']*\\.(flv|mp4|f4v|webm)[^\"]*)'");
+ expression = QRegExp("'(https?://[^\"']*\\.(flv|mp4|f4v|webm)[^\"]*)'");
expression.setMinimal(true);
if (expression.indexIn(html) !=-1)
{
@@ -145,7 +145,7 @@
return;
}
- expression = QRegExp("(http://[a-zA-Z0-9\\.%-_~/\\?=]*.flv)");
+ expression = QRegExp("(https?://[a-zA-Z0-9\\.%-_~/\\?=]*.flv)");
expression.setMinimal(true);
if (expression.indexIn(html) !=-1)
{
diff -Nru clipgrab-3.6.5~trusty1/video_youtube.cpp clipgrab-3.6.6~trusty1/video_youtube.cpp
--- clipgrab-3.6.5~trusty1/video_youtube.cpp 2017-05-11 12:10:12.000000000 +0000
+++ clipgrab-3.6.6~trusty1/video_youtube.cpp 2017-10-11 19:02:27.000000000 +0000
@@ -165,6 +165,9 @@
{
return tr("8K (4320p)");
}
+ else if (quality == "4320p60"){
+ return tr("8K (4320p60)");
+ }
return qualityExpression.cap(1);
}
@@ -288,6 +291,9 @@
dui = new Ui::LoginDialog();
passwordDialog = new QDialog;
dui->setupUi(passwordDialog);
+ #if defined(Q_WS_WIN) || defined(Q_WS_MAC)
+ dui->loginDialogWebView->settings()->setAttribute(QWebSettings::JavascriptEnabled, false);
+ #endif
connect(dui->loginDialogWebView, SIGNAL(urlChanged(QUrl)), this, SLOT(handleLoginUrlChanged(QUrl)));
connect(dui->loginDialogWebView, SIGNAL(loadFinished(bool)), this, SLOT(handleLoginLoadFinished()));
dui->loginDialogWebView->setUrl(QUrl::fromUserInput(expression.cap(1).replace("&", "&")));