Changeset 10771

Timestamp:

Jun 16, 2010, 3:02:17 AM (12 years ago)

Author:

Longinus00

Message:

(qt) #3277: Crash after getting magnet torrent metadata

Location:

trunk/qt

Files:

• details.cc (modified) (1 diff)
• torrent-delegate-min.cc (modified) (3 diffs)
• torrent-delegate.cc (modified) (4 diffs)
• torrent-model.cc (modified) (4 diffs)
• torrent.h (modified) (3 diffs)

trunk/qt/details.cc

@@ -208 +208 @@
 {
     if( !myIds.empty( ) )
+    {
+        QSet<int> infos;
+        foreach( int id, myIds ) {
+            const Torrent * tor = myModel.getTorrentFromId( id );
+            if( tor->isMagnet() )
+                infos.insert( tor->id() );
+        }
+        if( !infos.isEmpty() )
+            mySession.initTorrents( infos );
         mySession.refreshExtraStats( myIds );
+    }
 }
 

trunk/qt/torrent-delegate-min.cc

@@ -53 +53 @@
     QFont nameFont( option.font );
     const QFontMetrics nameFM( nameFont );
-    const QString nameStr( tor.name( ) );
+    const bool isMagnet( !tor.hasMetadata( ) );
+    const QString nameStr = (isMagnet ? progressString( tor ) : tor.name( ) );
     const QSize nameSize( nameFM.size( 0, nameStr ) );
 
@@ -77 +78 @@
     QFont nameFont( option.font );
     const QFontMetrics nameFM( nameFont );
-    const QString nameStr( tor.name( ) );
+    const bool isMagnet( !tor.hasMetadata( ) );
+    const QString nameStr = (isMagnet ? progressString( tor ) : tor.name( ) );
     const QSize nameSize( nameFM.size( 0, nameStr ) );
 
@@ -154 +156 @@
     myProgressBarStyle->palette.setCurrentColorGroup( cg );
     myProgressBarStyle->state = progressBarState;
-    myProgressBarStyle->progress = int(myProgressBarStyle->minimum + ((tor.percentDone() * (myProgressBarStyle->maximum - myProgressBarStyle->minimum))));
+    myProgressBarStyle->progress = int(myProgressBarStyle->minimum + (((isMagnet ? tor.metadataPercentDone() : tor.percentDone()) * (myProgressBarStyle->maximum - myProgressBarStyle->minimum))));
     style->drawControl( QStyle::CE_ProgressBar, myProgressBarStyle, painter );
 

trunk/qt/torrent-delegate.cc

@@ -63 +63 @@
 TorrentDelegate :: progressString( const Torrent& tor ) const
 {
+    const bool isMagnet( !tor.hasMetadata( ) );
     const bool isDone( tor.isDone( ) );
     const bool isSeed( tor.isSeed( ) );
@@ -70 +71 @@
     const bool hasSeedRatio( tor.getSeedRatio( seedRatio ) );
 
-    if( !isDone ) // downloading
+    if( isMagnet ) // magnet link with no metadata
+    {
+        /* %1 is the percentage of torrent metadata downloaded */
+        str = tr( "Magnetized transfer - retrieving metadata ( %1% )" )
+            .arg( tor.metadataPercentDone() );
+    }
+    else if( !isDone ) // downloading
     {
         /* %1 is how much we've got,
@@ -387 +394 @@
     painter->setFont( progressFont );
     painter->drawText( progArea, 0, progressFM.elidedText( progressStr, Qt::ElideRight, progArea.width( ) ) );
+    const bool isMagnet( !tor.hasMetadata( ) );
     myProgressBarStyle->rect = barArea;
     myProgressBarStyle->direction = option.direction;
@@ -392 +400 @@
     myProgressBarStyle->palette.setCurrentColorGroup( cg );
     myProgressBarStyle->state = progressBarState;
-    myProgressBarStyle->progress = int(myProgressBarStyle->minimum + ((tor.percentDone() * (myProgressBarStyle->maximum - myProgressBarStyle->minimum))));
+    myProgressBarStyle->progress = int(myProgressBarStyle->minimum + (((isMagnet ? tor.metadataPercentDone() : tor.percentDone()) * (myProgressBarStyle->maximum - myProgressBarStyle->minimum))));
     style->drawControl( QStyle::CE_ProgressBar, myProgressBarStyle, painter );
 

trunk/qt/torrent-model.cc

@@ -141 +141 @@
     QList<Torrent*> newTorrents;
     QSet<int> oldIds( getIds( ) );
+    QSet<int> addIds;
     QSet<int> newIds;
     int updatedCount = 0;
@@ -160 +161 @@
                     tor = new Torrent( myPrefs, id );
                     tor->update( child );
+                    if( !tor->hasMetadata() )
+                        tor->setMagnet( true );
                     newTorrents.append( tor );
                     connect( tor, SIGNAL(torrentChanged(int)), this, SLOT(onTorrentChanged(int)));
@@ -167 +170 @@
                     tor->update( child );
                     ++updatedCount;
+                    if( tor->isMagnet() && tor->hasMetadata() )
+                    {
+                        addIds.insert( tor->id() );
+                        tor->setMagnet( false );
+                    }
                 }
             }
@@ -182 +190 @@
         foreach( Torrent * tor, newTorrents ) {
             addTorrent( tor );
-            ids.insert( tor->id( ) );
+            addIds.insert( tor->id( ) );
         }
         endInsertRows( );
-
-        emit torrentsAdded( ids );
-    }
+    }
+
+    if( !addIds.isEmpty() )
+        emit torrentsAdded( addIds );
 
     if( isCompleteList )

trunk/qt/torrent.h

@@ -199 +199 @@
         static Property myProperties[];
 
+        bool magnetTorrent;
+
     public:
         typedef QList<const char*> KeyList;
@@ -252 +254 @@
         uint64_t pieceSize( ) const { return getSize( PIECE_SIZE ); }
         bool hasMetadata( ) const { return getDouble( METADATA_PERCENT_DONE ) >= 1.0; }
+        bool isMagnet( ) const { return magnetTorrent; }
         int  pieceCount( ) const { return getInt( PIECE_COUNT ); }
         double ratio( ) const { return getDouble( RATIO ); }
@@ -306 +309 @@
     public:
         void update( tr_benc * dict );
+        void setMagnet( bool magnet ) { magnetTorrent = magnet; }
 
     private: