mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use the new naming per the comments on #9931 

More details here: https://github.com/nextcloud/server/issues/9931#issuecomment-402318120

Signed-off-by: Ido Green <greenido@gmail.com>
This commit is contained in:
Ido Green 2018-10-02 10:59:42 -07:00 committed by Morris Jobke
parent c320f48599
commit 48d74482c1
No known key found for this signature in database
GPG Key ID: FE03C3A163FEDE68
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/files/js/filelist.js
View File

@ -2292,28 +2292,28 @@
let fileNumber = leftPartOfName.match(/\d+/); let fileNumber = leftPartOfName.match(/\d+/);
if (isNaN(fileNumber) ) { if (isNaN(fileNumber) ) {
fileNumber++; fileNumber++;
targetPathAndName = targetPathAndName.replace(/(?=\.[^.]+$)/g, "_" + fileNumber); targetPathAndName = targetPathAndName.replace(/(?=\.[^.]+$)/g, " (copy " + fileNumber + ")");
} }
else { else {
// check if we have other files with _x and the same name // check if we have other files with _x and the same name
let maxNum = 1; let maxNum = 1;
if (self.files !== null) { if (self.files !== null) {
leftPartOfName = leftPartOfName.replace("/", ""); leftPartOfName = leftPartOfName.replace("/", "");
leftPartOfName = leftPartOfName.replace(/_\d+/,""); leftPartOfName = leftPartOfName.replace(/\(copy \d+\)/,"");
// find the last file with the number extention and add one to the new name // find the last file with the number extention and add one to the new name
for (let j = 0; j < self.files.length; j++) { for (let j = 0; j < self.files.length; j++) {
const cName = self.files[j].name; const cName = self.files[j].name;
if (cName.indexOf(leftPartOfName) > -1) { if (cName.indexOf(leftPartOfName) > -1) {
let cFileNumber = cName.match(/_(\d+)/); let cFileNumber = cName.match(/\(copy (\d+)\)/);
if (cFileNumber && parseInt(cFileNumber[1]) >= maxNum) { if (cFileNumber && parseInt(cFileNumber[1]) >= maxNum) {
maxNum = parseInt(cFileNumber[1]) + 1; maxNum = parseInt(cFileNumber[1]) + 1;
} }
} }
} }
targetPathAndName = targetPathAndName.replace(/_\d+/,""); targetPathAndName = targetPathAndName.replace(/ \(copy \d+\)/,"");
} }
// Create the new file name with _x at the end // Create the new file name with _x at the end
targetPathAndName = targetPathAndName.replace(/(?=\.[^.]+$)/g, "_" + maxNum); targetPathAndName = targetPathAndName.replace(/(?=\.[^.]+$)/g, " (copy " + maxNum +")");
} }
} }
} }