Changeset 124 for smplayer/trunk/src/findsubtitles/simplehttp.cpp

Timestamp:

Mar 16, 2012, 4:02:47 PM (13 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: 0.7.1 trunk update

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/findsubtitles/simplehttp.cpp (modified) (3 diffs)

smplayer/trunk/src/findsubtitles/simplehttp.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org>
+    Copyright (C) 2006-2012 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -35 +35 @@
 
 void SimpleHttp::download(const QString & url) {
+        qDebug("SimpleHttp::download: %s", url.toLatin1().constData());
+
         downloaded_text.clear();
 
         QUrl u(url);
         setHost( u.host() );
-        http_get_id = get( u.path() );
+
+        /*
+        qDebug("u.path: %s", u.path().toLatin1().constData());
+        qDebug("u.query: %s", u.encodedQuery().constData());
+        */
+
+        QString p = u.path();
+        if (!u.encodedQuery().isEmpty()) p += "?" + u.encodedQuery();
+
+        if (user_agent.isEmpty()) {
+                http_get_id = get( p );
+        } else {
+                QHttpRequestHeader header("GET", p);
+                header.setValue("Host", u.host());
+                header.setValue("User-Agent", user_agent);
+                http_get_id = request(header);
+        }
 
         emit connecting(u.host());
@@ -73 +91 @@
         downloaded_text += readAll();
 
-        if (!downloaded_text.isEmpty()) {
+        //qDebug("downloaded_text: '%s'", downloaded_text.constData());
+
+        if ((!error) && (!downloaded_text.isEmpty())) {
                 emit downloadFinished(downloaded_text);
         }