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

Merge pull request #22405 from owncloud/gdrive-mimetype-and-office-fixes 

Fix GDrive handling of office files
This commit is contained in:
Thomas Müller 2016-02-19 09:13:35 +01:00
parent f6e61a296f 075dd54f6c
commit ae2304f23f
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
apps/files_external/lib/google.php
View File

@ -264,7 +264,7 @@ class Google extends \OC\Files\Storage\Common {
foreach ($children->getItems() as $child) { foreach ($children->getItems() as $child) {
$name = $child->getTitle(); $name = $child->getTitle();
// Check if this is a Google Doc i.e. no extension in name // Check if this is a Google Doc i.e. no extension in name
if ($child->getFileExtension() === '' if (empty($child->getFileExtension())
&& $child->getMimeType() !== self::FOLDER && $child->getMimeType() !== self::FOLDER
) { ) {
$name .= '.'.$this->getGoogleDocExtension($child->getMimeType()); $name .= '.'.$this->getGoogleDocExtension($child->getMimeType());
@ -368,8 +368,14 @@ class Google extends \OC\Files\Storage\Common {
public function rename($path1, $path2) { public function rename($path1, $path2) {
$file = $this->getDriveFile($path1); $file = $this->getDriveFile($path1);
if ($file) { if ($file) {
$newFile = $this->getDriveFile($path2);
if (dirname($path1) === dirname($path2)) { if (dirname($path1) === dirname($path2)) {
$file->setTitle(basename(($path2))); if ($newFile) {
// rename to the name of the target file, could be an office file without extension
$file->setTitle($newFile->getTitle());
} else {
$file->setTitle(basename(($path2)));
}
} else { } else {
// Change file parent // Change file parent
$parentFolder2 = $this->getDriveFile(dirname($path2)); $parentFolder2 = $this->getDriveFile(dirname($path2));
@ -394,8 +400,11 @@ class Google extends \OC\Files\Storage\Common {
if ($result) { if ($result) {
$this->setDriveFile($path1, false); $this->setDriveFile($path1, false);
$this->setDriveFile($path2, $result); $this->setDriveFile($path2, $result);
if ($oldfile) { if ($oldfile && $newFile) {
$this->service->files->delete($oldfile->getId()); // only delete if they have a different id (same id can happen for part files)
if ($newFile->getId() !== $oldfile->getId()) {
$this->service->files->delete($oldfile->getId());
}
} }
} }
return (bool)$result; return (bool)$result;