Merge pull request #397 from lmagyar/pr-fix-some-typos

Fix some typos
wolpi · Oct 12, 2024 · 2b12238 · 2b12238
2 parents 03acfd3 + 4f42918
commit 2b12238
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 9 deletions.
diff --git a/primitiveFTPd/src/org/primftpd/filesystem/FsFile.java b/primitiveFTPd/src/org/primftpd/filesystem/FsFile.java
@@ -232,14 +232,9 @@ public OutputStream createOutputStream(long offset) throws IOException {
 		// some clients do not issue mkdir commands like filezilla
 		// see isWritable()
 		File parent = file.getParentFile();
-		if (parent == null) {
+		if (parent == null || (!parent.exists() && !parent.mkdirs())) {
 			throw new IOException(String.format("Failed to create parent folder(s) '%s'", file.getAbsolutePath()));
 		}
-		if (!parent.exists()) {
-			if (!parent.mkdirs()) {
-				throw new IOException(String.format("Failed to create parent folder(s) '%s'", file.getAbsolutePath()));
-			}
-		}
 
 		// now create out stream
 		OutputStream os;

diff --git a/primitiveFTPd/src/org/primftpd/filesystem/MediaScannerClient.java b/primitiveFTPd/src/org/primftpd/filesystem/MediaScannerClient.java
@@ -57,7 +57,7 @@ public void scanFile(String path) {
             // Android 10 (API level 29) and lower: just requests the scan
             connection.scanFile(path, null);
         } catch (Exception e) {
-            logger.error("  media scanning start error for file '{}': '{}' ", e, path);
+            logger.error("  media scanning start error for file '{}': '{}'", path, e.getMessage());
         }
     }
 

diff --git a/primitiveFTPd/src/org/primftpd/filesystem/VirtualFileSystemView.java b/primitiveFTPd/src/org/primftpd/filesystem/VirtualFileSystemView.java
@@ -35,7 +35,7 @@ public VirtualFileSystemView(
     public abstract TMina createFile(String absPath, AbstractFile delegate);
     public abstract TMina createFile(String absPath, boolean exists);
 
-    public abstract AbstractFile getConfigFile();
+    public abstract VirtualConfigFile getConfigFile();
 
     protected abstract String absolute(String file);
 

diff --git a/primitiveFTPd/src/org/primftpd/filesystem/VirtualFtpFileSystemView.java b/primitiveFTPd/src/org/primftpd/filesystem/VirtualFtpFileSystemView.java
@@ -45,7 +45,7 @@ public FtpFile createFile(String absPath, boolean exists) {
     }
 
     @Override
-    public AbstractFile getConfigFile() {
+    public VirtualFtpConfigFile getConfigFile() {
         return new VirtualFtpConfigFile(this, user);
     }