From 1473d8122498e9f6e9dd3c98cf7cac4c20174a69 Mon Sep 17 00:00:00 2001
From: Dan Pasanen <dan.pasanen@gmail.com>
Date: Tue, 7 Oct 2014 15:45:11 -0500
Subject: [PATCH] core/lib: allow for sorting based on torrent size

---
 core/res/menu/activity_torrents.xml                    | 1 +
 core/res/values/strings.xml                            | 1 +
 core/src/org/transdroid/core/gui/TorrentsActivity.java | 5 +++++
 lib/src/org/transdroid/daemon/TorrentsComparator.java  | 4 ++++
 lib/src/org/transdroid/daemon/TorrentsSortBy.java      | 3 ++-
 5 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/core/res/menu/activity_torrents.xml b/core/res/menu/activity_torrents.xml
index 1b368620..3e7d2c81 100644
--- a/core/res/menu/activity_torrents.xml
+++ b/core/res/menu/activity_torrents.xml
@@ -73,6 +73,7 @@
 			<item android:id="@+id/action_sort_downspeed" android:title="@string/action_sort_downspeed" />
 			<item android:id="@+id/action_sort_upspeed" android:title="@string/action_sort_upspeed" />
 			<item android:id="@+id/action_sort_ratio" android:title="@string/action_sort_ratio" />
+			<item android:id="@+id/action_sort_size" android:title="@string/action_sort_size" />
 		</menu>
 	</item>
 	<item
diff --git a/core/res/values/strings.xml b/core/res/values/strings.xml
index 72c12dc4..3ebb015a 100644
--- a/core/res/values/strings.xml
+++ b/core/res/values/strings.xml
@@ -36,6 +36,7 @@
 	<string name="action_sort_downspeed">Download speed</string>
 	<string name="action_sort_upspeed">Upload speed</string>
 	<string name="action_sort_ratio">Ratio</string>
+	<string name="action_sort_size">Size</string>
 	<string name="action_filter">Filter list</string>
 	<string name="action_settings">Settings</string>
 	<string name="action_help">Help</string>
diff --git a/core/src/org/transdroid/core/gui/TorrentsActivity.java b/core/src/org/transdroid/core/gui/TorrentsActivity.java
index 611f5221..ba2a3924 100644
--- a/core/src/org/transdroid/core/gui/TorrentsActivity.java
+++ b/core/src/org/transdroid/core/gui/TorrentsActivity.java
@@ -816,6 +816,11 @@ public class TorrentsActivity extends Activity implements OnNavigationListener,
 		fragmentTorrents.sortBy(TorrentsSortBy.Ratio);
 	}
 
+	@OptionsItem(resName = "action_sort_size")
+	protected void sortBySize() {
+		fragmentTorrents.sortBy(TorrentsSortBy.Size);
+	}
+
 	@OptionsItem(resName = "action_filter")
 	protected void startFilterEntryDialog() {
 		FilterEntryDialog.startFilterEntry(this);
diff --git a/lib/src/org/transdroid/daemon/TorrentsComparator.java b/lib/src/org/transdroid/daemon/TorrentsComparator.java
index 57bfc15d..c1682158 100644
--- a/lib/src/org/transdroid/daemon/TorrentsComparator.java
+++ b/lib/src/org/transdroid/daemon/TorrentsComparator.java
@@ -74,6 +74,8 @@ public class TorrentsComparator implements Comparator<Torrent> {
 				return new Integer(tor1.getRateUpload()).compareTo(new Integer(tor2.getRateUpload()));
 			case Ratio:
 				return new Double(tor1.getRatio()).compareTo(new Double(tor2.getRatio()));
+			case Size:
+				return new Double(tor1.getTotalSize()).compareTo(new Double(tor2.getTotalSize()));
 			default:
 				return alphanumComparator.compare(tor1.getName().toLowerCase(), tor2.getName().toLowerCase());
 			}
@@ -97,6 +99,8 @@ public class TorrentsComparator implements Comparator<Torrent> {
 				return 0 - (new Integer(tor1.getRateUpload()).compareTo(new Integer(tor2.getRateUpload())));
 			case Ratio:
 				return 0 - new Double(tor1.getRatio()).compareTo(new Double(tor2.getRatio()));
+			case Size:
+				return 0 - new Double(tor1.getTotalSize()).compareTo(new Double(tor2.getTotalSize()));
 			default:
 				return 0 - alphanumComparator.compare(tor1.getName().toLowerCase(), tor2.getName().toLowerCase());
 			}
diff --git a/lib/src/org/transdroid/daemon/TorrentsSortBy.java b/lib/src/org/transdroid/daemon/TorrentsSortBy.java
index afc7a92b..91e40d46 100644
--- a/lib/src/org/transdroid/daemon/TorrentsSortBy.java
+++ b/lib/src/org/transdroid/daemon/TorrentsSortBy.java
@@ -29,7 +29,8 @@ public enum TorrentsSortBy {
 	UploadSpeed (5),
 	Ratio (6),
 	DownloadSpeed (7),
-	Percent (8);
+	Percent (8),
+	Size (9);
 
 	private int code;
     private static final Map<Integer,TorrentsSortBy> lookup  = new HashMap<Integer,TorrentsSortBy>();