Skip to content

Commit

Permalink
#155: ImageDetailMetaDialogBuilder more diagnostic support: Exif-Info…
Browse files Browse the repository at this point in the history 
… from localDB and from contentProvider; Copy2Clipboard
  • Loading branch information
@k3b
k3b committed Apr 12, 2021
1 parent 626da66 commit 402accb
Show file tree
Hide file tree
Showing 11 changed files with 181 additions and 98 deletions.
2 changes: 1 addition & 1 deletion app/src/main/java/de/k3b/android/androFotoFinder/PhotoAutoprocessingEditActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -712,7 +712,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
return true;

case android.R.id.copy:
return ClipboardUtil.addDirToClipboard(this, mCurrentOutDir.getAbsolutePath());
return ClipboardUtil.addDirToClipboard(this, mCurrentOutDir.getAbsolutePath(), true);
case android.R.id.paste:
return onPaste();
default:
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/de/k3b/android/androFotoFinder/directory/DirectoryPickerFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ public void notifyPhotoChanged() {

private boolean onCopy(IDirectory selection) {
String path = (selection == null) ? null : selection.getAbsolute();
return ClipboardUtil.addDirToClipboard(this.getActivity(), path);
return ClipboardUtil.addDirToClipboard(this.getActivity(), path, true);
}

private boolean onEditApm(MenuItem menuItem, IDirectory selection) {
Expand Down
146 changes: 89 additions & 57 deletions ...rc/main/java/de/k3b/android/androFotoFinder/imagedetail/ImageDetailMetaDialogBuilder.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2015-2020 by k3b.
* Copyright (c) 2015-2021 by k3b.
*
* This file is part of AndroFotoFinder.
*
Expand All @@ -23,6 +23,7 @@
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.ContentValues;
import android.content.DialogInterface;
import android.net.Uri;
import android.widget.ScrollView;
import android.widget.TextView;
Expand All @@ -33,8 +34,11 @@
import java.util.Date;
import java.util.List;

import de.k3b.android.androFotoFinder.queries.MediaContentproviderRepositoryImpl;
import de.k3b.android.androFotoFinder.R;
import de.k3b.android.androFotoFinder.queries.FotoSql;
import de.k3b.android.androFotoFinder.queries.IMediaRepositoryApi;
import de.k3b.android.androFotoFinder.tagDB.TagSql;
import de.k3b.android.util.ClipboardUtil;
import de.k3b.android.widget.ActivityWithCallContext;
import de.k3b.database.QueryParameter;
import de.k3b.io.DateUtil;
Expand Down Expand Up @@ -76,13 +80,36 @@ public static Dialog createImageDetailDialog(Activity context, IFile file, Uri i
return createImageDetailDialog(context, fileId.toString(), result.toString());
}

public static Dialog createImageDetailDialog(Activity context, String title, String block, Object... moreBlocks) {
private static final String line = "------------------";

private static void appendQueryInfo(StringBuilder result, QueryParameter query, long offset) {
if (query != null) {
result.append(NL).append(line).append(NL);
result.append(NL).append("#").append(offset).append(": ").append(query.toSqlString()).append(NL).append(NL);
}
}

private static void append(StringBuilder result, String block) {
if (block != null) {
result.append(NL).append(line).append(NL);
result.append(NL).append(block).append(NL);
}
}

private static final String dateFields = (","
+ TagSql.SQL_COL_DATE_ADDED + ","
+ TagSql.SQL_COL_EXT_XMP_LAST_MODIFIED_DATE + ","
+ TagSql.SQL_COL_LAST_MODIFIED
+ ",").toLowerCase();

public static Dialog createImageDetailDialog(final Activity context, String title, String block, Object... moreBlocks) {
AlertDialog.Builder builder = new AlertDialog.Builder(context);
builder.setTitle(title);

ScrollView sv = new ScrollView(context);
sv.setVerticalScrollBarEnabled(true);
TextView view = new TextView(context);
final TextView view = new TextView(context);
view.setId(R.id.action_details);

StringBuilder result = new StringBuilder(block);
if ((moreBlocks != null) && (moreBlocks.length > 0)) {
Expand All @@ -106,61 +133,33 @@ public void onClick(DialogInterface dialog, int id) {
}
});*/

return builder.create();
}

private static void appendQueryInfo(StringBuilder result, QueryParameter query, long offset) {
if (query != null) {
result.append(NL).append(line).append(NL);
result.append(NL).append("#").append(offset).append(": ").append(query.toSqlString()).append(NL).append(NL);
}
}
builder.setNeutralButton(android.R.string.copy, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
ClipboardUtil.addDirToClipboard(context, view.getText(), false);
}
});

