Changeset 11087

Timestamp:

Aug 1, 2010, 6:55:04 PM (12 years ago)

Author:

charles

Message:

(trunk) #3450 "regression: Qt client dbus support broken" -- fixed

Location:

trunk

Files:

• gtk/tr-core-dbus.xml (modified) (1 diff)
• gtk/tr-core.c (modified) (2 diffs)
• gtk/tr-core.h (modified) (1 diff)
• gtk/util.c (modified) (1 diff)
• qt/add-data.cc (added)
• qt/add-data.h (added)
• qt/app.cc (modified) (5 diffs)
• qt/app.h (modified) (2 diffs)
• qt/dbus-adaptor.cc (modified) (2 diffs)
• qt/dbus-adaptor.h (modified) (1 diff)
• qt/make-dialog.cc (modified) (1 diff)
• qt/options.cc (modified) (10 diffs)
• qt/options.h (modified) (6 diffs)
• qt/qtr.pro (modified) (1 diff)
• qt/session.cc (modified) (3 diffs)
• qt/session.h (modified) (2 diffs)

trunk/gtk/tr-core-dbus.xml

@@ -5 +5 @@
       <arg type="b" name="handled" direction="out"/>
       <arg type="s" name="metainfo" direction="in"/>
-      <arg type="s" name="filename" direction="in"/>
     </method>
     <method name="PresentWindow">

trunk/gtk/tr-core.c

@@ -1027 +1027 @@
 tr_core_add_metainfo( TrCore      * core,
                       const char  * payload,
-                      const char  * filename,
                       gboolean    * setme_handled,
                       GError     ** gerr UNUSED )
@@ -1042 +1041 @@
         *setme_handled = TRUE;
     }
