Separate seeds/peers columns for subs/search results

Author: parg

core/src/com/biglybt/core/subs/util/SearchSubsResultBase.java

@@ -44,6 +44,9 @@
 	public int
 	getNbSeeds();
 
+	public int
+	getNbPeers();
+	
 	public String
 	getSeedsPeers();
 

core/src/com/biglybt/internat/MessagesBundle.properties

@@ -4530,6 +4530,10 @@ SubscriptionResults.column.rank=Rank
 SubscriptionResults.column.seeds_peers=Seeds/Peers
 SubscriptionResults.column.type={label.type}
 SubscriptionResults.column.ratings=Ratings
+SubscriptionResults.column.seeds={TableColumn.header.seeds}
+SubscriptionResults.column.seeds.info=
+SubscriptionResults.column.peers={TableColumn.header.peers}
+SubscriptionResults.column.peers.info=
 
 SubscriptionResults.filter.min_size=Min Size (MB)
 SubscriptionResults.filter.max_size=Max Size (MB)
@@ -4562,6 +4566,10 @@ SearchResults.column.seeds_peers={SubscriptionResults.column.seeds_peers}
 SearchResults.column.type={SubscriptionResults.column.type}
 SearchResults.column.ratings={SubscriptionResults.column.ratings}
 SearchResults.column.site=Site
+SearchResults.column.seeds={TableColumn.header.seeds}
+SearchResults.column.seeds.info=
+SearchResults.column.peers={TableColumn.header.peers}
+SearchResults.column.peers.info=
 
 ConfigView.section.style.searchsubs=Search && Subscriptions
 ConfigView.section.style.searchsubs.row.height=Row height for native views

uis/src/com/biglybt/ui/swt/columns/searchsubs/ColumnSearchSubResultPeers.java

@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) Azureus Software, Inc, All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+package com.biglybt.ui.swt.columns.searchsubs;
+
+
+import com.biglybt.core.subs.util.SearchSubsResultBase;
+import com.biglybt.pif.ui.tables.*;
+
+
+public class ColumnSearchSubResultPeers
+	implements TableCellRefreshListener, TableColumnExtraInfoListener
+{
+	public static String COLUMN_ID = "peers";
+
+
+	@Override
+	public void fillTableColumnInfo(TableColumnInfo info) {
+		info.addCategories(new String[] {
+			TableColumn.CAT_ESSENTIAL,
+		});
+		info.setProficiency(TableColumnInfo.PROFICIENCY_BEGINNER);
+	}
+
+	/** Default Constructor */
+	public ColumnSearchSubResultPeers(TableColumn column) {
+		column.initialize(TableColumn.ALIGN_CENTER, TableColumn.POSITION_INVISIBLE, 60 );
+		column.setRefreshInterval(TableColumn.INTERVAL_INVALID_ONLY);
+		column.addListeners(this);
+	}
+
+	@Override
+	public void refresh(TableCell cell) {
+		SearchSubsResultBase result = (SearchSubsResultBase) cell.getDataSource();
+
+		long num = result.getNbPeers();
+
+		if ( !cell.setSortValue(num) && cell.isValid()){
+
+			return;
+		}
+
+		if (!cell.isShown()) {
+			return;
+		}
+
+		cell.setText( String.valueOf( num ));
+
+		return;
+
+	}
+}

uis/src/com/biglybt/ui/swt/columns/searchsubs/ColumnSearchSubResultSeeds.java

