cache dir

Author: andiwand

OpenDocumentReader/CoreWrapper.h

@@ -17,7 +17,7 @@
 @property NSArray *pagePaths;
 @property NSNumber *errorCode;
 
-- (bool)translate:(NSString *)inputPath into:(NSString *)outputPath with:(NSString *)password editable:(bool)editable;
+- (bool)translate:(NSString *)inputPath cache:(NSString *)cachePath into:(NSString *)outputPath with:(NSString *)password editable:(bool)editable;
 - (bool)backTranslate:(NSString *)diff into:(NSString *)outputPath;
 @end
 

OpenDocumentReader/CoreWrapper.mm

@@ -28,7 +28,7 @@ @implementation CoreWrapper {
     std::optional<odr::Html> html;
 }
 
-- (bool)translate:(NSString *)inputPath into:(NSString *)outputPath with:(NSString *)password editable:(bool)editable {
+- (bool)translate:(NSString *)inputPath cache:(NSString *)cachePath into:(NSString *)outputPath with:(NSString *)password editable:(bool)editable {
     @synchronized(self) {
         try {
             _errorCode = 0;
@@ -67,6 +67,9 @@ - (bool)translate:(NSString *)inputPath into:(NSString *)outputPath with:(NSStri
             auto outputPathC = [outputPath cStringUsingEncoding:NSUTF8StringEncoding];
             auto outputPathCpp = std::string(outputPathC);
 
+            auto cachePathC = [cachePath cStringUsingEncoding:NSUTF8StringEncoding];
+            auto cachePathCpp = std::string(cachePathC);
+
             odr::DecodedFile file = odr::open(inputPathCpp);
             if (file.password_encrypted()) {
                 try {
@@ -82,7 +85,7 @@ - (bool)translate:(NSString *)inputPath into:(NSString *)outputPath with:(NSStri
             }
             document = file.document_file().document();
 
-            html = odr::html::translate(*document, outputPathCpp, config).bring_offline(outputPathCpp);
+            html = odr::html::translate(*document, cachePathCpp, config).bring_offline(outputPathCpp);
 
             NSMutableArray *pageNames = [[NSMutableArray alloc] init];
             NSMutableArray *pagePaths = [[NSMutableArray alloc] init];

OpenDocumentReader/Document.swift

@@ -67,9 +67,10 @@ class Document: UIDocument {
         result = nil
         delegate?.documentUpdateContent(self)
 
-        let tempPath = URL(fileURLWithPath: NSTemporaryDirectory())
-        coreWrapper.translate(fileURL.path, into: tempPath.path, with: password, editable: edit)
-        
+        let cachePath = URL(fileURLWithPath: NSTemporaryDirectory())
+        let outputPath = URL(fileURLWithPath: NSTemporaryDirectory())
+        coreWrapper.translate(fileURL.path, cache: cachePath.path, into: outputPath.path, with: password, editable: edit)
+
         let errorCode = coreWrapper.errorCode != nil ? coreWrapper.errorCode.intValue : 0
         if (errorCode == -2) {
             self.delegate?.documentEncrypted(self)

OpenDocumentReaderTests/OpenDocumentReaderTests.swift

@@ -11,27 +11,26 @@ import XCTest
 @testable import OpenDocumentReader
 
 class OpenDocumentReaderTests: XCTestCase {
-    
     // ONLINE fails on GitHub Actions for some reason
     private let ONLINE = false
-    
+
     private var saveURL: URL?
 
     override func setUpWithError() throws {
         var fileURL: URL?
-        
+
         let documentsURL = try
             FileManager.default.url(for: .documentDirectory,
                                     in: .userDomainMask,
                                     appropriateFor: nil,
                                     create: false)
-        
+
         saveURL = documentsURL.appendingPathComponent("test.odt")
-        
+
         if (FileManager.default.fileExists(atPath: saveURL!.path)) {
             return
         }
-        
+
         if (ONLINE) {
             let url = URL(string: "https://api.libreoffice.org/examples/cpp/DocumentLoader/test.odt")
 
@@ -45,25 +44,26 @@ class OpenDocumentReaderTests: XCTestCase {
             let filePath = Bundle(for: type(of: self)).path(forResource: "test", ofType: "odt")
             fileURL = URL(fileURLWithPath: filePath!)
         }
-        
+
         try FileManager.default.moveItem(at: fileURL!, to: self.saveURL!)
     }
 
     func testExample() throws {
         measure {
             let coreWrapper = CoreWrapper()
-                            
-            var translatePath = URL(fileURLWithPath: NSTemporaryDirectory())
-            translatePath.appendPathComponent("translate.html")
-            
-            coreWrapper.translate(saveURL?.path, into: translatePath.path, with: nil, editable: true)
+
+            var cachePath = URL(fileURLWithPath: NSTemporaryDirectory())
+            var outputPath = URL(fileURLWithPath: NSTemporaryDirectory())
+            outputPath.appendPathComponent("translate.html")
+
+            coreWrapper.translate(saveURL?.path, cache: cachePath.path, into: outputPath.path, with: nil, editable: true)
             XCTAssertNil(coreWrapper.errorCode)
-            
+
             var backTranslatePath = URL(fileURLWithPath: NSTemporaryDirectory())
             backTranslatePath.appendPathComponent("backtranslate.html")
-            
+
             let diff = "{\"modifiedText\":{\"/child:3/child:0\":\"This is a simple test document to demonstrate the DocumentLoaderwwww example!\"}}"
-            
+
             coreWrapper.backTranslate(diff, into: backTranslatePath.path)
             XCTAssertNil(coreWrapper.errorCode)
         }