From a1cbdf87a9234d2d10efeff60448dc8e250d7c85 Mon Sep 17 00:00:00 2001 From: Sheepit Renderfarm Date: Sat, 11 Jan 2025 11:14:29 +0000 Subject: [PATCH] Ref: directoryManager.getLocalCacheFiles() already provides a list of .wool,... --- .../client/config/DirectoryManager.java | 2 +- .../sheepit/client/network/ServerRequest.java | 19 ++++++------------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/sheepit/client/config/DirectoryManager.java b/src/main/java/com/sheepit/client/config/DirectoryManager.java index 30bd516..3096bb4 100644 --- a/src/main/java/com/sheepit/client/config/DirectoryManager.java +++ b/src/main/java/com/sheepit/client/config/DirectoryManager.java @@ -176,7 +176,7 @@ public class DirectoryManager { } /** - * @return a list of archives (files with extensions .zip or .wool) in the + * @return a list of archives (files with extension .wool) in the * working, storage, and shared downloads directories as long as they are not null */ public List getLocalCacheFiles() { diff --git a/src/main/java/com/sheepit/client/network/ServerRequest.java b/src/main/java/com/sheepit/client/network/ServerRequest.java index fc58667..e7eebf2 100644 --- a/src/main/java/com/sheepit/client/network/ServerRequest.java +++ b/src/main/java/com/sheepit/client/network/ServerRequest.java @@ -705,19 +705,12 @@ public class ServerRequest extends Thread { private String generateXMLForMD5cache() { List md5s = new ArrayList<>(); for (File local_file : this.directoryManager.getLocalCacheFiles()) { - try { - String extension = local_file.getName().substring(local_file.getName().lastIndexOf('.')).toLowerCase(); - String name = local_file.getName().substring(0, local_file.getName().length() - 1 * extension.length()); - if (".wool".equals(extension)) { - // node_file.setAttribute("md5", name); - FileMD5 fileMD5 = new FileMD5(); - fileMD5.setMd5(name); - - md5s.add(fileMD5); - } - } - catch (StringIndexOutOfBoundsException e) { // because the file does not have an . its path - } + String extension = local_file.getName().substring(local_file.getName().lastIndexOf('.')).toLowerCase(); + String name = local_file.getName().substring(0, local_file.getName().length() - extension.length()); + FileMD5 fileMD5 = new FileMD5(); + fileMD5.setMd5(name); + + md5s.add(fileMD5); } CacheFileMD5 cache = new CacheFileMD5();