Fix: create cache directory everytime
This commit is contained in:
@@ -101,8 +101,6 @@ public class DirectoryManager {
|
|||||||
* Creates cache directory
|
* Creates cache directory
|
||||||
*/
|
*/
|
||||||
public void createCacheDir() {
|
public void createCacheDir() {
|
||||||
this.removeWorkingDirectory();
|
|
||||||
|
|
||||||
this.configuration.getWorkingDirectory().mkdirs();
|
this.configuration.getWorkingDirectory().mkdirs();
|
||||||
this.configuration.getWoolCacheDirectory().mkdirs();
|
this.configuration.getWoolCacheDirectory().mkdirs();
|
||||||
|
|
||||||
@@ -115,8 +113,8 @@ public class DirectoryManager {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public CompletableFuture<Void> createCacheDirAsync() {
|
public CompletableFuture<Void> cleanupDirectoryAsync() {
|
||||||
return CompletableFuture.runAsync(this::createCacheDir);
|
return CompletableFuture.runAsync(this::cleanWorkingDirectory);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -477,15 +477,10 @@ public class Worker {
|
|||||||
String configFilePath = config.getConfigFilePath() != null ? config.getConfigFilePath() : OS.getOS().getDefaultConfigFilePath();
|
String configFilePath = config.getConfigFilePath() != null ? config.getConfigFilePath() : OS.getOS().getDefaultConfigFilePath();
|
||||||
config.setLogDirectory(log_dir != null ? log_dir : (new File (configFilePath).getParent()));
|
config.setLogDirectory(log_dir != null ? log_dir : (new File (configFilePath).getParent()));
|
||||||
|
|
||||||
boolean shouldCreateCache = config.isUserHasSpecifiedACacheDir() == false && cache_dir != null;
|
DirectoryManager directoryManager = new DirectoryManager(config);
|
||||||
CompletableFuture<Void> directoryInit;
|
|
||||||
|
|
||||||
if (shouldCreateCache) {
|
directoryManager.createCacheDir();
|
||||||
directoryInit = (new DirectoryManager(config)).createCacheDirAsync();
|
CompletableFuture<Void> directoryInit = directoryManager.cleanupDirectoryAsync();
|
||||||
}
|
|
||||||
else {
|
|
||||||
directoryInit = CompletableFuture.completedFuture(null);
|
|
||||||
}
|
|
||||||
|
|
||||||
Log.setInstance(config);
|
Log.setInstance(config);
|
||||||
Log.getInstance().debug("client version " + Configuration.jarVersion);
|
Log.getInstance().debug("client version " + Configuration.jarVersion);
|
||||||
|
|||||||
@@ -709,6 +709,7 @@ public class Settings implements Activity {
|
|||||||
if (fromConfig != null && fromConfig.getAbsolutePath().equals(cacheDir.getAbsolutePath()) == false) {
|
if (fromConfig != null && fromConfig.getAbsolutePath().equals(cacheDir.getAbsolutePath()) == false) {
|
||||||
config.setCacheDir(cacheDir);
|
config.setCacheDir(cacheDir);
|
||||||
(new DirectoryManager(config)).createCacheDir();
|
(new DirectoryManager(config)).createCacheDir();
|
||||||
|
(new DirectoryManager(config)).cleanWorkingDirectory();
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
// do nothing because the directory is the same as before
|
// do nothing because the directory is the same as before
|
||||||
|
|||||||
Reference in New Issue
Block a user