subs: try to get select subs to work on smb but after fix still getti…

…ng exception in rename
nova-video-player · Jun 16, 2024 · df696e1 · df696e1
1 parent 8365c02
commit df696e1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/com/archos/filecorelibrary/jcifs/JcifsFileEditor.java b/src/com/archos/filecorelibrary/jcifs/JcifsFileEditor.java
@@ -93,7 +93,8 @@ public boolean rename(String newName) {
         try {
             SmbFile from = getSmbFile(mUri).smbFile;
             if (from != null) {
-                SmbFile to = getSmbFile(Uri.parse(from.getParent() + "/" + newName)).smbFile;
+                SmbFile to = getSmbFile(Uri.parse(from.getParent() + newName)).smbFile;
+                log.debug("rename: " + from + " to " + to);
                 if (to != null) {
                     from.renameTo(to);
                     return true;

diff --git a/src/com/archos/filecorelibrary/smbj/SmbjFileEditor.java b/src/com/archos/filecorelibrary/smbj/SmbjFileEditor.java
@@ -138,9 +138,15 @@ public Boolean delete() throws Exception {
     public boolean rename(String newName) {
         String mFilePath = getFilePath(mUri);
         try {
-            File from = SmbjUtils.peekInstance().getSmbShare(mUri).openFile(mFilePath, EnumSet.of(AccessMask.GENERIC_ALL), null, SMB2ShareAccess.ALL, SMB2CreateDisposition.FILE_OPEN, null);
+            File from = SmbjUtils.peekInstance().getSmbShare(mUri).openFile(mFilePath,
+                    EnumSet.of(AccessMask.FILE_READ_DATA),
+                    EnumSet.of(FileAttributes.FILE_ATTRIBUTE_READONLY),
+                    EnumSet.of(SMB2ShareAccess.FILE_SHARE_READ),
+                    SMB2CreateDisposition.FILE_OPEN,
+                    EnumSet.of(SMB2CreateOptions.FILE_RANDOM_ACCESS));
+            log.debug("rename: mFilePath=" + mFilePath + " -> " + getParentDirectoryPath(mFilePath) + newName);
             if (from != null) {
-                from.rename(getParentDirectoryPath(mFilePath) + "/" + newName);
+                from.rename(getParentDirectoryPath(mFilePath) + newName);
                 return true;
             }
         } catch (IOException e) {

diff --git a/src/com/archos/filecorelibrary/sshj/SshjFileEditor.java b/src/com/archos/filecorelibrary/sshj/SshjFileEditor.java
@@ -162,7 +162,7 @@ public boolean rename(String newName) {
         try {
             final String mFilePath = getSftpPath(mUri);
             final SFTPClient sftpClient = SshjUtils.peekInstance().getSFTPClient(mUri);
-            sftpClient.rename(getSftpPath(mUri), getParentDirectoryPath(mFilePath) + "/" + newName);
+            sftpClient.rename(getSftpPath(mUri), getParentDirectoryPath(mFilePath) + newName);
             return true;
         } catch (IOException e) {
             caughtException(e, "SshjFileEditor:rename", "IOException" + mUri);