Merge pull request #13895 from nextcloud/bugfix/auto-rename-capability-order

BugFix / AutoRename Capability Order

app/src/androidTest/java/com/nextcloud/utils/AutoRenameTests.kt

@@ -26,7 +26,16 @@ class AutoRenameTests : AbstractOnServerIT() {
         testOnlyOnServer(NextcloudVersion.nextcloud_30)
 
         capability = capability.apply {
-            forbiddenFilenameExtensionJson = """[" ",".",".part",".part"]"""
+            forbiddenFilenameExtensionJson = listOf(
+                """[" ",".",".part",".part"]""",
+                """[".",".part",".part"," "]""",
+                """[".",".part"," ", ".part"]""",
+                """[".part"," ", ".part","."]""",
+                """[" ",".",".PART",".PART"]""",
+                """[".",".PART",".PART"," "]""",
+                """[".",".PART"," ", ".PART"]""",
+                """[".PART"," ", ".PART","."]"""
+            ).random()
             forbiddenFilenameCharactersJson = """["<", ">", ":", "\\\\", "/", "|", "?", "*", "&"]"""
         }
     }

app/src/main/java/com/nextcloud/utils/autoRename/AutoRename.kt

@@ -28,40 +28,48 @@ object AutoRename {
         val pathSegments = filename.split(OCFile.PATH_SEPARATOR).toMutableList()
 
         capability.run {
-            forbiddenFilenameCharactersJson?.let {
+            if (forbiddenFilenameCharactersJson != null) {
                 var forbiddenFilenameCharacters = capability.forbiddenFilenameCharacters()
+
                 if (isFolderPath) {
                     forbiddenFilenameCharacters = forbiddenFilenameCharacters.filter { it != OCFile.PATH_SEPARATOR }
                 }
 
                 pathSegments.replaceAll { segment ->
                     var modifiedSegment = segment
+
                     forbiddenFilenameCharacters.forEach { forbiddenChar ->
                         if (modifiedSegment.contains(forbiddenChar)) {
                             modifiedSegment = modifiedSegment.replace(forbiddenChar, REPLACEMENT)
                         }
                     }
+
                     modifiedSegment
                 }
             }
 
-            forbiddenFilenameExtensionJson?.let {
-                forbiddenFilenameExtensions().forEach { forbiddenExtension ->
-                    pathSegments.replaceAll { segment ->
-                        var modifiedSegment = segment
-                        if (forbiddenExtension == StringConstants.SPACE) {
-                            modifiedSegment = modifiedSegment.trim()
-                        }
+            if (forbiddenFilenameExtensionJson != null) {
+                val forbiddenFilenameExtensions = forbiddenFilenameExtensions()
 
-                        if (modifiedSegment.endsWith(forbiddenExtension, ignoreCase = true) ||
-                            modifiedSegment.startsWith(forbiddenExtension, ignoreCase = true)
-                        ) {
-                            modifiedSegment = modifiedSegment.replace(forbiddenExtension, REPLACEMENT)
-                        }
+                forbiddenFilenameExtensions.find { it == StringConstants.SPACE }?.let {
+                    pathSegments.replaceAll { segment ->
+                        segment.trim()
+                    }
+                }
 
-                        modifiedSegment
+                forbiddenFilenameExtensions.find { it == StringConstants.DOT }?.let { forbiddenExtension ->
+                    pathSegments.replaceAll { segment ->
+                        replacePathSegment(forbiddenExtension, segment)
                     }
                 }
+
+                forbiddenFilenameExtensions
+                    .filter { it != StringConstants.SPACE && it != StringConstants.DOT }
+                    .forEach { forbiddenExtension ->
+                        pathSegments.replaceAll { segment ->
+                            replacePathSegment(forbiddenExtension, segment)
+                        }
+                    }
             }
         }
 
@@ -74,6 +82,16 @@ object AutoRename {
         }
     }
 
+    private fun replacePathSegment(forbiddenExtension: String, segment: String): String {
+        return if (segment.endsWith(forbiddenExtension, ignoreCase = true) ||
+            segment.startsWith(forbiddenExtension, ignoreCase = true)
+        ) {
+            segment.replace(forbiddenExtension, REPLACEMENT)
+        } else {
+            segment
+        }
+    }
+
     private fun convertToUTF8(filename: String): String {
         return String(filename.toByteArray(), Charsets.UTF_8)
     }