use odrcore magic

Author: andiwand

app/conandeployer.py

@@ -52,3 +52,12 @@ def deploy(graph, output_folder: str, **kwargs):
             f"{output_folder}/fontconfig",
             **copytree_kwargs,
         )
+
+    if "libmagic" in deps:
+        dep = deps["libmagic"]
+        conanfile.output.info(f"Deploying libmagic to {output_folder}")
+        shutil.copytree(
+            f"{dep.package_folder}/res",
+            f"{output_folder}/libmagic",
+            **copytree_kwargs,
+        )

app/conanfile.txt

@@ -1,5 +1,5 @@
 [requires]
-odrcore/5.0.7
+odrcore/5.1.0
 
 [generators]
 CMakeToolchain

app/src/main/cpp/core_wrapper.cpp

@@ -88,16 +88,29 @@ Java_at_tomtasche_reader_background_CoreWrapper_setGlobalParams(JNIEnv *env, jcl
     std::string fontconfigDataPath = getStringField(env, paramsClass, params, "fontconfigDataPath");
     std::string popplerDataPath = getStringField(env, paramsClass, params, "popplerDataPath");
     std::string pdf2htmlexDataPath = getStringField(env, paramsClass, params, "pdf2htmlexDataPath");
+    std::string libmagicDatabasePath = getStringField(env, paramsClass, params, "libmagicDatabasePath");
     std::string customTmpfilePath = getStringField(env, paramsClass, params, "customTmpfilePath");
 
     odr::GlobalParams::set_odr_core_data_path(odrCoreDataPath);
     odr::GlobalParams::set_fontconfig_data_path(fontconfigDataPath);
     odr::GlobalParams::set_poppler_data_path(popplerDataPath);
     odr::GlobalParams::set_pdf2htmlex_data_path(pdf2htmlexDataPath);
+    odr::GlobalParams::set_libmagic_database_path(libmagicDatabasePath);
 
     tmpfile_hack::set_tmpfile_directory(customTmpfilePath);
 }
 
+JNIEXPORT jstring JNICALL
+Java_at_tomtasche_reader_background_CoreWrapper_mimetypeNative(JNIEnv *env, jclass clazz, jstring path) {
+    auto logger = std::make_shared<AndroidLogger>();
+
+    std::string pathCpp = convertString(env, path);
+    std::string mimetypeCpp = std::string(odr::mimetype(pathCpp));
+    jstring mimetype = env->NewStringUTF(mimetypeCpp.c_str());
+
+    return mimetype;
+}
+
 JNIEXPORT jobject JNICALL
 Java_at_tomtasche_reader_background_CoreWrapper_parseNative(JNIEnv *env, jclass clazz,
                                                             jobject options) {

app/src/main/cpp/core_wrapper.hpp

@@ -8,6 +8,10 @@ JNIEXPORT void JNICALL
 Java_at_tomtasche_reader_background_CoreWrapper_setGlobalParams(JNIEnv *env, jclass clazz,
                                                                 jobject params);
 
+JNIEXPORT jstring JNICALL
+Java_at_tomtasche_reader_background_CoreWrapper_mimetypeNative(JNIEnv *env, jclass clazz,
+                                                               jstring path);
+
 JNIEXPORT jobject JNICALL
 Java_at_tomtasche_reader_background_CoreWrapper_parseNative(JNIEnv *env, jclass clazz,
                                                             jobject options);

app/src/main/java/at/tomtasche/reader/background/CoreWrapper.java

@@ -18,6 +18,8 @@ public static class GlobalParams {
         public String fontconfigDataPath;
         public String popplerDataPath;
         public String pdf2htmlexDataPath;
+        public String libmagicDatabasePath;
+
         public String customTmpfilePath;
     }
 
@@ -29,23 +31,32 @@ public static void initialize(Context context) {
         File fontconfigDataDirectory = new File(assetsDirectory, "fontconfig");
         File popplerDataDirectory = new File(assetsDirectory, "poppler");
         File pdf2htmlexDataDirectory = new File(assetsDirectory, "pdf2htmlex");
+        File libmagicDataDirectory = new File(assetsDirectory, "libmagic");
 
         AssetExtractor ae = new AssetExtractor(context.getAssets());
         ae.setOverwrite();
         ae.extract(assetsDirectory, "core/odrcore");
         ae.extract(assetsDirectory, "core/fontconfig");
         ae.extract(assetsDirectory, "core/poppler");
         ae.extract(assetsDirectory, "core/pdf2htmlex");
+        ae.extract(assetsDirectory, "core/libmagic");
 
         CoreWrapper.GlobalParams globalParams = new CoreWrapper.GlobalParams();
         globalParams.coreDataPath = odrCoreDataDirectory.getAbsolutePath();
         globalParams.fontconfigDataPath = fontconfigDataDirectory.getAbsolutePath();
         globalParams.popplerDataPath = popplerDataDirectory.getAbsolutePath();
         globalParams.pdf2htmlexDataPath = pdf2htmlexDataDirectory.getAbsolutePath();
+        globalParams.libmagicDatabasePath = new File(libmagicDataDirectory, "magic.mgc").getAbsolutePath();
         globalParams.customTmpfilePath = context.getCacheDir().getAbsolutePath();
         CoreWrapper.setGlobalParams(globalParams);
     }
 
+    public static String mimetype(String path) {
+        return mimetypeNative(path);
+    }
+
+    private static native String mimetypeNative(String path);
+
     public static class CoreOptions {
         public boolean ooxml;
         public boolean txt;

app/src/main/java/at/tomtasche/reader/background/MetadataLoader.java

@@ -89,8 +89,7 @@ public void loadSync(Options options) {
 
             String mimetype = null;
             try {
-                // todo core get mimetype
-                //type = MagicApi.magicFile(cachedFile.getAbsolutePath());
+                mimetype = CoreWrapper.mimetype(cachedFile.getAbsolutePath());
             } catch (Throwable e) {
                 crashManager.log(e);
             }