clear core cache

Author: andiwand

app/src/main/cpp/CoreWrapper.cpp

@@ -121,6 +121,7 @@ Java_at_tomtasche_reader_background_CoreWrapper_parseNative(JNIEnv *env, jclass
         jboolean editable = env->GetBooleanField(options, editableField);
 
         std::string outputPathCpp = getStringField(env, optionsClass, options, "outputPath");
+        std::string cachePathCpp = getStringField(env, optionsClass, options, "cachePath");
 
         jclass listClass = env->FindClass("java/util/List");
         jmethodID addMethod = env->GetMethodID(listClass, "add", "(Ljava/lang/Object;)Z");
@@ -195,11 +196,11 @@ Java_at_tomtasche_reader_background_CoreWrapper_parseNative(JNIEnv *env, jclass
 
             __android_log_print(ANDROID_LOG_VERBOSE, "smn", "Translate to HTML");
 
-            std::string output_tmp = outputPathCpp + "/tmp";
-            std::filesystem::create_directories(output_tmp);
-            odr::HtmlService service = odr::html::translate(file, output_tmp, htmlConfig, logger);
+            std::filesystem::remove_all(cachePathCpp);
+            std::filesystem::create_directories(cachePathCpp);
+            odr::HtmlService service = odr::html::translate(file, cachePathCpp, htmlConfig, logger);
             odr::Html html = service.bring_offline(outputPathCpp);
-            std::filesystem::remove_all(output_tmp);
+            std::filesystem::remove_all(cachePathCpp);
 
             for (const odr::HtmlPage &page: html.pages()) {
                 jstring pageName = env->NewStringUTF(page.name.c_str());
@@ -350,6 +351,7 @@ Java_at_tomtasche_reader_background_CoreWrapper_hostFileNative(JNIEnv *env, jcla
         jboolean editable = env->GetBooleanField(options, editableField);
 
         std::string outputPathCpp = getStringField(env, optionsClass, options, "outputPath");
+        std::string cachePathCpp = getStringField(env, optionsClass, options, "cachePath");
 
         jclass listClass = env->FindClass("java/util/List");
         jmethodID addMethod = env->GetMethodID(listClass, "add", "(Ljava/lang/Object;)Z");
@@ -395,9 +397,9 @@ Java_at_tomtasche_reader_background_CoreWrapper_hostFileNative(JNIEnv *env, jcla
             htmlConfig.text_document_margin = paging;
             htmlConfig.editable = editable;
 
-            std::string output_tmp = outputPathCpp + "/tmp";
-            std::filesystem::create_directories(output_tmp);
-            odr::HtmlService service = odr::html::translate(file, output_tmp, htmlConfig, logger);
+            std::filesystem::remove_all(cachePathCpp);
+            std::filesystem::create_directories(cachePathCpp);
+            odr::HtmlService service = odr::html::translate(file, cachePathCpp, htmlConfig, logger);
             s_server->connect_service(service, prefixCpp);
             odr::HtmlViews htmlViews = service.list_views();
 

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

@@ -7,6 +7,7 @@
 import android.webkit.MimeTypeMap;
 
 import java.io.File;
+import java.util.Objects;
 
 import at.tomtasche.reader.nonfree.AnalyticsManager;
 import at.tomtasche.reader.nonfree.ConfigManager;
@@ -92,9 +93,13 @@ private void translate(Options options, Result result) throws Exception {
 
         File cacheDirectory = AndroidFileCache.getCacheDirectory(cachedFile);
 
+        File coreOutputDirectory = new File(cacheDirectory, "core_output");
+        File coreCacheDirectory = new File(cacheDirectory, "core_cache");
+
         CoreWrapper.CoreOptions coreOptions = new CoreWrapper.CoreOptions();
         coreOptions.inputPath = cachedFile.getPath();
-        coreOptions.outputPath = cacheDirectory.getPath();
+        coreOptions.outputPath = coreOutputDirectory.getPath();
+        coreOptions.cachePath = coreCacheDirectory.getPath();
         coreOptions.password = options.password;
         coreOptions.editable = options.translatable;
         coreOptions.ooxml = doOoxml;

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

@@ -57,6 +57,7 @@ public static class CoreOptions {
 
         public String inputPath;
         public String outputPath;
+        public String cachePath;
     }
 
     public static CoreResult parse(CoreOptions options) {