* Created by k3b on 03.08.2015.
*/
-public class AndroidFileCommands extends FileCommands {
+public class AndroidFileCommands extends AndroidFileCommandsDbImpl {
private static final String SETTINGS_KEY_LAST_COPY_TO_PATH = "last_copy_to_path";
private static final String mDebugPrefix = "AndroidFileCommands.";
private boolean isInBackground = false;
diff --git a/app/src/main/java/de/k3b/android/io/AndroidFileCommandsDbImpl.java b/app/src/main/java/de/k3b/android/io/AndroidFileCommandsDbImpl.java
new file mode 100644
index 00000000..f0dc49d8
--- /dev/null
+++ b/app/src/main/java/de/k3b/android/io/AndroidFileCommandsDbImpl.java
@@ -0,0 +1,138 @@
+/*
+ * Copyright (c) 2015-2020 by k3b.
+ *
+ * This file is part of AndroFotoFinder / #APhotoManager.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see
+ * Created by k3b on 03.08.2015. + */ +public class AndroidFileCommandsDbImpl extends FileCommands { + /** + * copies a file from the sourceFullPath path to the target path. + * Android specific: also updates database. + * + * @param sourceFullPath the path of the file that shall be copied including the file name with ending + * @param targetFullPath the path of the file that shall be written to with filename + */ + @Override + protected boolean osFileCopy(IFile targetFullPath, IFile sourceFullPath) { + //!!! TODO muss noch getestet werden + final String srcPath = sourceFullPath.getAbsolutePath(); + String toPath = null; + boolean dbSuccess = false; + if (PhotoPropertiesUtil.isImage(srcPath, PhotoPropertiesUtil.IMG_TYPE_ALL)) { + toPath = new File(targetFullPath.getFile(), targetFullPath.getName()).getAbsolutePath(); + dbSuccess = (null != copyInDatabase("osFileCopy", srcPath, toPath)); + } + + if (dbSuccess) { + dbSuccess = super.osFileCopy(targetFullPath, sourceFullPath); + } + return dbSuccess; + } + + /** + * Moves a file from the sourceFullPath path to the target path. + * Android specific: also updates database. + * + * @param sourceFullPath the path of the file that shall be copied including the file name with ending + * @param targetFullPath the path of the file that shall be written to with filename + */ + @Override + protected boolean osFileMove(IFile targetFullPath, IFile sourceFullPath) { + final String srcPath = sourceFullPath.getAbsolutePath(); + String toPath = null; + boolean dbSuccess = false; + // Database update must be done before super.osFileMove to avoid deleting/recreating old file entry + if (PhotoPropertiesUtil.isImage(srcPath, PhotoPropertiesUtil.IMG_TYPE_ALL)) { + toPath = new File(targetFullPath.getFile(), targetFullPath.getName()).getAbsolutePath(); + dbSuccess = renameInDatabase("osFileMove", srcPath, toPath); + } + final boolean osSuccess = super.osFileMove(targetFullPath, sourceFullPath); + if (!osSuccess && dbSuccess) { + // os falled. Rollback + renameInDatabase("osFileMove-rollback", toPath, srcPath); + } + return osSuccess; + } + + /** + * Renames a file from the sourceFullPath path to the target path. + * Android specific: also updates database. + * + * @param sourceFullPath the path of the file that shall be copied including the file name with ending + * @param targetFullPath the path of the file that shall be written to with filename + */ + @Override + protected boolean osRenameTo(IFile targetFullPath, IFile sourceFullPath) { + final String srcPath = sourceFullPath.getAbsolutePath(); + String toPath = null; + boolean dbSuccess = false; + if (PhotoPropertiesUtil.isImage(srcPath, PhotoPropertiesUtil.IMG_TYPE_ALL)) { + toPath = targetFullPath.getAbsolutePath(); + dbSuccess = renameInDatabase("osRenameTo", srcPath, toPath); + } + final boolean osSuccess = super.osRenameTo(targetFullPath, sourceFullPath); + if (!osSuccess && dbSuccess) { + // os falled. Rollback + renameInDatabase("osRenameTo-rollback", toPath, srcPath); + } + return osSuccess; + } + + @Override + protected boolean osDeleteFile(IFile file) { + return super.osDeleteFile(file); + } + + private boolean renameInDatabase(String dbgContext, String fromPath, String toPath) { + ContentValues values = new ContentValues(); + values.put(FotoSql.SQL_COL_PATH, toPath); + final int execResultCount = FotoSql.getMediaDBApi(). + execUpdate(this.getClass().getSimpleName() + dbgContext, fromPath, values, null); + + return 1 == execResultCount; + } + + private Uri copyInDatabase(String dbgContext, String fromPath, String toPath) { + ContentValues values = MediaDBRepository.getContentValues(fromPath, null, dbgContext); + if (values != null) { + values.put(FotoSql.SQL_COL_PATH, toPath); + return FotoSql.getMediaDBApi(). + execInsert(this.getClass().getSimpleName() + dbgContext, values); + } + return null; + } + +} + diff --git a/fotolib2/src/main/java/de/k3b/io/FileCommands.java b/fotolib2/src/main/java/de/k3b/io/FileCommands.java index 5e23025e..ccd56151 100644 --- a/fotolib2/src/main/java/de/k3b/io/FileCommands.java +++ b/fotolib2/src/main/java/de/k3b/io/FileCommands.java @@ -127,11 +127,10 @@ protected boolean canProcessFile(int opCode) { } /** - * * @param sourceFullPath the path of the file that shall be copied including the file name with ending - * @param targetFullPath the path of the file that shall be written to without filename - * - * Copies a file from the sourceFullPath path to the target path. + * @param targetFullPath the path of the file that shall be written to with filename + *
+ * Copies a file from the sourceFullPath path to the target path. */ private static boolean _osFileCopy(IFile targetFullPath, IFile sourceFullPath, FileCommands owner) { boolean result = true; @@ -454,22 +453,25 @@ protected int moveOrCopyFiles(final boolean move, String what, PhotoPropertiesDi /** * executes os specific move or copy operation and updates the list of modified files + * + * @param sourceFullPath the path of the file that shall be copied including the file name with ending + * @param targetFullPath the path of the file that shall be written to with filename */ - protected boolean osFileMoveOrCopy(boolean move, IFile dest, IFile source) { + protected boolean osFileMoveOrCopy(boolean move, IFile targetFullPath, IFile sourceFullPath) { boolean result = false; - long fileTime = source.lastModified(); + long fileTime = sourceFullPath.lastModified(); if (move) { - result = osFileMove(dest, source); + result = osFileMove(targetFullPath, sourceFullPath); } else { - result = osFileCopy(dest, source); + result = osFileCopy(targetFullPath, sourceFullPath); } - if (dest.lastModified() != fileTime) { - dest.setLastModified(fileTime); + if (targetFullPath.lastModified() != fileTime) { + targetFullPath.setLastModified(fileTime); } if (result) { - addProcessedFiles(move, dest, source); + addProcessedFiles(move, targetFullPath, sourceFullPath); } return result; @@ -484,35 +486,38 @@ private void addProcessedFiles(boolean move, IFile dest, IFile source) { /** * can be replaced by mock/stub in unittests + * + * @param sourceFullPath the path of the file that shall be copied including the file name with ending + * @param targetFullPath the path of the file that shall be written to with filename */ - protected boolean osFileMove(IFile dest, IFile source) { - if (osRenameTo(dest, source)) { + protected boolean osFileMove(IFile targetFullPath, IFile sourceFullPath) { + if (osRenameTo(targetFullPath, sourceFullPath)) { // move within same mountpoint if (LibGlobal.debugEnabledJpg) { - logger.info("osFileMove(rename) '" + source - + "' => '" + dest + "'"); + logger.info("osFileMove(rename) '" + sourceFullPath + + "' => '" + targetFullPath + "'"); } return true; } // #61 cannot move between different mountpoints/devices/partitions. do Copy+Delete instead - if (osFileExists(source) && source.isFile() && source.canRead() - && source.canWrite() // to delete after success - && !osFileExists(dest) - && osFileCopy(dest, source)) { - if (osDeleteFile(source)) { + if (osFileExists(sourceFullPath) && sourceFullPath.isFile() && sourceFullPath.canRead() + && sourceFullPath.canWrite() // to delete after success + && !osFileExists(targetFullPath) + && osFileCopy(targetFullPath, sourceFullPath)) { + if (osDeleteFile(sourceFullPath)) { if (LibGlobal.debugEnabledJpg) { - logger.info("osFileMove(copy+delete) '" + source - + "' => '" + dest + "'"); + logger.info("osFileMove(copy+delete) '" + sourceFullPath + + "' => '" + targetFullPath + "'"); } - return true; // move: copy + delete(source) : success + return true; // move: copy + delete(sourceFullPath) : success } else { // cannot delete souce: undo copy if (LibGlobal.debugEnabledJpg) { - logger.info("osFileMove failed for '" + source - + "' => '" + dest + "'"); + logger.info("osFileMove failed for '" + sourceFullPath + + "' => '" + targetFullPath + "'"); } - osDeleteFile(dest); + osDeleteFile(targetFullPath); } } return false; @@ -530,11 +535,10 @@ protected boolean osRenameTo(IFile dest, IFile source) { } /** + * Copies a file from the sourceFullPath path to the target path. * * @param sourceFullPath the path of the file that shall be copied including the file name with ending - * @param targetFullPath the path of the file that shall be written to without filename - * - * Copies a file from the sourceFullPath path to the target path. + * @param targetFullPath the path of the file that shall be written to with filename */ protected boolean osFileCopy(IFile targetFullPath, IFile sourceFullPath) { return _osFileCopy(targetFullPath, sourceFullPath, this); diff --git a/fotolib2/src/main/java/de/k3b/media/ExifInterface.java b/fotolib2/src/main/java/de/k3b/media/ExifInterface.java index c34b3bb9..979860c1 100644 --- a/fotolib2/src/main/java/de/k3b/media/ExifInterface.java +++ b/fotolib2/src/main/java/de/k3b/media/ExifInterface.java @@ -1174,20 +1174,23 @@ public String getDebugString(String lineDelimiter, String... _keysToExclude) { * and make a single call rather than multiple calls for each attribute. */ public void saveAttributes() throws IOException { - saveAttributes(mExifFile, mExifFile, true); + saveAttributes(mExifFile, mExifFile, true, null); } /** * Old File based implementation. * - * @deprecated use {@link #saveAttributes(IFile, IFile, boolean)} instead + * @deprecated use {@link #saveAttributes(IFile, IFile, boolean, Boolean)} instead */ @Deprecated public void saveAttributes(File inFile, File outFile, boolean deleteInFileOnFinish) throws IOException { - saveAttributes(FileFacade.convert("ExifInterface.saveAttributes in", inFile), FileFacade.convert("ExifInterface.saveAttributes out", outFile), deleteInFileOnFinish); + saveAttributes(FileFacade.convert("ExifInterface.saveAttributes in", inFile), + FileFacade.convert("ExifInterface.saveAttributes out", outFile), + deleteInFileOnFinish, null); } - public void saveAttributes(IFile inFile, IFile outFile, boolean deleteInFileOnFinish) throws IOException { + public void saveAttributes(IFile inFile, IFile outFile, + boolean deleteInFileOnFinish, Boolean hasXmp) throws IOException { String debugContext = String.format("%s.saveAttributes(%s=>%s,deleteInFileOnFinish=%s)", this.getClass().getSimpleName(), inFile, outFile, deleteInFileOnFinish); IFile currentOutFile = outFile; fixAttributes(); @@ -1284,7 +1287,7 @@ public byte[] getThumbnail() { } /** - * @deprecated use {@link #saveAttributes(IFile, IFile, boolean)} instead + * @deprecated use {@link #getThumbnail(IFile)} instead */ @Deprecated public byte[] getThumbnail(File inFile) { diff --git a/fotolib2/src/main/java/de/k3b/media/ExifInterfaceEx.java b/fotolib2/src/main/java/de/k3b/media/ExifInterfaceEx.java index 3ecdae38..ac3d9467 100644 --- a/fotolib2/src/main/java/de/k3b/media/ExifInterfaceEx.java +++ b/fotolib2/src/main/java/de/k3b/media/ExifInterfaceEx.java @@ -169,9 +169,9 @@ public static int getOrientationId(IFile fullPath) { } @Override - public void saveAttributes(IFile inFile, IFile outFile, boolean deleteInFileOnFinish) throws IOException { + public void saveAttributes(IFile inFile, IFile outFile, boolean deleteInFileOnFinish, Boolean hasXmp) throws IOException { fixDateTakenIfNeccessary(inFile); - super.saveAttributes(inFile, outFile, deleteInFileOnFinish); + super.saveAttributes(inFile, outFile, deleteInFileOnFinish, hasXmp); setFilelastModified(outFile); } diff --git a/fotolib2/src/main/java/de/k3b/media/PhotoPropertiesUpdateHandler.java b/fotolib2/src/main/java/de/k3b/media/PhotoPropertiesUpdateHandler.java index 42c8eaab..7d311baa 100644 --- a/fotolib2/src/main/java/de/k3b/media/PhotoPropertiesUpdateHandler.java +++ b/fotolib2/src/main/java/de/k3b/media/PhotoPropertiesUpdateHandler.java @@ -278,7 +278,8 @@ private int transferExif(String dbg_context) throws IOException { exif.saveAttributes( inJpgFullPath, outJpgFullPath, - this.deleteOriginalAfterFinish); + this.deleteOriginalAfterFinish, + this.xmp != null); } else if (!isSameFile) { // changes are NOT written to exif. Do File copy instead. FileUtils.copyReplace(inJpgFullPath, outJpgFullPath, this.deleteOriginalAfterFinish, dbg_context + "-transferExif");