Changeset 11083

Timestamp:

Aug 1, 2010, 2:51:28 PM (12 years ago)

Author:

charles

Message:

(trunk) fix a documentation error in the RPC spec. lastAnnounceResult is a string, not an int

Location:

trunk

Files:

• doc/rpc-spec.txt (modified) (1 diff)
• qt/app.cc (modified) (5 diffs)
• qt/app.h (modified) (4 diffs)
• qt/torrent.cc (modified) (1 diff)
• qt/torrent.h (modified) (1 diff)
• qt/tracker-delegate.cc (modified) (1 diff)

trunk/doc/rpc-spec.txt

@@ -277 +277 @@
                       | isBackup                | boolean    | tr_tracker_stat
                       | lastAnnouncePeerCount   | number     | tr_tracker_stat
-                      | lastAnnounceResult      | number     | tr_tracker_stat
+                      | lastAnnounceResult      | string     | tr_tracker_stat
                       | lastAnnounceStartTime   | number     | tr_tracker_stat
                       | lastAnnounceSucceeded   | boolean    | tr_tracker_stat

trunk/qt/app.cc

@@ -16 +16 @@
 
 #include <QDBusConnection>
+#include <QDBusConnectionInterface>
 #include <QDBusError>
 #include <QDBusMessage>
@@ -168 +169 @@
     // when the model sees a torrent for the first time, ask the session for full info on it
     connect( myModel, SIGNAL(torrentsAdded(QSet<int>)), mySession, SLOT(initTorrents(QSet<int>)) );
+    connect( myModel, SIGNAL(torrentsAdded(QSet<int>)), this, SLOT(torrentsAdded(QSet<int>)) );
 
     mySession->initTorrents( );
@@ -246 +248 @@
 
 void
+MyApp :: torrentsAdded( QSet<int> torrents )
+{
+    myAddedTorrents += torrents;
+std::cerr << "added count is " << myAddedTorrents.size() << std::endl;
+}
+
+void
 MyApp :: consentGiven( )
 {
@@ -355 +364 @@
 }
 
+/***
+****
+***/
+
 void
 MyApp :: raise( )
 {
     QApplication :: alert ( myWindow );
+}
+
+bool
+MyApp :: notify( const QString& title, const QString& body, int timeout_msec ) const
+{
+    const QString dbusServiceName = "org.freedesktop.Notifications";
+    const QString dbusInterfaceName = "org.freedesktop.Notifications";
+    const QString dbusPath = "/org/freedesktop/Notifications";
+
+    QDBusMessage m = QDBusMessage::createMethodCall(dbusServiceName, dbusPath, dbusInterfaceName, "Notify");
+    QList<QVariant> args;
+    args.append( "Transmission" ); // app_name
+    args.append( 0U );             // replaces_id
+    args.append( "transmission" ); // icon
+    args.append( title );          // summary
+    args.append( body );           // body
+    args.append( QStringList( ) ); // actions - unused for plain passive popups
+    args.append( QVariantMap( ) ); // hints - unused atm
+    args.append( int32_t(-1) );    // use the default timeout period
+    m.setArguments( args );
+    QDBusMessage replyMsg = QDBusConnection::sessionBus().call(m);
+    //std::cerr << qPrintable(replyMsg.errorName()) << std::endl;
+    //std::cerr << qPrintable(replyMsg.errorMessage()) << std::endl;
+    return (replyMsg.type() == QDBusMessage::ReplyMessage) && !replyMsg.arguments().isEmpty();
 }
 
@@ -403 +440 @@
     tr_optind = 1;
     MyApp app( argc, argv );
+    app.notify( "hello world", "this is a test" );
     return app.exec( );
 }

trunk/qt/app.h

@@ -15 +15 @@
 
 #include <QApplication>
+#include <QSet>
 #include <QTimer>
 #include "favicon.h"
@@ -34 +35 @@
     public:
         void raise( );
+        bool notify( const QString& title, const QString& body, int timeout_msec=-1 ) const;
 
     public:
@@ -48 +50 @@
         QTimer mySessionTimer;
         time_t myLastFullUpdateTime;
+        QSet<int> myAddedTorrents;
 
     private slots:
@@ -54 +57 @@
         void refreshPref( int key );
         void refreshTorrents( );
+        void torrentsAdded( QSet<int> );
 
     public slots:

trunk/qt/torrent.cc

@@ -587 +587 @@
             if( tr_bencDictFindInt( child, "lastAnnouncePeerCount", &i ) )
                 trackerStat.lastAnnouncePeerCount = i;
-            if( tr_bencDictFindInt( child, "lastAnnounceResult", &i ) )
-                trackerStat.lastAnnounceResult = i;
+            if( tr_bencDictFindStr( child, "lastAnnounceResult", &str ) )
+                trackerStat.lastAnnounceResult = str;
             if( tr_bencDictFindInt( child, "lastAnnounceStartTime", &i ) )
                 trackerStat.lastAnnounceStartTime = i;

trunk/qt/torrent.h

@@ -72 +72 @@
     bool isBackup;
     int lastAnnouncePeerCount;
-    int lastAnnounceResult;
+    QString lastAnnounceResult;
     int lastAnnounceStartTime;
     bool lastAnnounceSucceeded;

trunk/qt/tracker-delegate.cc

@@ -185 +185 @@
                 str += tr( "Got an error %1\"%2\"%3 %4 ago" )
                            .arg( err_markup_begin )
-                           .arg( tstr )
+                           .arg( inf.st.lastAnnounceResult )
                            .arg( err_markup_end )
                            .arg( tstr );