Merge pull request #14550 from abextm/phub-cache-longer

rl-client: keep plugin hub jars around for longer
This commit is contained in:
Adam
2022-01-04 18:16:34 -05:00
committed by GitHub

View File

@@ -35,6 +35,8 @@ import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.net.URL; import java.net.URL;
import java.time.Instant;
import java.time.temporal.ChronoUnit;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.HashSet; import java.util.HashSet;
@@ -167,6 +169,9 @@ public class ExternalPluginManager
SplashScreen.init(); SplashScreen.init();
} }
Instant now = Instant.now();
Instant keepAfter = now.minus(3, ChronoUnit.DAYS);
SplashScreen.stage(splashStart, null, "Downloading external plugins"); SplashScreen.stage(splashStart, null, "Downloading external plugins");
Set<ExternalPluginManifest> externalPlugins = new HashSet<>(); Set<ExternalPluginManifest> externalPlugins = new HashSet<>();
@@ -189,6 +194,7 @@ public class ExternalPluginManager
{ {
externalPlugins.add(manifest); externalPlugins.add(manifest);
manifest.getJarFile().setLastModified(now.toEpochMilli());
if (!manifest.isValid()) if (!manifest.isValid())
{ {
needsDownload.add(manifest); needsDownload.add(manifest);
@@ -206,7 +212,7 @@ public class ExternalPluginManager
{ {
for (File fi : files) for (File fi : files)
{ {
if (!keep.contains(fi)) if (!keep.contains(fi) && fi.lastModified() < keepAfter.toEpochMilli())
{ {
fi.delete(); fi.delete();
} }