cpp compiles

Author: andiwand

app/src/main/cpp/CoreWrapper.cpp

@@ -5,13 +5,14 @@
 #include <odr/html.hpp>
 #include <odr/open_document_reader.hpp>
 #include <odr/exceptions.hpp>
+#include <odr/http_server.hpp>
 
 #include <android/log.h>
 
 #include <string>
 #include <optional>
 
-std::optional<odr::Html> html;
+std::optional<odr::Html> s_html;
 
 JNIEXPORT jobject JNICALL
 Java_at_tomtasche_reader_background_CoreWrapper_parseNative(JNIEnv *env, jobject instance,
@@ -119,7 +120,7 @@ Java_at_tomtasche_reader_background_CoreWrapper_parseNative(JNIEnv *env, jobject
                 config.text_document_margin = true;
             }
 
-            html = odr::OpenDocumentReader::html(inputPathCpp, [&passwordCpp]() -> std::string {
+            s_html = odr::OpenDocumentReader::html(inputPathCpp, [&passwordCpp]() -> std::string {
                 if (passwordCpp.has_value()) {
                     return passwordCpp.value();
                 }
@@ -128,7 +129,7 @@ Java_at_tomtasche_reader_background_CoreWrapper_parseNative(JNIEnv *env, jobject
 
             {
                 const auto extensionCpp = odr::OpenDocumentReader::type_to_string(
-                        html->file_type());
+                        s_html->file_type());
                 const auto extensionC = extensionCpp.c_str();
                 jstring extension = env->NewStringUTF(extensionC);
 
@@ -137,7 +138,7 @@ Java_at_tomtasche_reader_background_CoreWrapper_parseNative(JNIEnv *env, jobject
                 env->SetObjectField(result, extensionField, extension);
             }
 
-            for (auto &&page: html->pages()) {
+            for (auto &&page: s_html->pages()) {
                 jstring pageName = env->NewStringUTF(page.name.c_str());
                 env->CallBooleanMethod(pageNames, addMethod, pageName);
 
@@ -192,7 +193,7 @@ Java_at_tomtasche_reader_background_CoreWrapper_backtranslateNative(JNIEnv *env,
 
         const auto htmlDiffC = env->GetStringUTFChars(htmlDiff, &isCopy);
 
-        const auto extension = odr::OpenDocumentReader::type_to_string(html->file_type());
+        const auto extension = odr::OpenDocumentReader::type_to_string(s_html->file_type());
         const auto outputPathCpp = outputPathPrefixCpp + "." + extension;
         const char *outputPathC = outputPathCpp.c_str();
         jstring outputPath = env->NewStringUTF(outputPathC);
@@ -201,7 +202,7 @@ Java_at_tomtasche_reader_background_CoreWrapper_backtranslateNative(JNIEnv *env,
         env->SetObjectField(result, outputPathField, outputPath);
 
         try {
-            html->edit(htmlDiffC);
+            s_html->edit(htmlDiffC);
 
             env->ReleaseStringUTFChars(htmlDiff, htmlDiffC);
         } catch (...) {
@@ -212,7 +213,7 @@ Java_at_tomtasche_reader_background_CoreWrapper_backtranslateNative(JNIEnv *env,
         }
 
         try {
-            html->save(outputPathCpp);
+            s_html->save(outputPathCpp);
         } catch (...) {
             env->SetIntField(result, errorField, -7);
             return result;
@@ -229,5 +230,46 @@ Java_at_tomtasche_reader_background_CoreWrapper_backtranslateNative(JNIEnv *env,
 JNIEXPORT void JNICALL
 Java_at_tomtasche_reader_background_CoreWrapper_closeNative(JNIEnv *env, jobject instance,
                                                             jobject options) {
-    html.reset();
+    s_html.reset();
+}
+
+std::optional<odr::HttpServer> s_server;
+
+JNIEXPORT void JNICALL
+Java_at_tomtasche_reader_background_CoreWrapper_createServerNative(JNIEnv *env, jobject instance) {
+    odr::HttpServer::Config config;
+    s_server = odr::HttpServer(config);
+}
+
+JNIEXPORT jstring JNICALL
+Java_at_tomtasche_reader_background_CoreWrapper_hostFileNative(JNIEnv *env, jobject instance, jobject options) {
+    jboolean isCopy;
+
+    jclass optionsClass = env->GetObjectClass(options);
+    jfieldID inputPathField = env->GetFieldID(optionsClass, "inputPath", "Ljava/lang/String;");
+    auto inputPath = (jstring) env->GetObjectField(options, inputPathField);
+
+    const auto inputPathC = env->GetStringUTFChars(inputPath, &isCopy);
+    auto inputPathCpp = std::string(inputPathC, env->GetStringUTFLength(inputPath));
+    env->ReleaseStringUTFChars(inputPath, inputPathC);
+
+    odr::DecodePreference decode_preference;
+    decode_preference.engine_priority = {
+        odr::DecoderEngine::poppler, odr::DecoderEngine::wvware, odr::DecoderEngine::odr};
+    odr::DecodedFile file = odr::OpenDocumentReader::open(inputPathCpp, decode_preference);
+
+    std::string id = s_server->host_file(file);
+
+    return env->NewStringUTF(id.c_str());
+}
+
+JNIEXPORT void JNICALL
+Java_at_tomtasche_reader_background_CoreWrapper_listenServerNative(JNIEnv *env, jobject instance) {
+    s_server->listen("0.0.0.0", 8080);
+}
+
+JNIEXPORT void JNICALL
+Java_at_tomtasche_reader_background_CoreWrapper_stopServerNative(JNIEnv *env, jobject instance) {
+    s_server->stop();
+    s_server.reset();
 }

app/src/main/cpp/CoreWrapper.hpp

@@ -13,6 +13,18 @@ extern "C" {
 
     JNIEXPORT void JNICALL
     Java_at_tomtasche_reader_background_CoreWrapper_closeNative(JNIEnv *env, jobject instance, jobject options);
+
+    JNIEXPORT void JNICALL
+    Java_at_tomtasche_reader_background_CoreWrapper_createServerNative(JNIEnv *env, jobject instance);
+
+    JNIEXPORT jstring JNICALL
+    Java_at_tomtasche_reader_background_CoreWrapper_hostFileNative(JNIEnv *env, jobject instance, jobject options);
+
+    JNIEXPORT void JNICALL
+    Java_at_tomtasche_reader_background_CoreWrapper_listenServerNative(JNIEnv *env, jobject instance);
+
+    JNIEXPORT void JNICALL
+    Java_at_tomtasche_reader_background_CoreWrapper_stopServerNative(JNIEnv *env, jobject instance);
 }
 
 #endif //ANDROID_CORE_WRAPPER_H

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

@@ -78,6 +78,30 @@ public void close() {
 
     private native void closeNative(CoreOptions options);
 
+    public void createServer() {
+        createServerNative();
+    }
+
+    private native void createServerNative();
+
+    public String hostFile(CoreOptions options) {
+        return hostFileNative(options);
+    }
+
+    private native String hostFileNative(CoreOptions options);
+
+    public void listenServer() {
+        listenServerNative();
+    }
+
+    private native void listenServerNative();
+
+    public void stopServer() {
+        stopServerNative();
+    }
+
+    private native void stopServerNative();
+
     public static class CoreOptions {
 
         public boolean ooxml;