AstralTransRocketries/HMCL
1
0
Fork 0
mirror of https://github.com/HMCL-dev/HMCL.git synced 2025-08-03 19:36:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Glavo 2025-08-01 19:30:36 +08:00
parent 2cbd3c9dc0
commit f6711aeec9
2 changed files with 11 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
HMCLCore/src/main/java/org/jackhuang/hmcl/download/DefaultCacheRepository.java
View File

@ -212,19 +212,17 @@ public class DefaultCacheRepository extends CacheRepository {
} }
} }
/** /// ```json
* { /// "libraries": {
* "libraries": { /// // allow a library has multiple hash code.
* // allow a library has multiple hash code. /// [
* [ /// "name": "net.minecraftforge:forge:1.11.2-13.20.0.2345",
* "name": "net.minecraftforge:forge:1.11.2-13.20.0.2345", /// "hash": "blablabla",
* "hash": "blablabla", /// "type": "forge"
* "type": "forge" /// ]
* ] /// }
* } /// ```
* // assets and versions will not be included in index. /// assets and versions will not be included in index.
* }
*/
private static final class Index implements Validation { private static final class Index implements Validation {
private final Set<LibraryIndex> libraries; private final Set<LibraryIndex> libraries;

90
HMCLCore/src/main/java/org/jackhuang/hmcl/util/CacheRepository.java
View File

@ -29,7 +29,6 @@ import java.io.*;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.net.URLConnection; import java.net.URLConnection;
import java.nio.ByteBuffer;
import java.nio.channels.Channels; import java.nio.channels.Channels;
import java.nio.channels.FileChannel; import java.nio.channels.FileChannel;
import java.nio.channels.FileLock; import java.nio.channels.FileLock;
@ -52,7 +51,6 @@ public class CacheRepository {
private Path cacheDirectory; private Path cacheDirectory;
private Path indexFile; private Path indexFile;
private Map<URI, ETagItem> index; private Map<URI, ETagItem> index;
private final Map<String, Storage> storages = new HashMap<>();
private final ReadWriteLock lock = new ReentrantReadWriteLock(); private final ReadWriteLock lock = new ReentrantReadWriteLock();
public void changeDirectory(Path commonDir) { public void changeDirectory(Path commonDir) {
@ -62,10 +60,6 @@ public class CacheRepository {
lock.writeLock().lock(); lock.writeLock().lock();
try { try {
for (Storage storage : storages.values()) {
storage.changeDirectory(cacheDirectory);
}
if (Files.isRegularFile(indexFile)) { if (Files.isRegularFile(indexFile)) {
ETagIndex raw = JsonUtils.fromJsonFile(indexFile, ETagIndex.class); ETagIndex raw = JsonUtils.fromJsonFile(indexFile, ETagIndex.class);
if (raw == null) if (raw == null)
@ -91,15 +85,6 @@ public class CacheRepository {
return cacheDirectory; return cacheDirectory;
} }
public Storage getStorage(String key) {
lock.readLock().lock();
try {
return storages.computeIfAbsent(key, Storage::new);
} finally {
lock.readLock().unlock();
}
}
protected Path getFile(String algorithm, String hash) { protected Path getFile(String algorithm, String hash) {
return getCacheDirectory().resolve(algorithm).resolve(hash.substring(0, 2)).resolve(hash); return getCacheDirectory().resolve(algorithm).resolve(hash.substring(0, 2)).resolve(hash);
} }
@ -396,81 +381,6 @@ public class CacheRepository {
} }
} }
/**
* Universal cache
*/
public static final class Storage {
private final String name;
private Map<String, Object> storage;
private final ReadWriteLock lock = new ReentrantReadWriteLock();
private Path indexFile;
public Storage(String name) {
this.name = name;
}
public Object getEntry(String key) {
lock.readLock().lock();
try {
return storage.get(key);
} finally {
lock.readLock().unlock();
}
}
public void putEntry(String key, Object value) {
lock.writeLock().lock();
try {
storage.put(key, value);
saveToFile();
} finally {
lock.writeLock().unlock();
}
}
private void joinEntries(Map<String, Object> storage) {
this.storage.putAll(storage);
}
private void changeDirectory(Path cacheDirectory) {
lock.writeLock().lock();
try {
indexFile = cacheDirectory.resolve(name + ".json");
if (Files.isRegularFile(indexFile)) {
joinEntries(fromNonNullJson(Files.readString(indexFile), mapTypeOf(String.class, Object.class)));
}
} catch (IOException | JsonParseException e) {
LOG.warning("Unable to read storage {" + name + "} file");
} finally {
lock.writeLock().unlock();
}
}
public void saveToFile() {
try (FileChannel channel = FileChannel.open(indexFile, StandardOpenOption.READ, StandardOpenOption.WRITE)) {
FileLock lock = channel.lock();
try {
Map<String, Object> indexOnDisk = fromMaybeMalformedJson(new String(Channels.newInputStream(channel).readAllBytes(), UTF_8), mapTypeOf(String.class, Object.class));
if (indexOnDisk == null) indexOnDisk = new HashMap<>();
indexOnDisk.putAll(storage);
channel.truncate(0);
ByteBuffer writeTo = ByteBuffer.wrap(JsonUtils.GSON.toJson(storage).getBytes(UTF_8));
while (writeTo.hasRemaining()) {
if (channel.write(writeTo) == 0) {
throw new IOException("No value is written");
}
}
this.storage = indexOnDisk;
} finally {
lock.release();
}
} catch (IOException e) {
LOG.warning("Unable to write storage {" + name + "} file");
}
}
}
private static CacheRepository instance = new CacheRepository(); private static CacheRepository instance = new CacheRepository();
public static CacheRepository getInstance() { public static CacheRepository getInstance() {