lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

清理残留的 java.io.File 用例 (#4503)

Browse Source
This commit is contained in:
Glavo
2025-09-18 15:26:03 +08:00
committed by GitHub
parent 45f7719096
commit a0568e34a8
16 changed files with 67 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
HMCLCore/src/main/java/org/jackhuang/hmcl/download/java/mojang/MojangJavaDownloadTask.java
View File

@@ -27,6 +27,7 @@ import org.jackhuang.hmcl.task.GetTask;
import org.jackhuang.hmcl.task.Task;
import org.jackhuang.hmcl.util.gson.JsonUtils;
import org.jackhuang.hmcl.util.io.ChecksumMismatchException;
import org.jackhuang.hmcl.util.io.FileUtils;
import org.jackhuang.hmcl.util.platform.UnsupportedPlatformException;
import org.tukaani.xz.LZMAInputStream;
@@ -119,7 +120,7 @@ public final class MojangJavaDownloadTask extends Task<MojangJavaDownloadTask.Re
Files.move(decompressed, dest, StandardCopyOption.REPLACE_EXISTING);
if (file.isExecutable()) {
dest.toFile().setExecutable(true);
FileUtils.setExecutable(dest);
}
}));
} else if (file.getDownloads().containsKey("raw")) {
@@ -127,7 +128,7 @@ public final class MojangJavaDownloadTask extends Task<MojangJavaDownloadTask.Re
var task = new FileDownloadTask(downloadProvider.injectURLWithCandidates(download.getUrl()), dest, new FileDownloadTask.IntegrityCheck("SHA-1", download.getSha1()));
task.setName(entry.getKey());
if (file.isExecutable()) {
dependencies.add(task.thenRunAsync(() -> dest.toFile().setExecutable(true)));
dependencies.add(task.thenRunAsync(() -> FileUtils.setExecutable(dest)));
} else {
dependencies.add(task);
}

3
HMCLCore/src/main/java/org/jackhuang/hmcl/launch/DefaultLauncher.java
View File

@@ -736,7 +736,8 @@ public class DefaultLauncher extends Launcher {
}
}
}
if (!scriptFile.toFile().setExecutable(true))
FileUtils.setExecutable(scriptFile);
if (!Files.isExecutable(scriptFile))
throw new PermissionException();
if (usePowerShell && !CommandBuilder.hasExecutionPolicy())

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

@@ -223,7 +223,8 @@ public class CacheRepository {
return cacheData(connection, () -> {
String hash = DigestUtils.digestToString(SHA1, bytes);
Path cached = getFile(SHA1, hash);
FileUtils.writeBytes(cached, bytes);
Files.createDirectories(cached.getParent());
Files.write(cached, bytes);
return new CacheResult(hash, cached);
});
}

53
HMCLCore/src/main/java/org/jackhuang/hmcl/util/io/FileUtils.java
View File

@@ -29,6 +29,8 @@ import org.jetbrains.annotations.Nullable;
import java.io.*;
import java.nio.file.*;
import java.nio.file.attribute.BasicFileAttributes;
import java.nio.file.attribute.PosixFileAttributeView;
import java.nio.file.attribute.PosixFilePermission;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit;
@@ -236,36 +238,6 @@ public final class FileUtils {
return new String(bytes, OperatingSystem.NATIVE_CHARSET);
}
/**
* Write plain text to file. Characters are encoded into bytes using UTF-8.
* <p>
* We don't care about platform difference of line separator. Because readText accept all possibilities of line separator.
* It will create the file if it does not exist, or truncate the existing file to empty for rewriting.
* All characters in text will be written into the file in binary format. Existing data will be erased.
*
* @param file the path to the file
* @param text the text being written to file
* @throws IOException if an I/O error occurs
*/
public static void writeText(Path file, String text) throws IOException {
Files.createDirectories(file.getParent());
Files.writeString(file, text);
}
/**
* Write byte array to file.
* It will create the file if it does not exist, or truncate the existing file to empty for rewriting.
* All bytes in byte array will be written into the file in binary format. Existing data will be erased.
*
* @param file the path to the file
* @param data the data being written to file
* @throws IOException if an I/O error occurs
*/
public static void writeBytes(Path file, byte[] data) throws IOException {
Files.createDirectories(file.getParent());
Files.write(file, data);
}
public static void deleteDirectory(Path directory) throws IOException {
if (!Files.exists(directory))
return;
@@ -285,6 +257,24 @@ public final class FileUtils {
}
}
public static void setExecutable(Path path) {
PosixFileAttributeView view = Files.getFileAttributeView(path, PosixFileAttributeView.class);
if (view != null) {
try {
Set<PosixFilePermission> oldPermissions = view.readAttributes().permissions();
if (oldPermissions.contains(PosixFilePermission.OWNER_EXECUTE))
return;
EnumSet<PosixFilePermission> permissions = EnumSet.noneOf(PosixFilePermission.class);
permissions.addAll(oldPermissions);
permissions.add(PosixFilePermission.OWNER_EXECUTE);
view.setPermissions(permissions);
} catch (IOException e) {
LOG.warning("Failed to set permissions for " + path, e);
}
}
}
/**
* Copy directory.
* Paths of all files relative to source directory will be the same as the ones relative to destination directory.
@@ -397,7 +387,8 @@ public final class FileUtils {
FileUtils.copyFile(file, targetFile);
}
FileUtils.writeText(infoFile, "[Trash Info]\nPath=" + file.toAbsolutePath().normalize() + "\nDeletionDate=" + time + "\n");
Files.createDirectories(infoDir);
Files.writeString(infoFile, "[Trash Info]\nPath=" + FileUtils.getAbsolutePath(file) + "\nDeletionDate=" + time + "\n");
FileUtils.forceDelete(file);
} catch (IOException e) {
LOG.warning("Failed to move " + file + " to trash", e);