Changeset 13896

Timestamp:

Jan 30, 2013, 12:20:51 AM (9 years ago)

Author:

jordan

Message:

when sorting by activity and both torrents' upload and download speed is zero, use how many peers we're ready to upload to / download from as a secondary key.

Location:

trunk

Files:

• gtk/tr-core.c (modified) (2 diffs)
• qt/torrent-filter.cc (modified) (1 diff)

trunk/gtk/tr-core.c

@@ -469 +469 @@
   int ret = 0;
   tr_torrent *ta, *tb;
-  const tr_stat *sa, *sb;
   double aUp, aDown, bUp, bDown;
 
@@ -480 +479 @@
                             MC_TORRENT, &tb,
                             -1);
-  sa = tr_torrentStatCached (ta);
-  sb = tr_torrentStatCached (tb);
+
+  ret = compare_double (aUp+aDown, bUp+bDown);
 
   if (!ret)
-    ret = compare_double (aUp+aDown, bUp+bDown);
+    {
+      const tr_stat * const sa = tr_torrentStatCached (ta);
+      const tr_stat * const sb = tr_torrentStatCached (tb);
+      ret = compare_uint64 (sa->peersSendingToUs + sa->peersGettingFromUs,
+                            sb->peersSendingToUs + sb->peersGettingFromUs);
+    }
+
   if (!ret)
-    ret = compare_uint64 (sa->uploadedEver, sb->uploadedEver);
-  if (!ret)
-    ret = compare_by_queue (m, a, b, user_data);
+    ret = compare_by_activity (m, a, b, user_data);
 
   return ret;

trunk/qt/torrent-filter.cc

@@ -101 +101 @@
         case SortMode :: SORT_BY_ACTIVITY:
             if( !val ) val = compare( a->downloadSpeed() + a->uploadSpeed(), b->downloadSpeed() + b->uploadSpeed() );
-            if( !val ) val = compare( a->uploadedEver(), b->uploadedEver() );
+            if( !val ) val = compare( a->peersWeAreUploadingTo() + a->webseedsWeAreDownloadingFrom(),
+                                      b->peersWeAreUploadingTo() + b->webseedsWeAreDownloadingFrom());
             // fall through
         case SortMode :: SORT_BY_STATE:
-            if( !val ) val = compare( a->hasError(), b->hasError() );
+            if( !val ) val = -compare( a->isPaused(), b->isPaused() );
             if( !val ) val = compare( a->getActivity(), b->getActivity() );
             if( !val ) val = -compare( a->queuePosition(), b->queuePosition() );
+            if( !val ) val = compare( a->hasError(), b->hasError() );
             // fall through
         case SortMode :: SORT_BY_PROGRESS: