Fabio/Auxio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

musikr.metadata: wrap exceptions into log

Browse source 
Not ideal, but avoids a total catastrophic crash on failed metadata
extractions.
This commit is contained in:
Alexander Capehart 2024-12-23 16:48:32 -05:00
parent b6bc065a4a
commit c379174ffe
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
1 changed files with 39 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
musikr/src/main/cpp/taglib_jni.cpp
View file

@ -18,9 +18,9 @@
#include <jni.h> #include <jni.h>
#include <string> #include <string>
#include "JVMInputStream.h" #include "JVMInputStream.h"
#include "JVMMetadataBuilder.h" #include "JVMMetadataBuilder.h"
#include "log.h"
#include "taglib/fileref.h" #include "taglib/fileref.h"
#include "taglib/flacfile.h" #include "taglib/flacfile.h"
@ -34,6 +34,7 @@ extern "C" JNIEXPORT jobject JNICALL
Java_org_oxycblt_musikr_metadata_TagLibJNI_openNative(JNIEnv *env, Java_org_oxycblt_musikr_metadata_TagLibJNI_openNative(JNIEnv *env,
jobject /* this */, jobject /* this */,
jobject inputStream) { jobject inputStream) {
try {
JVMInputStream stream {env, inputStream}; JVMInputStream stream {env, inputStream};
TagLib::FileRef fileRef {&stream}; TagLib::FileRef fileRef {&stream};
if (fileRef.isNull()) { if (fileRef.isNull()) {
@ -69,6 +70,10 @@ Java_org_oxycblt_musikr_metadata_TagLibJNI_openNative(JNIEnv *env,
builder.setProperties(file->audioProperties()); builder.setProperties(file->audioProperties());
builder.setCover(file->tag()->complexProperties("PICTURE")); builder.setCover(file->tag()->complexProperties("PICTURE"));
return builder.build(); return builder.build();
} catch (std::runtime_error e) {
LOGE("Error opening file: %s", e.what());
return nullptr;
}
} }