handle presentations and spreadsheets

Author: andiwand

app/conanfile.txt

@@ -1,5 +1,5 @@
 [requires]
-odrcore/5.0.0-pre4
+odrcore/5.0.0-pre5
 
 [generators]
 CMakeToolchain

app/src/main/cpp/CoreWrapper.cpp

@@ -276,10 +276,25 @@ Java_at_tomtasche_reader_background_CoreWrapper_createServer(JNIEnv *env, jclass
     s_server = odr::HttpServer(config);
 }
 
-JNIEXPORT void JNICALL
+JNIEXPORT jobject JNICALL
 Java_at_tomtasche_reader_background_CoreWrapper_hostFile(JNIEnv *env, jclass clazz, jstring prefix, jobject options) {
     __android_log_print(ANDROID_LOG_INFO, "smn", "host file");
 
+    jclass resultClass = env->FindClass("at/tomtasche/reader/background/CoreWrapper$CoreResult");
+    jmethodID resultConstructor = env->GetMethodID(resultClass, "<init>", "()V");
+    jobject result = env->NewObject(resultClass, resultConstructor);
+
+    jfieldID errorField = env->GetFieldID(resultClass, "errorCode", "I");
+
+    jclass listClass = env->FindClass("java/util/List");
+    jmethodID addMethod = env->GetMethodID(listClass, "add", "(Ljava/lang/Object;)Z");
+
+    jfieldID pageNamesField = env->GetFieldID(resultClass, "pageNames", "Ljava/util/List;");
+    auto pageNames = (jobject) env->GetObjectField(result, pageNamesField);
+
+    jfieldID pagePathsField = env->GetFieldID(resultClass, "pagePaths", "Ljava/util/List;");
+    auto pagePaths = (jobject) env->GetObjectField(result, pagePathsField);
+
     std::string inputPathCpp = getStringField(env, options, "inputPath");
     std::string prefixCpp = convertString(env, prefix);
 
@@ -292,12 +307,29 @@ Java_at_tomtasche_reader_background_CoreWrapper_hostFile(JNIEnv *env, jclass cla
     htmlConfig.embed_shipped_resources = false;
 
     try {
-        s_server->serve_file(file, prefixCpp, odr::HtmlConfig());
+        odr::HtmlViews htmlViews = s_server->serve_file(file, prefixCpp, odr::HtmlConfig());
+
+        for (const auto &view: htmlViews) {
+            if (file.is_document_file() &&
+                file.document_file().document_type() != odr::DocumentType::text &&
+                view.name() == "document") {
+                continue;
+            }
+
+            jstring pageName = env->NewStringUTF(view.name().c_str());
+            env->CallBooleanMethod(pageNames, addMethod, pageName);
+
+            std::string pagePathCpp = "http://localhost:29665/file/" + prefixCpp + "/" + view.path();
+            jstring pagePath = env->NewStringUTF(pagePathCpp.c_str());
+            env->CallBooleanMethod(pagePaths, addMethod, pagePath);
+        }
     } catch (const std::exception &e) {
         __android_log_print(ANDROID_LOG_ERROR, "smn", "Unhandled C++ exception: %s", e.what());
     } catch (...) {
         __android_log_print(ANDROID_LOG_ERROR, "smn", "Unhandled C++ exception without further information");
     }
+
+    return result;
 }
 
 JNIEXPORT void JNICALL

app/src/main/cpp/CoreWrapper.hpp

@@ -21,7 +21,7 @@ extern "C" {
     JNIEXPORT void JNICALL
     Java_at_tomtasche_reader_background_CoreWrapper_createServer(JNIEnv *env, jclass clazz, jstring outputPath);
 
-    JNIEXPORT void JNICALL
+    JNIEXPORT jobject JNICALL
     Java_at_tomtasche_reader_background_CoreWrapper_hostFile(JNIEnv *env, jclass clazz, jstring prefix, jobject options);
 
     JNIEXPORT void JNICALL

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

@@ -122,41 +122,44 @@ private void translate(Options options, Result result) throws Exception {
         lastCoreOptions = coreOptions;
 
         if (doHttp) {
-            String prefix = "odr";
-            CoreWrapper.hostFile(prefix, coreOptions);
+            CoreWrapper.CoreResult coreResult = CoreWrapper.hostFile("odr", coreOptions);
 
-            result.partTitles.add("document");
-            result.partUris.add(Uri.parse("http://localhost:29665/file/" + prefix + "/document.html"));
-
-            return;
-        }
-
-        CoreWrapper.CoreResult coreResult = lastCore.parse(coreOptions);
-
-        String coreExtension = coreResult.extension;
-        if (coreResult.exception == null && "pdf".equals(coreExtension)) {
-            // some PDFs do not cause an error in the core
-            // https://github.com/opendocument-app/OpenDocument.droid/issues/348#issuecomment-2446888981
-            throw new CoreWrapper.CoreCouldNotTranslateException();
-        } else if (!"unnamed".equals(coreExtension)) {
-            // "unnamed" refers to default of Meta::typeToString
-            options.fileExtension = coreExtension;
+            if (coreResult.exception != null) {
+                throw coreResult.exception;
+            }
 
-            String fileType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(coreExtension);
-            if (fileType != null) {
-                options.fileType = fileType;
+            for (int i = 0; i < coreResult.pagePaths.size(); i++) {
+                result.partTitles.add(coreResult.pageNames.get(i));
+                result.partUris.add(Uri.parse(coreResult.pagePaths.get(i)));
+            }
+        } else {
+            CoreWrapper.CoreResult coreResult = CoreWrapper.parse(coreOptions);
+
+            String coreExtension = coreResult.extension;
+            if (coreResult.exception == null && "pdf".equals(coreExtension)) {
+                // some PDFs do not cause an error in the core
+                // https://github.com/opendocument-app/OpenDocument.droid/issues/348#issuecomment-2446888981
+                throw new CoreWrapper.CoreCouldNotTranslateException();
+            } else if (!"unnamed".equals(coreExtension)) {
+                // "unnamed" refers to default of Meta::typeToString
+                options.fileExtension = coreExtension;
+
+                String fileType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(coreExtension);
+                if (fileType != null) {
+                    options.fileType = fileType;
+                }
             }
-        }
 
-        if (coreResult.exception != null) {
-            throw coreResult.exception;
-        }
+            if (coreResult.exception != null) {
+                throw coreResult.exception;
+            }
 
-        for (int i = 0; i < coreResult.pagePaths.size(); i++) {
-            File entryFile = new File(coreResult.pagePaths.get(i));
+            for (int i = 0; i < coreResult.pagePaths.size(); i++) {
+                File entryFile = new File(coreResult.pagePaths.get(i));
 
-            result.partTitles.add(coreResult.pageNames.get(i));
-            result.partUris.add(Uri.fromFile(entryFile));
+                result.partTitles.add(coreResult.pageNames.get(i));
+                result.partUris.add(Uri.fromFile(entryFile));
+            }
         }
     }
 

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

@@ -132,7 +132,7 @@ public static void close() {
 
     public static native void createServer(String outputPath);
 
-    public static native void hostFile(String prefix, CoreOptions options);
+    public static native CoreResult hostFile(String prefix, CoreOptions options);
 
     public static native void listenServer(int port);