Raincloud/sheepit-shadow-nabber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'DaCoolMoreLikeDaDumb' into 'master'

Browse Source 
Use the correct "can write" check

See merge request sheepitrenderfarm/client!134
This commit is contained in:
harlekin
2022-03-24 13:49:18 +00:00
parent 99ff873823 4da4e6fad0
commit bb59763a83
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/sheepit/client/Server.java
View File

@@ -27,6 +27,7 @@ import java.io.OutputStream;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.io.StringWriter; import java.io.StringWriter;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.nio.file.Files;
import java.net.*; import java.net.*;
import java.time.Duration; import java.time.Duration;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@@ -501,17 +502,16 @@ public class Server extends Thread {
this.log.debug(String.format("File downloaded at %s/s, written %d bytes", new TransferStats(size, duration.getSeconds() + 1).getAverageSessionSpeed(), written)); this.log.debug(String.format("File downloaded at %s/s, written %d bytes", new TransferStats(size, duration.getSeconds() + 1).getAverageSessionSpeed(), written));
this.lastRequestTime = new Date().getTime(); this.lastRequestTime = new Date().getTime();
return Error.Type.OK; return Error.Type.OK;
} }
catch (Exception e) { catch (Exception e) {
File destFile = new File(destination_); File destFile = new File(destination_);
if (destFile.getParentFile().isDirectory() == false) { if (Files.isWritable(destFile.getParentFile().toPath()) == false) {
throw new FermeExceptionPathInvalid();
}
else if (destFile.canWrite() == false) {
throw new FermeExceptionNoWritePermission(); throw new FermeExceptionNoWritePermission();
} }
else if (destFile.getParentFile().isDirectory() == false) {
throw new FermeExceptionPathInvalid();
}
else if (Utils.noFreeSpaceOnDisk(destFile.getParent(), log)) { else if (Utils.noFreeSpaceOnDisk(destFile.getParent(), log)) {
throw new FermeExceptionNoSpaceLeftOnDevice(); throw new FermeExceptionNoSpaceLeftOnDevice();
} }