@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) Azureus Software, Inc, All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+package com.biglybt.ui.swt.columns.searchsubs;
+
+
+import com.biglybt.core.subs.util.SearchSubsResultBase;
+import com.biglybt.pif.ui.tables.*;
+
+
+public class ColumnSearchSubResultSeeds
+	implements TableCellRefreshListener, TableColumnExtraInfoListener
+{
+	public static String COLUMN_ID = "seeds";
+
+
+	@Override
+	public void fillTableColumnInfo(TableColumnInfo info) {
+		info.addCategories(new String[] {
+			TableColumn.CAT_ESSENTIAL,
+		});
+		info.setProficiency(TableColumnInfo.PROFICIENCY_BEGINNER);
+	}
+
+	/** Default Constructor */
+	public ColumnSearchSubResultSeeds(TableColumn column) {
+		column.initialize(TableColumn.ALIGN_CENTER, TableColumn.POSITION_INVISIBLE, 60 );
+		column.setRefreshInterval(TableColumn.INTERVAL_INVALID_ONLY);
+		column.addListeners(this);
+	}
+
+	@Override
+	public void refresh(TableCell cell) {
+		SearchSubsResultBase result = (SearchSubsResultBase) cell.getDataSource();
+
+		long num = result.getNbSeeds();
+
+		if ( !cell.setSortValue(num) && cell.isValid()){
+
+			return;
+		}
+
+		if (!cell.isShown()) {
+			return;
+		}
+
+		cell.setText( String.valueOf( num ));
+
+		return;
+
+	}
+}

uis/src/com/biglybt/ui/swt/search/SBC_SearchResult.java

@@ -46,6 +46,7 @@
 	private final String			seeds_peers;
 	private final long				seeds_peers_sort;
 	private final int				seed_count;
+	private final int				peer_count;
 	private final long				votes_comments_sort;
 	private final String			votes_comments;
 
@@ -88,6 +89,7 @@
 		}
 
 		seed_count = seeds<0?0:seeds;
+		peer_count = leechers<0?0:leechers;
 
 		seeds_peers = (seeds<0?"--":String.valueOf(seeds)) + "/" + (leechers<0?"--":String.valueOf(leechers));
 
@@ -187,6 +189,13 @@
 		return( seed_count );
 	}
 
+	@Override
+	public int 
+	getNbPeers()
+	{
+		return( peer_count );
+	}
+	
 	@Override
 	public String
 	getSeedsPeers()

uis/src/com/biglybt/ui/swt/search/SBC_SearchResultsView.java

@@ -1009,6 +1009,28 @@ public void tableColumnCreated(TableColumn column) {
 					}
 				});
 
+		tableManager.registerColumn(
+				SBC_SearchResult.class,
+				ColumnSearchSubResultSeeds.COLUMN_ID,
+					new TableColumnCreationListener() {
+
+						@Override
+						public void tableColumnCreated(TableColumn column) {
+							new ColumnSearchSubResultSeeds(column);
+						}
+					});
+
+		tableManager.registerColumn(
+				SBC_SearchResult.class,
+				ColumnSearchSubResultPeers.COLUMN_ID,
+					new TableColumnCreationListener() {
+
+						@Override
+						public void tableColumnCreated(TableColumn column) {
+							new ColumnSearchSubResultPeers(column);
+						}
+					});
+
 		tableManager.registerColumn(
 			SBC_SearchResult.class,
 			ColumnSearchSubResultRatings.COLUMN_ID,

uis/src/com/biglybt/ui/swt/subscriptions/SBC_SubscriptionResultsView.java

@@ -910,6 +910,28 @@ public void tableColumnCreated(TableColumn column) {
 					}
 				});
 
+		tableManager.registerColumn(
+			SubscriptionResultFilterable.class,
+			ColumnSearchSubResultSeeds.COLUMN_ID,
+				new TableColumnCreationListener() {
+
+					@Override
+					public void tableColumnCreated(TableColumn column) {
+						new ColumnSearchSubResultSeeds(column);
+					}
+				});
+
+		tableManager.registerColumn(
+			SubscriptionResultFilterable.class,
+			ColumnSearchSubResultPeers.COLUMN_ID,
+				new TableColumnCreationListener() {
+
+					@Override
+					public void tableColumnCreated(TableColumn column) {
+						new ColumnSearchSubResultPeers(column);
+					}
+				});
+		
 		tableManager.registerColumn(
 			SubscriptionResultFilterable.class,
 			ColumnSearchSubResultRatings.COLUMN_ID,