private static void append(StringBuilder result, String block) {
if (block != null) {
result.append(NL).append(line).append(NL);
result.append(NL).append(block).append(NL);
}
return builder.create();
}

private static final String dateFields = (","
+ TagSql.SQL_COL_DATE_ADDED + ","
+ TagSql.SQL_COL_EXT_XMP_LAST_MODIFIED_DATE + ","
+ TagSql.SQL_COL_LAST_MODIFIED
+ ",").toLowerCase();

private static void appendExifInfo(Activity context, StringBuilder result, IFile jpegFile, Uri imageUri, long currentImageId) {
try {
getExifInfo_android(context, result, jpegFile, imageUri);
appendExifInfoFromFile_android(context, result, jpegFile, imageUri);

addExif(context, result, jpegFile, imageUri);
appendExifFromFile_drewnoakes(context, result, jpegFile, imageUri);

if (jpegFile != null) {
// #84 show long and short xmp file
addXmp(result, XmpFile.getSidecar(jpegFile, true));
addXmp(result, XmpFile.getSidecar(jpegFile, false));
appendXmpFromFile(result, XmpFile.getSidecar(jpegFile, true));
appendXmpFromFile(result, XmpFile.getSidecar(jpegFile, false));
}

if (currentImageId != 0) {

ContentValues dbContent = MediaContentproviderRepositoryImpl.getDbContent(context, currentImageId);
if (dbContent != null) {
result.append(NL).append(line).append(NL);
result.append(NL).append(TagSql.SQL_TABLE_EXTERNAL_CONTENT_URI_FILE).append(NL).append(NL);
// sort by keys
List<String> sortedKeys = new ArrayList(dbContent.keySet());
Collections.sort(sortedKeys);
for (String key : sortedKeys) {
Object value = dbContent.get(key);
String sValue = (value != null) ? value.toString() : null;
if ((sValue != null) && (sValue.length() > 0) && (sValue.compareTo("0") != 0)) {
// show only non empty values
result.append(key).append("=").append(sValue);
appendDate(result, key, value);
result.append(NL);
}
}
}
if (currentImageId != 0 || jpegFile != null) {
String filePathOrNull = jpegFile != null ? jpegFile.getCanonicalPath() : null;
appendDbInfo(result, FotoSql.getMediaLocalDatabase(), currentImageId, filePathOrNull,
"LocalDatabase");
appendDbInfo(result, FotoSql.getMediaDBApi(), currentImageId, filePathOrNull,
TagSql.SQL_TABLE_EXTERNAL_CONTENT_URI_FILE_NAME);
}

} catch (IOException e) {
Expand Down Expand Up @@ -188,9 +187,34 @@ private static void appendDate(StringBuilder result, Object value, int factor) {
}
}

private static String line = "------------------";
private static void appendDbInfo(StringBuilder result, IMediaRepositoryApi api, long currentImageId, String filePathOrNull, String callContext) {
if (api != null) {
result.append(NL).append(line).append(NL);

String search = callContext + "(id=" + currentImageId + ", path='" + filePathOrNull + "')";
ContentValues dbContent = api.getDbContent(currentImageId, filePathOrNull);
if (dbContent != null) {
appendFileMessage(result, search, NL);
// sort by keys
List<String> sortedKeys = new ArrayList(dbContent.keySet());
Collections.sort(sortedKeys);
for (String key : sortedKeys) {
Object value = dbContent.get(key);
String sValue = (value != null) ? value.toString() : null;
if ((sValue != null) && (sValue.length() > 0) && (sValue.compareTo("0") != 0)) {
// show only non empty values
result.append(key).append("=").append(sValue);
appendDate(result, key, value);
result.append(NL);
}
}
} else {
appendFileNotFoundMessage(result, search);
}
}
}

private static void addExif(Activity context, StringBuilder builder, IFile file, Uri imageUri) throws IOException {
private static void appendExifFromFile_drewnoakes(Activity context, StringBuilder builder, IFile file, Uri imageUri) throws IOException {
PhotoPropertiesImageReader meta = null;
Object fileId = file;
if (file != null && file.exists()) {
Expand All @@ -206,28 +230,28 @@ private static void addExif(Activity context, StringBuilder builder, IFile file,
}

if (meta != null) {
builder.append(NL).append(fileId).append(NL).append(NL);
appendFileMessage(builder, fileId, NL);

builder.append(meta.toString());
builder.append(NL).append(line).append(NL);
} else {
builder.append(NL).append(fileId).append(" not found.").append(NL);
appendFileNotFoundMessage(builder, fileId);
}
}

private static void addXmp(StringBuilder builder, IFile file) throws IOException {
private static void appendXmpFromFile(StringBuilder builder, IFile file) throws IOException {
if (file.exists()) {
XmpSegment meta = new XmpSegment();
meta.load(file.openInputStream(), "ImageDetailMetaDialogBuilder");
builder.append(NL).append(file).append(NL).append(NL);
appendFileMessage(builder, file, NL);
meta.appendXmp(null, builder);
builder.append(NL).append(line).append(NL);
} else {
builder.append(NL).append(file).append(" not found.").append(NL);
appendFileNotFoundMessage(builder, file);
}
}

private static void getExifInfo_android(Activity context, StringBuilder builder, IFile filepath, Uri imageUri) throws IOException {
private static void appendExifInfoFromFile_android(Activity context, StringBuilder builder, IFile filepath, Uri imageUri) throws IOException {
Object fileId = filepath;
ExifInterfaceEx exif = null;
if (filepath != null && filepath.exists()) {
Expand All @@ -243,10 +267,18 @@ private static void getExifInfo_android(Activity context, StringBuilder builder,

if (exif != null) {
builder.append(NL).append(line).append(NL);
builder.append(NL).append(fileId).append(NL).append(NL);
appendFileMessage(builder, fileId, NL);
if (exif.isValidJpgExifFormat()) builder.append(exif.getDebugString(NL));

builder.append(NL).append(line).append(NL);
}
}

private static void appendFileNotFoundMessage(StringBuilder builder, Object file) {
appendFileMessage(builder, file, " not found.");
}

private static void appendFileMessage(StringBuilder builder, Object file, String message) {
builder.append(NL).append(file).append(message).append(NL);
}
}
8 changes: 7 additions & 1 deletion app/src/main/java/de/k3b/android/androFotoFinder/queries/IMediaRepositoryApi.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,13 @@ Long insertOrUpdateMediaDatabase(String dbgContext,
*/
int deleteMedia(String dbgContext, String where, String[] selectionArgs, boolean preventDeleteImageFile);

ContentValues getDbContent(long id);
/**
* get all column values belonging to id or filepath for debugging purpose
*
* @param idOrNull
* @param filePathOrNull
*/
ContentValues getDbContent(Long idOrNull, String filePathOrNull);

long getCurrentUpdateId();

Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/de/k3b/android/androFotoFinder/queries/MediaContentproviderRepository.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019-2020 by k3b.
* Copyright (c) 2019-2021 by k3b.
*
* This file is part of AndroFotoFinder / #APhotoManager.
*
Expand Down Expand Up @@ -182,8 +182,8 @@ public int deleteMedia(String dbgContext, String sqlWhere, String[] selectionArg
}

@Override
public ContentValues getDbContent(final long id) {
return MediaContentproviderRepositoryImpl.getDbContent(context, id);
public ContentValues getDbContent(final Long idOrNull, String filePathOrNull) {
return MediaContentproviderRepositoryImpl.getDbContent(context, idOrNull, filePathOrNull);
}

@Override
Expand Down
44 changes: 29 additions & 15 deletions .../main/java/de/k3b/android/androFotoFinder/queries/MediaContentproviderRepositoryImpl.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2015-2020 by k3b.
* Copyright (c) 2015-2021 by k3b.
*
* This file is part of AndroFotoFinder / #APhotoManager.
*
Expand Down Expand Up @@ -287,22 +287,36 @@ private static int _del_execRenameFolder_batch_not_working(Context context, Stri
return ops.size();
}

public static ContentValues getDbContent(Context context, final long id) {
ContentResolver resolver = context.getContentResolver();
public static ContentValues getDbContent(Context context, final Long idOrNull, String filePathOrNull) {
if (idOrNull != null || filePathOrNull != null) {
ContentResolver resolver = context.getContentResolver();

Cursor c = null;
try {
c = resolver.query(FotoSqlBase.SQL_TABLE_EXTERNAL_CONTENT_URI_FILE, new String[]{"*"}, FotoSql.FILTER_COL_PK, new String[]{"" + id}, null);
if (c.moveToNext()) {
ContentValues values = new ContentValues();
DatabaseUtils.cursorRowToContentValues(c, values);
return values;
Cursor c = null;
try {
String selection;
String[] selectionArgs;
if (filePathOrNull == null) {
selection = FotoSql.FILTER_COL_PK;
selectionArgs = new String[]{"" + idOrNull};
} else if (idOrNull == null) {
selection = FotoSql.FILTER_EXPR_PATH_LIKE;
selectionArgs = new String[]{filePathOrNull};
} else {
selection = FotoSql.FILTER_COL_PK + " or " + FotoSql.FILTER_EXPR_PATH_LIKE;
selectionArgs = new String[]{"" + idOrNull, filePathOrNull};
}
c = resolver.query(FotoSqlBase.SQL_TABLE_EXTERNAL_CONTENT_URI_FILE, new String[]{"*"}, selection, selectionArgs, null);
if (c.moveToNext()) {
ContentValues values = new ContentValues();
DatabaseUtils.cursorRowToContentValues(c, values);
return values;
}
} catch (Exception ex) {
Log.e(LOG_TAG, MODUL_NAME +
".getDbContent(id=" + idOrNull + ", path='" + filePathOrNull + "') failed", ex);
} finally {
if (c != null) c.close();
}
} catch (Exception ex) {
Log.e(LOG_TAG, MODUL_NAME +
".getDbContent(id=" + id + ") failed", ex);
} finally {
if (c != null) c.close();
}
return null;
}
Expand Down
42 changes: 28 additions & 14 deletions app/src/main/java/de/k3b/android/androFotoFinder/queries/MediaDBRepository.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,21 +207,35 @@ public int exexUpdateImpl(String dbgContext, ContentValues values, String sqlWhe
}

@Override
public ContentValues getDbContent(long id) {
Cursor c = null;
try {
c = this.createCursorForQuery(null, "getDbContent",
Impl.DATABASE_TABLE_NAME, FotoSql.FILTER_COL_PK, new String[]{"" + id}, null, null, "*");
if (c.moveToNext()) {
ContentValues values = new ContentValues();
DatabaseUtils.cursorRowToContentValues(c, values);
return values;
public ContentValues getDbContent(Long idOrNull, String filePathOrNull) {
if (idOrNull != null || filePathOrNull != null) {
Cursor c = null;
try {
String selection;
String[] selectionArgs;
if (filePathOrNull == null) {
selection = FotoSql.FILTER_COL_PK;
selectionArgs = new String[]{"" + idOrNull};
} else if (idOrNull == null) {
selection = FotoSql.FILTER_EXPR_PATH_LIKE;
selectionArgs = new String[]{filePathOrNull};
} else {
selection = FotoSql.FILTER_COL_PK + " or " + FotoSql.FILTER_EXPR_PATH_LIKE;
selectionArgs = new String[]{"" + idOrNull, filePathOrNull};
}
c = this.createCursorForQuery(null, "getDbContent",
Impl.DATABASE_TABLE_NAME, selection, selectionArgs, null, null, "*");
if (c.moveToNext()) {
ContentValues values = new ContentValues();
DatabaseUtils.cursorRowToContentValues(c, values);
return values;
}
} catch (Exception ex) {
Log.e(LOG_TAG, MODUL_NAME +
".getDbContent(id=" + idOrNull + ", path='" + filePathOrNull + "') failed", ex);
} finally {
if (c != null) c.close();
}
} catch (Exception ex) {
Log.e(LOG_TAG, MODUL_NAME +
".getDbContent(id=" + id + ") failed", ex);
} finally {
if (c != null) c.close();
}
return null;
}
Expand Down
Loading

0 comments on commit 402accb

Please sign in to comment.