Skip to content

Avoid duplicate files in google with the same name #4416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 3 commits into from
Apr 26, 2017
Merged

Avoid duplicate files in google with the same name #4416

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
888dfdf
avoid duplicate files in google with the same name
gvmura Apr 21, 2017
0d063c3
avoid duplicate files in google with the same name
gvmura Apr 21, 2017
8613678
Merge branch 'avoid-duplicate-files-google' of https://github.com/gvm…
gvmura Apr 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
avoid duplicate files in google with the same name 
Signed-off-by: gvmura <[email protected]>
  • Loading branch information
@gvmura
gvmura committed Apr 21, 2017
commit 0d063c316a18ce8a8c77948dcc6a6ae32452d758
13 changes: 13 additions & 0 deletions apps/files_external/lib/Lib/Storage/Google.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,19 @@ public function unlink($path) {
}

public function rename($path1, $path2) {
// Avoid duplicate files with the same name
$testRegex = '/^.+\.ocTransferId\d+\.part$/';
if (preg_match($testRegex, $path1)) {
if ($this->is_file($path2)) {
$testFile2 = $this->getDriveFile($path2);
if ($testFile2) {
$this->service->files->trash($testFile2->getId());
\OCP\Util::writeLog('files_external', 'trash file '.$path2.
' for renaming '.$path1.' on Google Drive.', \OCP\Util::DEBUG);
}
}
}

$file = $this->getDriveFile($path1);
if ($file) {
$newFile = $this->getDriveFile($path2);
Expand Down