AstralTransRocketries/HMCL
1
0
Fork 0
mirror of https://github.com/HMCL-dev/HMCL.git synced 2025-09-10 04:16:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

update CacheRepository

Browse Source
This commit is contained in:
Glavo 2025-07-31 21:41:32 +08:00
parent e887018818
commit 73e0f4d16f
2 changed files with 38 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,14 +18,14 @@
package org.jackhuang.hmcl.util; package org.jackhuang.hmcl.util;
import com.google.gson.JsonParseException; import com.google.gson.JsonParseException;
import com.google.gson.JsonSyntaxException;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;
import org.jackhuang.hmcl.util.function.ExceptionalSupplier; import org.jackhuang.hmcl.util.function.ExceptionalSupplier;
import org.jackhuang.hmcl.util.gson.JsonUtils; import org.jackhuang.hmcl.util.gson.JsonUtils;
import org.jackhuang.hmcl.util.io.FileUtils; import org.jackhuang.hmcl.util.io.FileUtils;
import org.jackhuang.hmcl.util.io.NetworkUtils; import org.jackhuang.hmcl.util.io.NetworkUtils;
import java.io.FileNotFoundException; import java.io.*;
import java.io.IOException;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.net.URLConnection; import java.net.URLConnection;
@ -39,17 +39,13 @@ import java.nio.file.StandardOpenOption;
import java.time.ZonedDateTime; import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.*; import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.function.BiFunction; import java.util.function.BiFunction;
import java.util.stream.Stream;
import static java.nio.charset.StandardCharsets.UTF_8; import static java.nio.charset.StandardCharsets.UTF_8;
import static org.jackhuang.hmcl.util.gson.JsonUtils.fromMaybeMalformedJson; import static org.jackhuang.hmcl.util.gson.JsonUtils.*;
import static org.jackhuang.hmcl.util.gson.JsonUtils.fromNonNullJson;
import static org.jackhuang.hmcl.util.gson.JsonUtils.mapTypeOf;
import static org.jackhuang.hmcl.util.logging.Logger.LOG; import static org.jackhuang.hmcl.util.logging.Logger.LOG;
public class CacheRepository { public class CacheRepository {
@ -167,7 +163,7 @@ public class CacheRepository {
lock.readLock().lock(); lock.readLock().lock();
ETagItem eTagItem; ETagItem eTagItem;
try { try {
eTagItem = index.get(uri.toString()); eTagItem = index.get(NetworkUtils.dropQuery(uri).toString());
} finally { } finally {
lock.readLock().unlock(); lock.readLock().unlock();
} }
@ -185,14 +181,19 @@ public class CacheRepository {
public void removeRemoteEntry(URI uri) { public void removeRemoteEntry(URI uri) {
lock.readLock().lock(); lock.readLock().lock();
try { try {
index.remove(uri.toString()); index.remove(NetworkUtils.dropQuery(uri).toString());
} finally { } finally {
lock.readLock().unlock(); lock.readLock().unlock();
} }
} }
public void injectConnection(URLConnection conn) { public void injectConnection(URLConnection conn) {
String url = conn.getURL().toString(); String url;
try {
url = NetworkUtils.dropQuery(conn.getURL().toURI()).toString();
} catch (URISyntaxException e) {
return;
}
lock.readLock().lock(); lock.readLock().lock();
ETagItem eTagItem; ETagItem eTagItem;
try { try {
@ -279,16 +280,15 @@ public class CacheRepository {
} }
@SafeVarargs @SafeVarargs
private final Map<String, ETagItem> joinETagIndexes(Collection<ETagItem>... indexes) { private Map<String, ETagItem> joinETagIndexes(Collection<ETagItem>... indexes) {
Map<String, ETagItem> eTags = new ConcurrentHashMap<>(); Map<String, ETagItem> eTags = new LinkedHashMap<>();
for (Collection<ETagItem> eTagItems : indexes) {
Stream<ETagItem> stream = Arrays.stream(indexes).filter(Objects::nonNull).map(Collection::stream) if (eTagItems != null) {
.reduce(Stream.empty(), Stream::concat); for (ETagItem eTag : eTagItems) {
stream.forEach(eTag -> {
eTags.compute(eTag.url, updateEntity(eTag)); eTags.compute(eTag.url, updateEntity(eTag));
}); }
}
}
return eTags; return eTags;
} }
@ -296,15 +296,22 @@ public class CacheRepository {
try (FileChannel channel = FileChannel.open(indexFile, StandardOpenOption.CREATE, StandardOpenOption.READ, StandardOpenOption.WRITE)) { try (FileChannel channel = FileChannel.open(indexFile, StandardOpenOption.CREATE, StandardOpenOption.READ, StandardOpenOption.WRITE)) {
FileLock lock = channel.lock(); FileLock lock = channel.lock();
try { try {
ETagIndex indexOnDisk = fromMaybeMalformedJson(new String(Channels.newInputStream(channel).readAllBytes(), UTF_8), ETagIndex.class); ETagIndex indexOnDisk;
try {
indexOnDisk = GSON.fromJson(
// Should not be closed
new BufferedReader(new InputStreamReader(Channels.newInputStream(channel))),
ETagIndex.class
);
} catch (JsonSyntaxException e) {
indexOnDisk = null;
}
Map<String, ETagItem> newIndex = joinETagIndexes(indexOnDisk == null ? null : indexOnDisk.eTag, index.values()); Map<String, ETagItem> newIndex = joinETagIndexes(indexOnDisk == null ? null : indexOnDisk.eTag, index.values());
channel.truncate(0); channel.truncate(0);
ByteBuffer writeTo = ByteBuffer.wrap(JsonUtils.GSON.toJson(new ETagIndex(newIndex.values())).getBytes(UTF_8)); BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(Channels.newOutputStream(channel), UTF_8));
while (writeTo.hasRemaining()) { JsonUtils.GSON.toJson(new ETagIndex(newIndex.values()), writer);
if (channel.write(writeTo) == 0) { writer.flush();
throw new IOException("No value is written");
}
}
this.index = newIndex; this.index = newIndex;
} finally { } finally {
lock.release(); lock.release();

4
HMCLCore/src/main/java/org/jackhuang/hmcl/util/io/NetworkUtils.java
View File

@ -94,6 +94,10 @@ public final class NetworkUtils {
} }
public static URI dropQuery(URI u) { public static URI dropQuery(URI u) {
if (u.getRawQuery() == null && u.getRawFragment() == null) {
return u;
}
try { try {
return new URI(u.getScheme(), u.getUserInfo(), u.getHost(), u.getPort(), u.getPath(), null, null); return new URI(u.getScheme(), u.getUserInfo(), u.getHost(), u.getPort(), u.getPath(), null, null);
} catch (URISyntaxException e) { } catch (URISyntaxException e) {