Added global setting for file priority pieces remaining

Author: parg

core/src/com/biglybt/core/config/ConfigKeys.java

@@ -430,6 +430,7 @@ public static class Transfer {
 		public static final String ICFG_PRIORITIZE_FIRST_MB = "Prioritize First MB";
 		public static final String BCFG_PRIORITIZE_FIRST_PIECE_FORCE = "Prioritize First Piece Force";
 		public static final String BCFG_PRIORITIZE_MOST_COMPLETED_FILES = "Prioritize Most Completed Files";
+		public static final String ICFG_SET_FILE_PRIORITY_REM_PIECE = "Set File Priority Remaining Pieces";
 		public static final String SCFG_IGNORE_PEER_PORTS = "Ignore.peer.ports";
 		public static final String BCFG_LAN_SPEED_ENABLED = "LAN Speed Enabled";
 		public static final String ICFG_MAX_LAN_UPLOAD_SPEED_K_BS = "Max LAN Upload Speed KBs";

core/src/com/biglybt/core/config/impl/ConfigurationDefaults.java

@@ -421,6 +421,7 @@ public class ConfigurationDefaults {
     def.put( ConfigKeys.Transfer.ICFG_PRIORITIZE_FIRST_MB, 0 );
     def.put( ConfigKeys.Transfer.BCFG_PRIORITIZE_FIRST_PIECE_FORCE, FALSE );
     def.put( "Prioritize Most Completed Files", FALSE );
+    def.put( ConfigKeys.Transfer.ICFG_SET_FILE_PRIORITY_REM_PIECE, ZERO );
     def.put( "Piece Picker Request Hint Enabled", TRUE );
     def.put( "Use Lazy Bitfield", FALSE );
     def.put( "Zero New", FALSE );

core/src/com/biglybt/core/disk/DiskManagerFileInfoSet.java

@@ -51,7 +51,7 @@ public interface
 	/**
 	 * Sets the priorities of all files
 	 *
-	 * @param newPriorities array size must be # of files in set
+	 * @param newPriorities array size must be # of files in set. Use Integer.MIN_VALUE to signify "no change"
 	 */
 	public void setPriority(int[] newPriorities);
 

core/src/com/biglybt/core/disk/impl/DiskManagerFileInfoSetImpl.java

@@ -55,30 +55,48 @@ public int nbFiles() {
 	}
 
 	@Override
-	public void setPriority(int[] newPriorities) {
-		if(newPriorities.length != files.length)
+	public void 
+	setPriority(
+		int[] newPriorities) 
+	{
+		if ( newPriorities.length != files.length ){
+			
 			throw new IllegalArgumentException("array length mismatches the number of files");
-
+		}
+		
 		DownloadManagerState dmState = diskManager.getDownloadState();
 
-		try	{
+		try{
 			dmState.suppressStateSave(true);
 
-
-			for(int i=0;i<files.length;i++)
-				if(newPriorities[i] != 0){
-					files[i].setPriority(newPriorities[i]);
+			for ( int i=0;i<files.length;i++ ){
+				
+					// existing code ignored 0, dunno why, removed it. anyway I've added Integer.MIN_VALUE to signify no change
+				
+				int np = newPriorities[i];
+				
+				if ( np != Integer.MIN_VALUE ){
+					
+					files[i].setPriority( np );
 				}
-		} finally {
+			}
+		}finally{
+			
 			dmState.suppressStateSave(false);
 		}
 	}
 
 	@Override
-	public void setSkipped(boolean[] toChange, boolean setSkipped) {
-		if(toChange.length != files.length)
+	public void 
+	setSkipped(
+		boolean[] toChange, 
+		boolean setSkipped) 
+	{
+		if (toChange.length != files.length ){
+			
 			throw new IllegalArgumentException("array length mismatches the number of files");
-
+		}
+		
 		DownloadManagerState dmState = diskManager.getDownloadState();
 
 		try	{

core/src/com/biglybt/core/disk/impl/DiskManagerUtil.java

@@ -462,8 +462,12 @@ static abstract class FileSkeleton implements DiskManagerFileInfoHelper {
 		        final DiskManagerFileInfoSet fileSetSkeleton = new DiskManagerFileInfoSet() {
 
 		        	@Override
-		        	public void load(int[] priorities, boolean[] skipped){
+		        	public void 
+		        	load(
+		        		int[] priorities, boolean[] skipped)
+		        	{
 		        		for ( int i=0;i<priorities.length;i++){
+		        			
 		        			res[i].load(priorities[i],skipped[i]);
 		        		}
 		        	}
@@ -485,39 +489,56 @@ public int nbFiles() {
 					}
 
 					@Override
-					public void setPriority(int[] newPriorities) {
-						if(newPriorities.length != res.length){
+					public void 
+					setPriority(
+						int[] newPriorities ) 
+					{
+						if ( newPriorities.length != res.length){
+							
 							throw new IllegalArgumentException("array length mismatches the number of files");
 						}
 
 						List<DiskManagerFileInfo> priorityChanged = new ArrayList<>( res.length );
 
-						for(int i=0;i<res.length;i++){
+						for ( int i=0; i<res.length; i++){
 
-							int np = newPriorities[i];
+							FileSkeleton file = res[i];
 
-							res[i].priority = np;
+							int np = newPriorities[i];
 
-							if ( np != 0 ){
-								priorityChanged.add( res[i] );
+							if ( np != Integer.MIN_VALUE ){
+								
+								if ( file.priority != np ){
+								
+									file.priority = np;
+																									
+									priorityChanged.add( file );
+								}
 							}
 						}
 						if ( !loading[0] ){
 
-							DiskManagerImpl.storeFilePriorities( download_manager, res);
+							DiskManagerImpl.storeFilePriorities( download_manager, res );
 						}
 
 						if ( !priorityChanged.isEmpty()){
+							
 							listener.filePriorityChanged(getDiskManager(),priorityChanged);
 						}
 					}
 
 					@Override
-					public void setSkipped(boolean[] toChange, boolean setSkipped) {
-						if(toChange.length != res.length)
+					public void 
+					setSkipped(
+							boolean[] toChange, boolean setSkipped) 
+					{
+						if ( toChange.length != res.length ){
+							
 							throw new IllegalArgumentException("array length mismatches the number of files");
-
-		        		if (!setSkipped ){
+						}
+						
+		        		if ( !setSkipped ){
+		        			
 		    				String[] types = DiskManagerImpl.getStorageTypes(download_manager);
 
 		    				boolean[]	toLinear 	= new boolean[toChange.length];

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

@@ -134,6 +134,13 @@
 
     public void 
     forceRecheck();
+    
+    	/**
+    	 * Called for certain config change events so that individual managers don't have to separately listener for changes
+    	 */
+    
+    public void
+    syncGlobalConfig();
 
     	/**
          * Reset the file download state to totally undownloaded. Download must be stopped

core/src/com/biglybt/core/download/impl/DownloadManagerImpl.java

@@ -1084,6 +1084,8 @@ public String getTaggableName(){
 				 controller.setDownloadManagerState( download_manager_state );
 
 				 readParameters();
+				 
+				 readFilePriorityConfig( true, false );
 
 					// establish any file links
 
@@ -1137,7 +1139,7 @@ protected Boolean initialValue(){
 					 			}
 							}else if ( attribute_name.equals( DownloadManagerState.AT_SET_FILE_PRIORITY_REM_PIECE )){
 
-								readParameters();
+								readFilePriorityConfig( false, false );
 							}
 						}
 					};
@@ -1652,6 +1654,13 @@ public void perform(TimerEvent event){
 
 	}
 
+	@Override
+	public void 
+	syncGlobalConfig()
+	{
+		readFilePriorityConfig( false, true );
+	}
+	
 	protected void
 	readParameters()
 	{
@@ -1670,10 +1679,31 @@ public void perform(TimerEvent event){
 		max_uploads_when_seeding = Math.max( max_uploads_when_seeding, DownloadManagerState.MIN_MAX_UPLOADS );
 
 		upload_priority_manual					= state.getIntParameter( DownloadManagerState.PARAM_UPLOAD_PRIORITY );
-		
-		set_file_priority_high_pieces_rem		= state.getIntAttribute( DownloadManagerState.AT_SET_FILE_PRIORITY_REM_PIECE );
 	}
 
+	private void
+	readFilePriorityConfig(
+		boolean		init,
+		boolean		global_change )
+	{
+		int sfp		= getDownloadState().getIntAttribute( DownloadManagerState.AT_SET_FILE_PRIORITY_REM_PIECE );
+		
+		if ( sfp == 0 ){
+			
+			sfp = COConfigurationManager.getIntParameter( ConfigKeys.Transfer.ICFG_SET_FILE_PRIORITY_REM_PIECE );
+		}
+		
+		if ( sfp != set_file_priority_high_pieces_rem ){
+		
+			set_file_priority_high_pieces_rem = sfp;
+			
+			if ( !init ){
+				
+				checkFilePriorities( global_change );
+			}
+		}
+	}
+	
 	protected int[]
 	getMaxConnections( boolean mixed )
 	{
@@ -4047,6 +4077,59 @@ public boolean isDownloadComplete(boolean bIncludeDND) {
 		}
 	}
 
+	private void
+	checkFilePriorities(
+		boolean	global_change )
+	{
+			// on global change to zero we reset file priorities as user seems to want to disable the default and manually clearing priorities across
+			// all downloads is a pain
+		
+		int sfp_pieces = set_file_priority_high_pieces_rem;
+		
+		if ( global_change || sfp_pieces > 0 ){
+			
+			DiskManager	dm = getDiskManager();
+			
+			if ( dm != null ){
+
+				long sfp_bytes = dm.getPieceLength() * sfp_pieces;
+				
+				DiskManagerFileInfoSet set = getDiskManagerFileInfoSet();
+				
+				DiskManagerFileInfo[] files = set.getFiles();
+				
+				int[]	priorities = null;
+						
+				for ( DiskManagerFileInfo file: files ){
+					
+					long	rem = file.getLength() - file.getDownloaded();
+		    		
+		    		int expected = sfp_bytes==0?0:( rem <= sfp_bytes?1:0);
+		    					    				
+		    		int existing = file.getPriority();
+		    		
+		    		if ( expected != existing && ( existing == 0 || existing == 1 )){
+		    			
+	    				if ( priorities == null ){
+	    					
+	    					priorities = new int[files.length];
+	    					
+	    					Arrays.fill( priorities, Integer.MIN_VALUE );
+	    				}
+	    				
+	    				priorities[file.getIndex()] = expected;
+		    		}
+				}
+				
+				if ( priorities != null ){
+				
+					set.setPriority( priorities );
+				}
+			}
+			
+		}
+	}
+	
 	/**
 	 * Doesn't not inform if state didn't change from last inform call
 	 */
@@ -4078,6 +4161,10 @@ public boolean isDownloadComplete(boolean bIncludeDND) {
 					resume_time = 0;
 				}
 
+				if ( new_state == DownloadManager.STATE_DOWNLOADING ){
+					
+					checkFilePriorities( false );
+				}
 
 				listeners.dispatch( LDT_STATECHANGED, new Object[]{ this, new Integer( new_state )});
 			}
@@ -4165,46 +4252,29 @@ public boolean isDownloadComplete(boolean bIncludeDND) {
 	informPieceDoneChanged(
 		DiskManagerPiece	piece )
 	{
-		int num = set_file_priority_high_pieces_rem;
+		int sfp_pieces = set_file_priority_high_pieces_rem;
 
-		if ( num > 0 ){
+		if ( sfp_pieces > 0 ){
 
 			DiskManager	dm = getDiskManager();
 
 			if ( dm != null ){
-				
-				DiskManagerPiece[] pieces = dm.getPieces();
-	
+					
+				long sfp_bytes = dm.getPieceLength() * sfp_pieces;	// easier to work with bytes and close enough
+
 				DMPieceList list = piece.getPieceList();
 
-				for ( int i=0;i<list.size();i++) {
+				for ( int i=0; i<list.size(); i++){
 
 					DMPieceMapEntry entry = list.get( i );
 
-					DiskManagerFileInfo info = entry.getFile();
-					
-					if ( info.getPriority() != 0 ){
-						
-						continue;
-					}
+					DiskManagerFileInfo file = entry.getFile();
 
-					int start = info.getFirstPieceNumber();
-		    		
-		    		int end = start + info.getNbPieces();
-		    		
-		    		int remaining = 0;
-		    		
-		    		for ( int j = start; j < end; j++ ){
-		    			
-		    			if ( !pieces[ j ].isDone() ){
-		    				
-		    				remaining++;
-		    			}
-		    		}
-		    		
-		    		if ( remaining <= num ){
-		    			
-		    			info.setPriority( 1 );
+					long	rem = file.getLength() - file.getDownloaded();
+
+		    		if ( rem <= sfp_bytes ){
+    						    			
+		    			file.setPriority( 1 );
 		    		}
 				}
 			}