Skip to content

Only trigger media scans for media files #5018

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
AndyScherzinger merged 1 commit into from
Dec 19, 2019
Merged

Only trigger media scans for media files #5018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ public void saveFolder(OCFile folder, Collection<OCFile> updatedFiles, Collectio

if (file.isDown()) {
String path = file.getStoragePath();
if (new File(path).delete()) {
if (new File(path).delete() && MimeTypeUtil.isMedia(file.getMimeType())) {
triggerMediaScan(path); // notify MediaScanner about removed file
}
}
Expand Down Expand Up @@ -702,8 +702,10 @@ public void moveLocalFile(OCFile file, String targetPath, String targetParentPat

cv.put(ProviderTableMeta.FILE_STORAGE_PATH, targetLocalPath);

originalPathsToTriggerMediaScan.add(child.getStoragePath());
newPathsToTriggerMediaScan.add(targetLocalPath);
if (MimeTypeUtil.isMedia(child.getMimeType())) {
originalPathsToTriggerMediaScan.add(child.getStoragePath());
newPathsToTriggerMediaScan.add(targetLocalPath);
}

}
if (child.getRemotePath().equals(file.getRemotePath())) {
Expand Down
5 changes: 4 additions & 1 deletion src/main/java/com/owncloud/android/files/services/FileDownloader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
import com.owncloud.android.ui.preview.PreviewImageActivity;
import com.owncloud.android.ui.preview.PreviewImageFragment;
import com.owncloud.android.utils.ErrorMessageAdapter;
import com.owncloud.android.utils.MimeTypeUtil;
import com.owncloud.android.utils.ThemeUtils;

import java.io.File;
Expand Down Expand Up @@ -504,7 +505,9 @@ private void saveDownloadedFile() {
file.setFileLength(new File(mCurrentDownload.getSavePath()).length());
file.setRemoteId(mCurrentDownload.getFile().getRemoteId());
mStorageManager.saveFile(file);
FileDataStorageManager.triggerMediaScan(file.getStoragePath());
if (MimeTypeUtil.isMedia(mCurrentDownload.getMimeType())) {
FileDataStorageManager.triggerMediaScan(file.getStoragePath());
}
mStorageManager.saveConflict(file, null);
}

Expand Down
7 changes: 5 additions & 2 deletions src/main/java/com/owncloud/android/operations/RemoveFileOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
import com.owncloud.android.lib.resources.files.RemoveFileRemoteOperation;
import com.owncloud.android.operations.common.SyncOperation;
import com.owncloud.android.utils.MimeTypeUtil;


/**
Expand Down Expand Up @@ -91,8 +92,10 @@ protected RemoteOperationResult run(OwnCloudClient client) {

fileToRemove = getStorageManager().getFileByPath(remotePath);

// store resized image
ThumbnailsCacheManager.generateResizedImage(fileToRemove);
if (MimeTypeUtil.isImage(fileToRemove.getMimeType())) {
// store resized image
ThumbnailsCacheManager.generateResizedImage(fileToRemove);
}

boolean localRemovalFailed = false;
if (!onlyLocalCopy) {
Expand Down
7 changes: 5 additions & 2 deletions src/main/java/com/owncloud/android/operations/RenameFileOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import com.owncloud.android.lib.resources.files.RenameFileRemoteOperation;
import com.owncloud.android.operations.common.SyncOperation;
import com.owncloud.android.utils.FileStorageUtils;
import com.owncloud.android.utils.MimeTypeUtil;

import java.io.File;
import java.io.IOException;
Expand Down Expand Up @@ -130,8 +131,10 @@ private void saveLocalFile() {

// notify MediaScanner about removed file
getStorageManager().deleteFileInMediaScan(oldPath);
// notify to scan about new file
FileDataStorageManager.triggerMediaScan(newPath);
// notify to scan about new file, if it is a media file
if (MimeTypeUtil.isMedia(file.getMimeType())) {
FileDataStorageManager.triggerMediaScan(newPath);
}
}
// else - NOTHING: the link to the local file is kept although the local name
// can't be updated
Expand Down
12 changes: 9 additions & 3 deletions src/main/java/com/owncloud/android/operations/UploadFileOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -967,7 +967,9 @@ private void handleSuccessfulUpload(File temporalFile, File expectedFile, File o
}
mFile.setStoragePath(expectedFile.getAbsolutePath());
saveUploadedFile(client);
FileDataStorageManager.triggerMediaScan(expectedFile.getAbsolutePath());
if (MimeTypeUtil.isMedia(mFile.getMimeType())) {
FileDataStorageManager.triggerMediaScan(expectedFile.getAbsolutePath());
}
break;

case FileUploader.LOCAL_BEHAVIOUR_MOVE:
Expand All @@ -982,7 +984,9 @@ private void handleSuccessfulUpload(File temporalFile, File expectedFile, File o
getStorageManager().deleteFileInMediaScan(originalFile.getAbsolutePath());
mFile.setStoragePath(newFile.getAbsolutePath());
saveUploadedFile(client);
FileDataStorageManager.triggerMediaScan(newFile.getAbsolutePath());
if (MimeTypeUtil.isMedia(mFile.getMimeType())) {
FileDataStorageManager.triggerMediaScan(newFile.getAbsolutePath());
}
break;
}
}
Expand Down Expand Up @@ -1324,7 +1328,9 @@ private void saveUploadedFile(OwnCloudClient client) {
getStorageManager().saveFile(file);
getStorageManager().saveConflict(file, null);

FileDataStorageManager.triggerMediaScan(file.getStoragePath());
if (MimeTypeUtil.isMedia(file.getMimeType())) {
FileDataStorageManager.triggerMediaScan(file.getStoragePath());
}

// generate new Thumbnail
final ThumbnailsCacheManager.ThumbnailGenerationTask task =
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/owncloud/android/utils/MimeTypeUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,10 @@ private static String getMimeTypeFromCandidates(List<String> candidates) {
return candidates.get(0);
}

public static boolean isMedia(String mimeType) {
return isImage(mimeType) || isVideo(mimeType) || isAudio(mimeType);
}

public static boolean isImageOrVideo(String mimeType) {
return isImage(mimeType) || isVideo(mimeType);
}
Expand Down