Missed one

BiglySoftware · Sep 26, 2023 · ca033fd · ca033fd
1 parent 9b06af7
commit ca033fd
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 3 deletions.
diff --git a/core/src/com/biglybt/core/util/FileUtil.java b/core/src/com/biglybt/core/util/FileUtil.java
@@ -3637,10 +3637,22 @@ public static long getUsableSpace(File f)
 		FileOpWithTimeout<T>	fo,
 		IOException				def_error )
 
+		throws IOException
+	{
+		return( runFileOpWithTimeoutEx( file, fo, def_error, -1 ));
+	}
+
+	private static <T> T
+	runFileOpWithTimeoutEx(
+		File					file,
+		FileOpWithTimeout<T>	fo,
+		IOException				def_error,
+		long					strict_timeout )
+
 		throws IOException
 	{
 		try{
-			return( runFileOpWithTimeoutEx( file, fo, null, def_error, -1 ));
+			return( runFileOpWithTimeoutEx( file, fo, null, def_error, strict_timeout ));
 
 		}catch( IOException e ){
 
@@ -3950,11 +3962,21 @@ public static long getUsableSpace(File f)
 	getCanonicalPathWithTimeout(
 		File		file )
 
+		throws IOException
+	{
+		return( getCanonicalPathWithTimeout( file, -1 ));
+	}
+
+	public static String
+	getCanonicalPathWithTimeout(
+		File		file,
+		long		strict_timeout )
+
 		throws IOException
 	{
 		return(runFileOpWithTimeoutEx(file,()->{
 			return( file.getCanonicalPath());
-		}, new IOException( "File system not responding/slow" )));	
+		}, new IOException( "File system not responding/slow" ), strict_timeout ));	
 	}
 
 	private static volatile File[]	last_roots = {};

diff --git a/uis/src/com/biglybt/ui/swt/Utils.java b/uis/src/com/biglybt/ui/swt/Utils.java
@@ -7082,6 +7082,15 @@ public void handleEvent(Event e) {
 		return( FileUtil.lengthWithTimeout( file, 250 ));
 	}
 
+	public static String
+	getCanonicalPathWithTimeout(
+		File		file )
+
+		throws IOException
+	{
+		return( FileUtil.getCanonicalPathWithTimeout( file, 250 ));
+	}
+
 	public static File[]
 	listFileRootsWithTimeout()
 	{

diff --git a/uis/src/com/biglybt/ui/swt/views/tableitems/files/PathItem.java b/uis/src/com/biglybt/ui/swt/views/tableitems/files/PathItem.java
@@ -32,6 +32,7 @@
 import com.biglybt.pif.ui.tables.TableCellRefreshListener;
 import com.biglybt.pif.ui.tables.TableColumnInfo;
 import com.biglybt.pif.ui.tables.TableManager;
+import com.biglybt.ui.swt.Utils;
 import com.biglybt.ui.swt.views.FilesView;
 import com.biglybt.ui.swt.views.table.CoreTableColumnSWT;
 
@@ -136,7 +137,7 @@ protected static String determinePath(DiskManagerFileInfo fileInfo, boolean _sho
 
     	if ( parent != null ){
 		      try {
-		          path = FileUtil.getCanonicalPathWithTimeout( parent );
+		          path = Utils.getCanonicalPathWithTimeout( parent );
 		      }
 		      catch( IOException e ) {
 		          path = file.getParentFile().getAbsolutePath();