ignore enclose size for RSS feeds that are probably torrent file sizes

Author: parg

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

@@ -295,7 +295,7 @@ public void setAssetDate( String str ){
 		assetDate = RSSUtils.parseRSSDate( str );
 	}
 
-	public void setSizeFromHTML(String size) {
+	public void setSizeFromHTML(String size, long minAcceptable) {
 		if(size != null) {
 			size = removeHTMLTags(size);
 			String sizeS = Entities.HTML40.unescape(size).replace((char)160,(char)32);
@@ -318,7 +318,10 @@ public void setSizeFromHTML(String size) {
 				if ( multiplier <= 0 ){
 					multiplier= 1;	// ignore invalid 
 				}
-				this.size = (long) (base * multiplier );
+				long result = (long) (base * multiplier );
+				if ( result >= minAcceptable ){
+					this.size = result;
+				}
 			} catch(Throwable e) {
 				//e.printStackTrace();
 			}

core/src/com/biglybt/core/metasearch/impl/web/json/JSONEngine.java

@@ -477,7 +477,7 @@
 										result.setNameFromHTML(fieldContent);
 										break;
 									case FIELD_SIZE :
-										result.setSizeFromHTML(fieldContent);
+										result.setSizeFromHTML(fieldContent, 0);
 										break;
 									case FIELD_PEERS :
 										result.setNbPeersFromHTML(fieldContent);

core/src/com/biglybt/core/metasearch/impl/web/regex/RegexEngine.java

@@ -447,7 +447,7 @@
 													result.setNameFromHTML(fieldContent);
 													break;
 												case FIELD_SIZE :
-													result.setSizeFromHTML(fieldContent);
+													result.setSizeFromHTML(fieldContent, 0);
 													break;
 												case FIELD_PEERS :
 													result.setNbPeersFromHTML(fieldContent);

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

@@ -410,7 +410,11 @@
 
 								if (lengthAtt != null){
 
-									result.setSizeFromHTML(lengthAtt.getValue());
+										// The enclosure size is supposed to be that of the related content, i.e. the size of the
+										// torrent file, NOT the size of the download
+										// However historically it was used incorrectly to refer to the sie of the download itself.
+										// So only accept it as such if the size is probably too large for a torrent file
+									result.setSizeFromHTML(lengthAtt.getValue(), 1024*1024 );
 								}
 							}
 						}else if(lc_child_name.equals( "category" )) {
@@ -535,7 +539,7 @@
 							}
 						}else if ( lc_full_child_name.equals( "vuze:size" )){
 
-							result.setSizeFromHTML( value );
+							result.setSizeFromHTML( value, 0 );
 
 						}else if ( lc_full_child_name.equals( "vuze:seeds" )){
 
@@ -745,7 +749,7 @@
 									try{
 										long l = Long.parseLong( n.getValue().trim());
 
-										result.setSizeFromHTML( l + " B" );
+										result.setSizeFromHTML( l + " B", 0 );
 
 									}catch( Throwable e ){
 
@@ -900,7 +904,7 @@
 
 						if ( n != null ){
 
-							result.setSizeFromHTML( n.getValue().trim());
+							result.setSizeFromHTML( n.getValue().trim(), 0 );
 						}
 					}
 
@@ -984,7 +988,7 @@
 
 						if ( desc_size != null ){
 
-							result.setSizeFromHTML( desc_size );
+							result.setSizeFromHTML( desc_size, 0 );
 
 						}
 					}

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

@@ -58,7 +58,7 @@ public void refresh(TableCell cell) {
 			return;
 		}
 
-		cell.setText( String.valueOf( num ));
+		cell.setText( num<0?"":String.valueOf( num ));
 
 		return;