-    else
-    {
+    else /* base64-encoded metainfo */
+    {
+        int file_length;
         tr_ctor * ctor;
-        gboolean has_metainfo = FALSE;
-        const gboolean do_prompt = pref_flag_get( PREF_KEY_OPTIONS_PROMPT );
-
-        /* create the constructor */
+        char * file_contents;
+        gboolean do_prompt = pref_flag_get( PREF_KEY_OPTIONS_PROMPT );
+
         ctor = tr_ctorNew( session );
         tr_core_apply_defaults( ctor );
 
-        if( !has_metainfo && g_file_test( filename, G_FILE_TEST_IS_REGULAR ) )
-        {
-            /* set the metainfo from a local file */
-            has_metainfo = !tr_ctorSetMetainfoFromFile( ctor, filename );
-        }
-
-        if( !has_metainfo )
-        {
-            /* base64-encoded metainfo */
-            int file_length;
-            char * file_contents = tr_base64_decode( payload, -1, &file_length );
-            has_metainfo = !tr_ctorSetMetainfo( ctor, (const uint8_t*)file_contents, file_length );
-            tr_free( file_contents );
-        }
-
-        if( has_metainfo )
-        {
-            add_ctor( core, ctor, do_prompt, TRUE );
-            tr_core_torrents_added( core );
-        }
-
-        *setme_handled = has_metainfo;
+        file_contents = tr_base64_decode( payload, -1, &file_length );
+        tr_ctorSetMetainfo( ctor, (const uint8_t*)file_contents, file_length );
+        add_ctor( core, ctor, do_prompt, TRUE );
+
+        tr_free( file_contents );
+        tr_core_torrents_added( core );
+        *setme_handled = TRUE;
     }
 

trunk/gtk/tr-core.h

@@ -118 +118 @@
 /** @brief Add a torrent. */
 gboolean tr_core_add_metainfo( TrCore      * core,
-                               const char  * payload,
-                               const char  * optional_filename,
+                               const char  * base64_metainfo,
                                gboolean    * setme_success,
                                GError     ** err );

trunk/gtk/util.c

@@ -587 +587 @@
             dbus_g_proxy_call( proxy, "AddMetainfo", &err,
                                G_TYPE_STRING, payload,
-                               G_TYPE_STRING, filename,
                                G_TYPE_INVALID,
                                G_TYPE_BOOLEAN, &handled,

trunk/qt/app.cc

@@ -31 +31 @@
 #include <libtransmission/version.h>
 
+#include "add-data.h"
 #include "app.h"
 #include "dbus-adaptor.h"
@@ -239 +240 @@
     new TrDBusAdaptor( this );
     QDBusConnection bus = QDBusConnection::sessionBus();
-    if (!bus.registerService("com.transmissionbt.Transmission"))
-        if(bus.lastError().isValid())
-            std::cerr << qPrintable(bus.lastError().message()) << std::endl;
-    if( !bus.registerObject( "/com/transmissionbt/Transmission", this ))
-        if(bus.lastError().isValid())
-            std::cerr << qPrintable(bus.lastError().message()) << std::endl;
+    if( !bus.registerService( DBUS_SERVICE ) )
+        std::cerr << "couldn't register " << DBUS_SERVICE << std::endl;
+    if( !bus.registerObject( DBUS_OBJECT_PATH, this ) )
+        std::cerr << "couldn't register " << DBUS_OBJECT_PATH << std::endl;
 }
 
@@ -368 +367 @@
 MyApp :: addTorrent( const QString& key )
 {
+    const AddData addme( key );
+
+    if( addme.type != addme.NONE )
+        addTorrent( addme );
+}
+
+void
+MyApp :: addTorrent( const AddData& addme )
+{
     if( !myPrefs->getBool( Prefs :: OPTIONS_PROMPT ) )
     {
-        mySession->addTorrent( key );
-    }
-    else if( Utils::isMagnetLink( key ) || QFile( key ).exists( ) )
-    {
-        Options * o = new Options( *mySession, *myPrefs, key, myWindow );
+        mySession->addTorrent( addme );
+    }
+    else if( addme.type == addme.URL )
+    {
+        myWindow->openURL( addme.url.toString( ) );
+    }
+    else
+    {
+        Options * o = new Options( *mySession, *myPrefs, addme, myWindow );
         o->show( );
-    }
-    else if( Utils::isURL( key ) )
-    {
-        myWindow->openURL( key );
     }
 
@@ -441 +449 @@
     for( int i=0, n=addme.size(); i<n; ++i )
     {
-        const QString key = addme[i];
-
         QDBusMessage request = QDBusMessage::createMethodCall( DBUS_SERVICE,
                                                                DBUS_OBJECT_PATH,
@@ -448 +454 @@
                                                                "AddMetainfo" );
         QList<QVariant> arguments;
-        arguments.push_back( QVariant( key ) );
+        arguments.push_back( AddData(addme[i]).toBase64().constData() );
         request.setArguments( arguments );
 
         QDBusMessage response = bus.call( request );
+        //std::cerr << qPrintable(response.errorName()) << std::endl;
+        //std::cerr << qPrintable(response.errorMessage()) << std::endl;
         arguments = response.arguments( );
         delegated |= (arguments.size()==1) && arguments[0].toBool();

trunk/qt/app.h

@@ -17 +17 @@
 #include <QSet>
 #include <QTimer>
+
 #include "favicon.h"
 
+class AddData;
 class Prefs;
 class Session;
@@ -61 +63 @@
     public slots:
         void addTorrent( const QString& );
+        void addTorrent( const AddData& );
 
     private:

trunk/qt/dbus-adaptor.cc

@@ -11 +11 @@
  */
 
-#include <QFile>
+#include "add-data.h"
 #include "app.h"
 #include "dbus-adaptor.h"
@@ -29 +29 @@
 
 bool
-TrDBusAdaptor :: AddMetainfo( const QString& payload, const QString& filename )
+TrDBusAdaptor :: AddMetainfo( const QString& key )
 {
-    myApp->addTorrent( QFile(filename).exists() ? filename : payload );
+    AddData addme( key );
+
+    if( addme.type != addme.NONE )
+        myApp->addTorrent( addme );
+
     return true;
 }

trunk/qt/dbus-adaptor.h

@@ -32 +32 @@
   public slots:
     bool PresentWindow();
-    bool AddMetainfo( const QString& payload, const QString& filename );
+    bool AddMetainfo( const QString& );
 };
 

trunk/qt/make-dialog.cc

@@ -59 +59 @@
         case QDialogButtonBox::Open:
 std::cerr << "calling mySession.addTorrent( " << qPrintable(myTarget) << ", " << qPrintable(QFileInfo(myBuilder->top).dir().path()) << ')' << std::endl;
-            mySession.addTorrent( myTarget, QFileInfo(myBuilder->top).dir().path() );
+            mySession.addNewlyCreatedTorrent( myTarget, QFileInfo(myBuilder->top).dir().path() );
             break;
         case QDialogButtonBox::Abort:

trunk/qt/options.cc

@@ -14 +14 @@
 #include <iostream>
 
+#include <QApplication>
 #include <QCheckBox>
 #include <QComboBox>
@@ -23 +24 @@
 #include <QGridLayout>
 #include <QLabel>
+#include <QMessageBox>
 #include <QPushButton>
 #include <QResizeEvent>
@@ -33 +35 @@
 #include <libtransmission/utils.h> /* mime64 */
 
+#include "add-data.h"
 #include "file-tree.h"
 #include "hig.h"
@@ -45 +48 @@
 ***/
 
-Options :: Options( Session& session, const Prefs& prefs, const QString& filename, QWidget * parent ):
+void
+FileAdded :: executed( int64_t tag, const QString& result, struct tr_benc * arguments )
+{
+    Q_UNUSED( arguments );
+
+    if( tag != myTag )
+        return;
+
+    if( result == "success" )
+        if( !myDelFile.isEmpty( ) )
+            QFile( myDelFile ).remove( );
+
+    if( result != "success" ) {
+        QString text = result;
+        for( int i=0, n=text.size(); i<n; ++i )
+            if( !i || text[i-1].isSpace() )
+                text[i] = text[i].toUpper();
+        QMessageBox::warning( QApplication::activeWindow(),
+                              tr( "Error Adding Torrent" ),
+                              QString("<p><b>%1</b></p><p>%2</p>").arg(text).arg(myName) );
+    }
+
+    deleteLater();
+}
+
+/***
+****
+***/
+
+Options :: Options( Session& session, const Prefs& prefs, const AddData& addme, QWidget * parent ):
     QDialog( parent, Qt::Dialog ),
     mySession( session ),
-    myFile( filename ),
+    myAdd( addme ),
     myHaveInfo( false ),
     myDestinationButton( 0 ),
@@ -169 +201 @@
 Options :: refreshFileButton( int width )
 {
-    refreshButton( myFileButton, QFileInfo(myFile).baseName(), width );
+    QString text;
+
+    switch( myAdd.type )
+    {
+        case AddData::FILENAME: text = QFileInfo(myAdd.filename).baseName(); break;
+        case AddData::URL:      text = myAdd.url.toString(); break;
+        case AddData::MAGNET:   text = myAdd.magnet; break;
+        default:                break;
+    }
+
+    refreshButton( myFileButton, text, width );
 }
 
@@ -216 +258 @@
 
     tr_ctor * ctor = tr_ctorNew( 0 );
-    if( Utils::isMagnetLink( myFile ) )
-        tr_ctorSetMetainfoFromMagnetLink( ctor, myFile.toUtf8().constData() );
-    else
-        tr_ctorSetMetainfoFromFile( ctor, myFile.toUtf8().constData() );
+
+    switch( myAdd.type ) {
+        case AddData::MAGNET:   tr_ctorSetMetainfoFromMagnetLink( ctor, myAdd.magnet.toUtf8().constData() ); break;
+        case AddData::FILENAME: tr_ctorSetMetainfoFromFile( ctor, myAdd.filename.toUtf8().constData() ); break;
+        case AddData::METAINFO: tr_ctorSetMetainfo( ctor, (const uint8_t*)myAdd.metainfo.constData(), myAdd.metainfo.size() ); break;
+        default: break;
+    }
 
     const int err = tr_torrentParse( ctor, &myInfo );
@@ -281 +326 @@
 
     // "metainfo"
-    if( Utils::isMagnetLink( myFile ) || Utils::isURL( myFile ) )
-        tr_bencDictAddStr( args, "filename", myFile.toUtf8().constData() );
-    else {
-        QFile file( myFile );
-        file.open( QIODevice::ReadOnly );
-        const QByteArray metainfo( file.readAll( ) );
-        file.close( );
-        int base64Size = 0;
-        char * base64 = tr_base64_encode( metainfo.constData(), metainfo.size(), &base64Size );
-        tr_bencDictAddRaw( args, "metainfo", base64, base64Size );
-        tr_free( base64 );
+    switch( myAdd.type )
+    {
+        case AddData::MAGNET:
+            tr_bencDictAddStr( args, "filename", myAdd.magnet.toUtf8().constData() );
+            break;
+
+        case AddData::URL:
+            tr_bencDictAddStr( args, "filename", myAdd.url.toString().toUtf8().constData() );
+            break;
+
+        case AddData::FILENAME:
+        case AddData::METAINFO: {
+            const QByteArray b64 = myAdd.toBase64( );
+            tr_bencDictAddRaw( args, "metainfo", b64.constData(), b64.size() );
+            break;
+        }
+
+        default:
+            std::cerr << "unhandled AddData.type: " << myAdd.type << std::endl;
     }
 
@@ -330 +383 @@
 
     // maybe delete the source .torrent
-    if( myTrashCheck->isChecked( ) ) {
-        FileAdded * fileAdded = new FileAdded( tag, myFile );
-        connect( &mySession, SIGNAL(executed(int64_t,const QString&, struct tr_benc*)),
-                 fileAdded, SLOT(executed(int64_t,const QString&, struct tr_benc*)));
-    }
+    FileAdded * fileAdded = new FileAdded( tag, myAdd.readableName() );
+    if( myTrashCheck->isChecked( ) && ( myAdd.type==AddData::FILENAME ) )
+        fileAdded->setFileToDelete( myAdd.filename );
+    connect( &mySession, SIGNAL(executed(int64_t,const QString&, struct tr_benc*)),
+             fileAdded, SLOT(executed(int64_t,const QString&, struct tr_benc*)));
 
 //std::cerr << tr_bencToStr(&top,TR_FMT_JSON,NULL) << std::endl;
@@ -346 +399 @@
 Options :: onFilenameClicked( )
 {
-    QFileDialog * d = new QFileDialog( this,
-                                       tr( "Add Torrent" ),
-                                       QFileInfo(myFile).absolutePath(),
-                                       tr( "Torrent Files (*.torrent);;All Files (*.*)" ) );
-    d->setFileMode( QFileDialog::ExistingFile );
-    connect( d, SIGNAL(filesSelected(const QStringList&)), this, SLOT(onFilesSelected(const QStringList&)) );
-    d->show( );
+    if( myAdd.type == AddData::FILENAME )
+    {
+        QFileDialog * d = new QFileDialog( this,
+                                           tr( "Add Torrent" ),
+                                           QFileInfo(myAdd.filename).absolutePath(),
+                                           tr( "Torrent Files (*.torrent);;All Files (*.*)" ) );
+        d->setFileMode( QFileDialog::ExistingFile );
+        connect( d, SIGNAL(filesSelected(const QStringList&)), this, SLOT(onFilesSelected(const QStringList&)) );
+        d->show( );
+    }
 }
 
@@ -360 +416 @@
     if( files.size() == 1 )
     {
-        myFile = files.at( 0 );
+        myAdd.set( files.at(0) );
         refreshFileButton( );
         reload( );

trunk/qt/options.h

@@ -14 +14 @@
 #define OPTIONS_DIALOG_H
 
+#include <iostream>
+
 #include <QDialog>
 #include <QEvent>
@@ -21 +23 @@
 #include <QMap>
 #include <QPushButton>
+#include <QString>
 #include <QStringList>
 #include <QCryptographicHash>
@@ -26 +29 @@
 #include <QTimer>
 
-#include "file-tree.h"
+#include "add-data.h" // AddData
+#include "file-tree.h" // FileList
 
 class FileTreeView;
@@ -40 +44 @@
         Q_OBJECT
         const int64_t myTag;
+        QString myName;
         QString myDelFile;
 
     public:
-        FileAdded( int tag, const QString file ): myTag(tag), myDelFile(file) { }
+        FileAdded( int tag, const QString& name ): myTag(tag), myName(name) { }
         ~FileAdded( ) { }
+        void setFileToDelete( const QString& file ) { myDelFile = file; }
 
     public slots:
-        void executed( int64_t tag, const QString& result, struct tr_benc * arguments ) {
-            Q_UNUSED( arguments );
-            if( tag == myTag ) {
-                if( result == "success" )
-                    QFile( myDelFile ).remove( );
-                deleteLater();
-            }
-        }
+        void executed( int64_t tag, const QString& result, struct tr_benc * arguments );
 };
 
@@ -62 +61 @@
 
     public:
-        Options( Session& session, const Prefs& prefs, const QString& filename, QWidget * parent = 0 );
+        Options( Session& session, const Prefs& prefs, const AddData& addme, QWidget * parent = 0 );
         ~Options( );
 
@@ -74 +73 @@
     private:
         Session& mySession;
-        QString myFile;
+        AddData myAdd;
         QDir myDestination;
         bool myHaveInfo;

trunk/qt/qtr.pro

@@ -31 +31 @@
 FORMS += mainwin.ui
 RESOURCES += application.qrc
-SOURCES += about.cc app.cc dbus-adaptor.cc details.cc favicon.cc file-tree.cc \
-           filterbar.cc filters.cc formatter.cc hig.cc license.cc mainwin.cc \
-           make-dialog.cc options.cc prefs.cc prefs-dialog.cc qticonloader.cc \
-           relocate.cc session.cc session-dialog.cc squeezelabel.cc \
-           stats-dialog.cc torrent.cc torrent-delegate.cc \
-           torrent-delegate-min.cc torrent-filter.cc torrent-model.cc \
-           tracker-delegate.cc tracker-model.cc tracker-model-filter.cc \
-           triconpushbutton.cc utils.cc watchdir.cc
+SOURCES += about.cc \
+           add-data.cc \
+           app.cc \
+           dbus-adaptor.cc \
+           details.cc \
+           favicon.cc \
+           file-tree.cc \
+           filterbar.cc \
+           filters.cc \
+           formatter.cc \
+           hig.cc \
+           license.cc \
+           mainwin.cc \
+           make-dialog.cc \
+           options.cc \
+           prefs.cc \
+           prefs-dialog.cc \
+           qticonloader.cc \
+           relocate.cc \
+           session.cc \
+           session-dialog.cc \
+           squeezelabel.cc \
+           stats-dialog.cc \
+           torrent.cc torrent-delegate.cc \
+           torrent-delegate-min.cc \
+           torrent-filter.cc \
+           torrent-model.cc \
+           tracker-delegate.cc \
+           tracker-model.cc \
+           tracker-model-filter.cc \
+           triconpushbutton.cc \
+           utils.cc \
+           watchdir.cc
 HEADERS += $$replace(SOURCES, .cc, .h)
 HEADERS += speed.h types.h

trunk/qt/session.cc

@@ -34 +34 @@
 #include <libtransmission/version.h> /* LONG_VERSION */
 
+#include "add-data.h"
 #include "prefs.h"
 #include "qticonloader.h"
@@ -926 +927 @@
 
 void
-Session :: addTorrent( QString filename )
-{
-    addTorrent( filename, myPrefs.getString( Prefs::DOWNLOAD_DIR ) );
-}
-
-namespace
-{
-    bool isLink( const QString& str )
-    {
-        return Utils::isMagnetLink(str) || Utils::isURL(str);
-    }
-}
-
-void
-Session :: addTorrent( QString key, QString localPath )
-{
+Session :: addTorrent( const AddData& addMe )
+{
+    const QByteArray b64 = addMe.toBase64();
+
+    tr_benc top, *args;
+    tr_bencInitDict( &top, 2 );
+    tr_bencDictAddStr( &top, "method", "torrent-add" );
+    args = tr_bencDictAddDict( &top, "arguments", 2 );
+    tr_bencDictAddBool( args, "paused", !myPrefs.getBool( Prefs::START ) );
+    switch( addMe.type ) {
+        case AddData::MAGNET:   tr_bencDictAddStr( args, "filename", addMe.magnet.toUtf8().constData() ); break;
+        case AddData::URL:      tr_bencDictAddStr( args, "filename", addMe.url.toString().toUtf8().constData() ); break;
+        case AddData::FILENAME: /* fall-through */
+        case AddData::METAINFO: tr_bencDictAddRaw( args, "metainfo", b64.constData(), b64.size() ); break;
+        default: std::cerr << "Unhandled AddData type: " << addMe.type << std::endl;
+    }
+    exec( &top );
+    tr_bencFree( &top );
+}
+
+void
+Session :: addNewlyCreatedTorrent( const QString& filename, const QString& localPath )
+{
+    const QByteArray b64 = AddData(filename).toBase64();
+
     tr_benc top, *args;
     tr_bencInitDict( &top, 2 );
@@ -948 +958 @@
     tr_bencDictAddStr( args, "download-dir", qPrintable(localPath) );
     tr_bencDictAddBool( args, "paused", !myPrefs.getBool( Prefs::START ) );
-
-    // figure out what to do with "key"....
-    bool keyHandled = false;
-    if( !keyHandled && isLink( key  )) {
-        tr_bencDictAddStr( args, "filename", key.toUtf8().constData() );
-        keyHandled = true; // it's a URL or magnet link...
-    }
-    if( !keyHandled ) {
-        QFile file( key );
-        file.open( QIODevice::ReadOnly );
-        const QByteArray raw( file.readAll( ) );
-        file.close( );
-        if( !raw.isEmpty( ) ) {
-            int b64len = 0;
-            char * b64 = tr_base64_encode( raw.constData(), raw.size(), &b64len );
-            tr_bencDictAddRaw( args, "metainfo", b64, b64len  );
-            tr_free( b64 );
-            keyHandled = true; // it's a local file...
-        }
-    }
-    if( !keyHandled ) {
-        const QByteArray tmp = key.toUtf8();
-        tr_bencDictAddRaw( args, "metainfo", tmp.constData(), tmp.length() );
-        keyHandled = true; // treat it as base64
-    }
-
+    tr_bencDictAddRaw( args, "metainfo", b64.constData(), b64.size() );
     exec( &top );
     tr_bencFree( &top );

trunk/qt/session.h

@@ -23 +23 @@
 
 class QStringList;
+
+class AddData;
 
 #include <libtransmission/transmission.h>
@@ -113 +115 @@
         void refreshAllTorrents( );
         void initTorrents( const QSet<int>& ids = QSet<int>() );
-        void addTorrent( QString filename );
-        void addTorrent( QString filename, QString localPath );
+        void addNewlyCreatedTorrent( const QString& filename, const QString& localPath );
+        void addTorrent( const AddData& addme );
         void removeTorrents( const QSet<int>& torrentIds, bool deleteFiles=false );
         void verifyTorrents( const QSet<int>& torrentIds );