Added tag constraint function "pluginOption"

Author: parg

core/src/com/biglybt/core/download/DownloadManagerState.java

@@ -94,7 +94,8 @@
 	public static final String AT_SWARM_TAGS				= "stag";			// list
 	public static final String AT_MASK_DL_COMP_OPTIONAL		= "mdlc";			// Boolean (optional)
 	public static final String AT_REAL_DM_MAGNET_TIME		= "rdmmt";			// long
-	public static final String AT_PLUGIN_OPTIONS			= "pluginoptions";	// Map; enabled=boolean
+	public static final String AT_PLUGIN_OPTIONS			= "pluginoptions";	// Map
+	public static final String 		AT_PO_ENABLE_ANNOUNCE		= "enableannounce";		// boolean, def=true
 
 	public static final String AT_TRANSIENT_FLAGS			= "t_flags";
 	public static final String AT_TRANSIENT_TAG_SORT		= "t_tagsort";

core/src/com/biglybt/core/tag/impl/TagPropertyConstraintHandler.java

@@ -2788,6 +2788,7 @@ public void tagTypeAdded(TagManager manager, TagType tag_type){
 		private static final int FT_COUNT				= 61;
 		private static final int FT_TRACKER_PEERS		= 62;
 		private static final int FT_TRACKER_SEEDS		= 63;
+		private static final int FT_PLUGIN_OPTION		= 64;
 
 		static{
 			fn_map.put( "hastag", FT_HAS_TAG );
@@ -2867,6 +2868,8 @@ public void tagTypeAdded(TagManager manager, TagType tag_type){
 
 			fn_map.put( "trackerpeers", FT_TRACKER_PEERS );
 			fn_map.put( "trackerseeds", FT_TRACKER_SEEDS );
+			
+			fn_map.put( "pluginoption", FT_PLUGIN_OPTION );
 		}
 
 		private static final int	DEP_STATIC		= 0;
@@ -3582,6 +3585,12 @@ public void tagTypeAdded(TagManager manager, TagType tag_type){
 
 						break;
 					}
+					case FT_PLUGIN_OPTION:{
+						
+						params_ok = num_params == 2 && getStringLiteral( params, 0 ) && getStringLiteral( params, 1 );
+						
+						break;
+					}
 					default:{
 
 						throw( new RuntimeException( "Unsupported function '" + fn_type + "'" ));
@@ -4622,15 +4631,15 @@ public void tagTypeAdded(TagManager manager, TagType tag_type){
 							return( -1 );
 						}
 
-						String tracker = getStringParam( params, 0, debug ).toLowerCase();
+						String tracker = getStringParam( params, 0, debug ).toLowerCase( Locale.US );
 
 						String target = null;
 
 						String app_name = Constants.APP_NAME;
 
-						if ( tracker.equals( app_name.toLowerCase() + "dht")){
+						if ( tracker.equals( app_name.toLowerCase( Locale.US ) + "dht") || tracker.equals( "dht" )){
 
-							target = app_name;
+							target = "dht";
 
 						}else if ( tracker.equals( "mldht" )){
 
@@ -4653,7 +4662,7 @@ public void tagTypeAdded(TagManager manager, TagType tag_type){
 
 							int type = tps.getType();
 
-							if ( type == TrackerPeerSource.TP_DHT && target == app_name ){
+							if ( type == TrackerPeerSource.TP_DHT && target.equals( "dht" )){
 
 								if ( fn_type == FT_TRACKER_PEERS ){
 
@@ -4688,6 +4697,49 @@ public void tagTypeAdded(TagManager manager, TagType tag_type){
 
 						return( -1 );
 					}
+					case FT_PLUGIN_OPTION:{
+						
+						String plugin_id	= getStringParam( params, 0, debug ).toLowerCase();
+						
+						if ( plugin_id.equalsIgnoreCase( "dht" )){
+
+							plugin_id = "azbpdhdtracker";
+
+						}else if ( plugin_id.equalsIgnoreCase( "I2P" )){
+
+							plugin_id = "azneti2phelper";
+						}
+
+						String attr			= getStringParam( params, 1, debug ).toLowerCase();
+
+						if ( !attr.equals( DownloadManagerState.AT_PO_ENABLE_ANNOUNCE )){
+							
+							setError( "Unsupported plugin option attribute type: " + attr );
+							
+							return( null );
+						}
+						
+						boolean value = true;		// default
+						
+						Map all_opts = dm.getDownloadState().getMapAttribute( DownloadManagerState.AT_PLUGIN_OPTIONS );
+						
+						if ( all_opts != null ){
+													
+							Map opts = (Map)all_opts.get( plugin_id.toLowerCase( Locale.US ));
+							
+							if ( opts != null ){
+								
+								Number e = (Number)opts.get( DownloadManagerState.AT_PO_ENABLE_ANNOUNCE );
+								
+								if ( e != null ){
+									
+									value = e.intValue() != 0;
+								}
+							}
+						}
+						
+						return( value );
+					}
 				}
 
 				return( false );

core/src/com/biglybt/pifimpl/local/download/DownloadImpl.java

@@ -1705,7 +1705,7 @@ void announceTrackerResultsToListener(DownloadTrackerListener l) {
 
 				if ( opts != null ){
 
-					Number e = (Number)opts.get( "enableannounce" );
+					Number e = (Number)opts.get( DownloadManagerState.AT_PO_ENABLE_ANNOUNCE );
 
 					if ( e != null && e.intValue() == 0 ){
 

core/src/com/biglybt/plugin/simpleapi/SimpleAPIPlugin.java

@@ -886,7 +886,7 @@
 							opts_map.put( plugin_id, opt_map );
 						}
 
-						opt_map.put( "enableannounce", enable_announce?1:0 );
+						opt_map.put( DownloadManagerState.AT_PO_ENABLE_ANNOUNCE, enable_announce?1:0 );
 
 						dm.getDownloadState().setMapAttribute( DownloadManagerState.AT_PLUGIN_OPTIONS, opts_map );