Added "grabbed" column to subscription results

Author: parg

core/src/com/biglybt/core/content/RelatedContentSearcher.java

@@ -709,6 +709,10 @@
 
 							return( new Long( 0 ));
 						}
+						case SearchResult.PR_COMPLETED_COUNT:{
+
+							return( new Long( -1 ));
+						}
 						case SearchResult.PR_PUB_DATE:{
 
 							long	date = c.getPublishDate();

core/src/com/biglybt/core/metasearch/Result.java

@@ -56,6 +56,7 @@ public abstract class
 	public abstract int getNbPeers();
 	public abstract int getNbSeeds();
 	public abstract int getNbSuperSeeds();
+	public abstract int getNbCompleted();
 	public abstract int getComments();
 	public abstract int getVotes();
 	public abstract int getVotesDown();
@@ -283,6 +284,13 @@ public Map toJSONMap() {
 			object.put("p","-1");
 		}
 
+		int completed = getNbCompleted();
+		
+		if ( completed >= 0 ) {
+			
+			object.put( "gr", "" + completed);	// grabbed
+		}
+		
 		int	comments = getComments();
 
 		if ( comments >= 0 ){

core/src/com/biglybt/core/metasearch/impl/MetaSearchManagerImpl.java

@@ -1921,6 +1921,10 @@ public void parameterChanged(String parameterName)
 
 	     				return( new Long( result.getNbSuperSeeds()));
 	     			}
+	     			case PR_COMPLETED_COUNT:{
+
+	     				return( new Long( result.getNbCompleted()));
+	     			}
 	     			case PR_CATEGORY:{
 
 	     				return( result.getCategory());

core/src/com/biglybt/core/metasearch/impl/plugin/PluginResult.java

@@ -143,6 +143,13 @@
 	{
 		return(getIntProperty( SearchResult.PR_SUPER_SEED_COUNT ));
 	}
+	
+	@Override
+	public int
+	getNbCompleted()
+	{
+		return(getIntProperty( SearchResult.PR_COMPLETED_COUNT ));
+	}
 
 	@Override
 	public int

core/src/com/biglybt/core/metasearch/impl/web/WebResult.java

@@ -55,13 +55,16 @@ public class WebResult extends Result {
 	Date assetDate;
 
 	long size = -1;
-	int nbPeers = -1;
-	int nbSeeds = -1;
-	int nbSuperSeeds = -1;
+	
+	int nbPeers			= -1;
+	int nbSeeds			= -1;
+	int nbSuperSeeds	= -1;
+	int nbCompleted		= -1;
+	
 	int	comments	= -1;
-	int votes = -1;
-	int votesDown = -1;
-	float rank = -1;
+	int votes		= -1;
+	int votesDown	= -1;
+	float rank		= -1;
 
 	boolean privateTorrent;
 
@@ -205,6 +208,9 @@ public void setNbSuperSeedsFromHTML(String nbSuperSeeds) {
 		}
 	}
 
+	public void setNbCompleted( int num ){
+		nbCompleted = num;
+	}
 	public void setRankFromHTML( String rank_str, float divisor ){
 		if (rank_str == null) {
 			return;
@@ -558,6 +564,11 @@ public int getNbSuperSeeds() {
 		return nbSuperSeeds;
 	}
 
+	@Override
+	public int getNbCompleted(){
+		return( nbCompleted );
+	}
+	
 	@Override
 	public Date getPublishedDate() {
 		return publishedDate;

core/src/com/biglybt/core/metasearch/impl/web/rss/RSSEngine.java

@@ -51,6 +51,7 @@
 {
 	private Pattern seed_leecher_pat1 	= Pattern.compile("([0-9]+)" + RegExUtil.PAT_WHITE_SPACE + "(seed|seeder|leech|leecher)s", Pattern.CASE_INSENSITIVE );
 	private Pattern seed_leecher_pat2 	= Pattern.compile("(seed|seeder|leech|leecher)s" + RegExUtil.PAT_WHITE_SPACE + "([0-9]+)", Pattern.CASE_INSENSITIVE );
+	private Pattern completed_pat	 	= Pattern.compile("(?:complete|completed)" + RegExUtil.PAT_WHITE_SPACE + "([0-9]+)", Pattern.CASE_INSENSITIVE );
 
 	private Pattern size_pat 			= Pattern.compile("([0-9\\.]+)" + RegExUtil.PAT_WHITE_SPACE + "(B|KB|KiB|MB|MiB|GB|GiB|TB|TiB)", Pattern.CASE_INSENSITIVE );
 
@@ -353,11 +354,14 @@
 
 					int	item_seeds		= -1;
 					int item_peers		= -1;
+					int	item_completed	= -1;
+					
 					String item_hash	= null;
 					String item_magnet	= null;
 
-					String	desc_size = null;
-
+					String	desc_size		= null;
+					int		desc_completed	= -1;
+					
 					String potential_cdp_link = null;
 
 					SimpleXMLParserDocumentNode node = item.getNode();
@@ -615,6 +619,15 @@
 							}catch( Throwable e ){
 
 							}
+						}else if( lc_child_name.equals( "grabs" ) || lc_child_name.equals( "completed" )){
+
+							try{
+								item_completed = Integer.parseInt( value );
+
+							}catch( Throwable e ){
+
+							}
+
 						}else if( lc_child_name.equals( "infohash" ) || lc_child_name.equals( "info_hash" )){
 
 							item_hash = value;
@@ -693,6 +706,17 @@
 									}
 								}
 
+								m = completed_pat.matcher( desc );
+
+								if ( m.find()){
+
+									try{
+										desc_completed = Integer.parseInt(m.group(1));
+										
+									}catch( Throwable e ){
+									}
+								}
+								
 								m = size_pat.matcher( desc );
 
 								if ( m.find()){
@@ -895,6 +919,11 @@
 							result.setTorrentLink( item_magnet );
 						}
 					}
+					
+					if ( item_completed >= 0 || desc_completed >= 0) {
+						
+						result.setNbCompleted( Math.max( item_completed, desc_completed ));
+					}
 
 						// if we still have no download link see if the magnet is in the title
 

core/src/com/biglybt/core/subs/impl/SubscriptionResultImpl.java

@@ -716,6 +716,9 @@
 
 			result.put( SearchResult.PR_LEECHER_COUNT, peers==null?-1:Long.parseLong(peers) );
 
+			String	completed = (String)map.get( "gr" );
+
+			result.put( SearchResult.PR_COMPLETED_COUNT, completed==null?-1:Long.parseLong(completed) );
 
 			String	votes = (String)map.get( "v" );
 

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

@@ -53,6 +53,9 @@
 	public long
 	getSeedsPeersSortValue();
 
+	public int
+	getNbCompleted();
+	
 	public String
 	getVotesComments();
 

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

@@ -51,6 +51,7 @@
 	private String				seeds_peers;
 	private int					seed_count;
 	private int					peer_count;
+	private int					completed_count;
 	private long				votes_comments_sort;
 	private String				votes_comments;
 	private int					rank;
@@ -148,6 +149,8 @@
 		long seeds 		= (Long)properties.get( SearchResult.PR_SEED_COUNT );
 		long leechers 	= (Long)properties.get( SearchResult.PR_LEECHER_COUNT );
 
+		completed_count 	= ((Long)properties.get( SearchResult.PR_COMPLETED_COUNT )).intValue();
+
 		seed_count = (int)(seeds<0?0:seeds);
 		peer_count = (int)(leechers<0?0:leechers);
 
@@ -271,6 +274,13 @@
 		return( seeds_peers_sort );
 	}
 
+	@Override
+	public int 
+	getNbCompleted()
+	{
+		return( completed_count );
+	}
+	
 	@Override
 	public String
 	getVotesComments()

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

@@ -5553,6 +5553,7 @@ value.invalid.title=Invalid Value
 value.invalid.text=Invalid value entered
 enter.number=Enter Number
 number.of.pieces=Number of Pieces
+TableColumn.header.grabbed=Grabbed
 
 #
 #

core/src/com/biglybt/pif/utils/search/SearchResult.java

@@ -52,6 +52,8 @@
 	public static final int	PR_ASSET_DATE			= 24;
 	public static final int	PR_TAGS					= 25;	// String[]
 
+	public static final int	PR_COMPLETED_COUNT		= 26;	// Long	(-1 unknown)
+
 		// if you add more properties make sure you amend the mapping in PluginEngine appropriately
 		// AND the reverse mapping in MetaSearchManagerImpl
 		// AND generic XML attributes in xml-http plugin

uis/src/com/biglybt/ui/swt/columns/searchsubs/ColumnSearchSubResultGrabbed.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 ColumnSearchSubResultGrabbed
+	implements TableCellRefreshListener, TableColumnExtraInfoListener
+{
+	public static String COLUMN_ID = "grabbed";
+
+
+	@Override
+	public void fillTableColumnInfo(TableColumnInfo info) {
+		info.addCategories(new String[] {
+			TableColumn.CAT_CONTENT,
+		});
+		info.setProficiency(TableColumnInfo.PROFICIENCY_INTERMEDIATE);
+	}
+
+	/** Default Constructor */
+	public ColumnSearchSubResultGrabbed(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.getNbCompleted();
+
+		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

@@ -47,6 +47,7 @@
 	private final long				seeds_peers_sort;
 	private final int				seed_count;
 	private final int				peer_count;
+	private final int				completed_count;
 	private final long				votes_comments_sort;
 	private final String			votes_comments;
 
@@ -107,6 +108,8 @@
 
 		seeds_peers_sort = ((seeds&0x7fffffff)<<32) | ( leechers & 0xffffffff );
 
+		completed_count = result.getNbCompleted();
+		
 		long votes		= result.getVotes();
 		long comments 	= result.getComments();
 
@@ -210,6 +213,13 @@
 		return( seeds_peers_sort );
 	}
 
+	@Override
+	public int 
+	getNbCompleted() 
+	{
+		return( completed_count );
+	}
+	
 	@Override
 	public String
 	getVotesComments()

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

@@ -1010,27 +1010,38 @@ public void tableColumnCreated(TableColumn column) {
 				});
 
 		tableManager.registerColumn(
-				SBC_SearchResult.class,
-				ColumnSearchSubResultSeeds.COLUMN_ID,
-					new TableColumnCreationListener() {
+			SBC_SearchResult.class,
+			ColumnSearchSubResultSeeds.COLUMN_ID,
+				new TableColumnCreationListener() {
 
-						@Override
-						public void tableColumnCreated(TableColumn column) {
-							new ColumnSearchSubResultSeeds(column);
-						}
-					});
+					@Override
+					public void tableColumnCreated(TableColumn column) {
+						new ColumnSearchSubResultSeeds(column);
+					}
+				});
 
 		tableManager.registerColumn(
-				SBC_SearchResult.class,
-				ColumnSearchSubResultPeers.COLUMN_ID,
-					new TableColumnCreationListener() {
+			SBC_SearchResult.class,
+			ColumnSearchSubResultPeers.COLUMN_ID,
+				new TableColumnCreationListener() {
 
-						@Override
-						public void tableColumnCreated(TableColumn column) {
-							new ColumnSearchSubResultPeers(column);
-						}
-					});
+					@Override
+					public void tableColumnCreated(TableColumn column) {
+						new ColumnSearchSubResultPeers(column);
+					}
+				});
+
+		tableManager.registerColumn(
+			SBC_SearchResult.class,
+			ColumnSearchSubResultGrabbed.COLUMN_ID,
+				new TableColumnCreationListener() {
 
+					@Override
+					public void tableColumnCreated(TableColumn column) {
+						new ColumnSearchSubResultGrabbed(column);
+					}
+				});
+		
 		tableManager.registerColumn(
 			SBC_SearchResult.class,
 			ColumnSearchSubResultRatings.COLUMN_ID,