Changeset 142 for smplayer/trunk/src/findsubtitles/findsubtitleswindow.cpp

Timestamp:

May 27, 2013, 3:28:05 PM (12 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update trunk to 0.8.5

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/findsubtitles/findsubtitleswindow.cpp (modified) (14 diffs)

smplayer/trunk/src/findsubtitles/findsubtitleswindow.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2012 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2013 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -19 +19 @@
 #include "findsubtitleswindow.h"
 #include "findsubtitlesconfigdialog.h"
-#include "simplehttp.h"
-#include "osparser.h"
+
+#include "osclient.h"
 #include "filehash.h"
 #include "languages.h"
@@ -111 +111 @@
             this, SLOT(showContextMenu(const QPoint &)) );
 
+        /*
         downloader = new SimpleHttp(this);
 
@@ -126 +127 @@
         connect( downloader, SIGNAL(dataReadProgress(int, int)),
              this, SLOT(updateDataReadProgress(int, int)) );
+        */
+
+        osclient = new OSClient();
+        connect( osclient, SIGNAL(searchFinished()), this, SLOT(downloadFinished()) );
+        connect( osclient, SIGNAL(searchFinished()), this, SLOT(parseInfo()) );
+        connect( osclient, SIGNAL(loginFailed()), this, SLOT(showLoginFailed()) );
+        connect( osclient, SIGNAL(searchFailed()), this, SLOT(showSearchFailed()) );
 
 #ifdef DOWNLOAD_SUBS
@@ -158 +166 @@
 
         // Opensubtitles server
-        os_server = "http://www.opensubtitles.org";
+        /* os_server = "http://www.opensubtitles.org"; */
+        os_server = "http://api.opensubtitles.org/xml-rpc";
+        osclient->setServer(os_server);
 
         // Proxy
@@ -182 +192 @@
 
 void FindSubtitlesWindow::setProxy(QNetworkProxy proxy) {
+        /*
         downloader->abort();
         downloader->setProxy(proxy);
+        */
+        osclient->setProxy(proxy);
 
 #ifdef DOWNLOAD_SUBS
@@ -269 +282 @@
                 qWarning("FindSubtitlesWindow::setMovie: hash invalid. Doing nothing.");
         } else {
-                QString link = os_server + "/search/sublanguageid-all/moviehash-" + hash + "/simplexml";
-                qDebug("FindSubtitlesWindow::setMovie: link: '%s'", link.toLatin1().constData());
-                downloader->download(link);
+                qint64 file_size = QFileInfo(filename).size();
+                osclient->search(hash, file_size);
                 last_file = filename;
         }
@@ -282 +294 @@
 
 void FindSubtitlesWindow::updateRefreshButton() {
-        qDebug("FindSubtitlesWindow::updateRefreshButton: state: %d", downloader->state());
-/*
-        QString file = file_chooser->lineEdit()->text();
-        bool enabled = ( (!file.isEmpty()) && (QFile::exists(file)) && 
-                     (downloader->state()==QHttp::Unconnected) );
-        refresh_button->setEnabled(enabled);
-*/
+        qDebug("FindSubtitlesWindow::updateRefreshButton:");
         refresh_button->setEnabled(true);
 }
@@ -332 +338 @@
 }
 
+void FindSubtitlesWindow::showLoginFailed() {
+        status->setText( tr("Login to opensubtitles.org has failed") );
+}
+
+void FindSubtitlesWindow::showSearchFailed() {
+        status->setText( tr("Search has failed") );
+}
+
 void FindSubtitlesWindow::updateDataReadProgress(int done, int total) {
         qDebug("FindSubtitlesWindow::updateDataReadProgress: %d, %d", done, total);
@@ -349 +363 @@
 }
 
-void FindSubtitlesWindow::parseInfo(QByteArray xml_text) {
-        OSParser osparser;
-        bool ok = osparser.parseXml(xml_text);
+void FindSubtitlesWindow::parseInfo() {
+        bool ok = true;
 
         table->setRowCount(0);
@@ -358 +371 @@
 
         if (ok) {
-                QList<OSSubtitle> l = osparser.subtitleList();
+                QList<OSSubtitle> l = osclient->subtitleList();
                 for (int n=0; n < l.count(); n++) {
 
@@ -655 +668 @@
                 proxy_type = d.proxyType();
 
+                osclient->setServer(os_server);
                 setupProxy();
         }
@@ -686 +700 @@
         set->beginGroup("findsubtitles");
 
-        set->setValue("server", os_server);
+        set->setValue("xmlrpc_server", os_server);
         set->setValue("language", language());
 #ifdef DOWNLOAD_SUBS
@@ -706 +720 @@
         set->beginGroup("findsubtitles");
 
-        os_server = set->value("server", os_server).toString();
+        os_server = set->value("xmlrpc_server", os_server).toString();
         setLanguage( set->value("language", language()).toString() );
 #ifdef DOWNLOAD_SUBS