move wrapper to new core

Author: andiwand

OpenDocumentReader/CoreWrapper.mm

@@ -14,7 +14,8 @@
 #include <odr/document_element.hpp>
 #include <odr/file.hpp>
 #include <odr/html.hpp>
-#include <odr/open_document_reader.hpp>
+#include <odr/html_service.hpp>
+#include <odr/odr.hpp>
 #include <odr/exceptions.hpp>
 
 #include <string>
@@ -23,6 +24,7 @@
 #include <optional>
 
 @implementation CoreWrapper {
+    std::optional<odr::Document> document;
     std::optional<odr::Html> html;
 }
 
@@ -32,24 +34,22 @@ - (bool)translate:(NSString *)inputPath into:(NSString *)outputPath with:(NSStri
             _errorCode = 0;
             _pageNames = nil;
             _pagePaths = nil;
-            
-            if (html.has_value()) {
-                html.reset();
-            }
-            
+
+            html.reset();
+
             odr::HtmlConfig config;
             config.editable = editable;
-            
+
             if (password == nil) {
                 password = @"";
             }
-            
+
             auto inputPathC = [inputPath cStringUsingEncoding:NSUTF8StringEncoding];
             auto inputPathCpp = std::string(inputPathC);
-            
+
             std::vector<odr::FileType> fileTypes;
             try {
-                fileTypes = odr::OpenDocumentReader::types(inputPathCpp);
+                fileTypes = odr::types(inputPathCpp);
                 if (fileTypes.empty()) {
                     _errorCode = @(-5);
                     return false;
@@ -63,33 +63,45 @@ - (bool)translate:(NSString *)inputPath into:(NSString *)outputPath with:(NSStri
                 _errorCode = @(-5);
                 return false;
             }
-            
+
             auto outputPathC = [outputPath cStringUsingEncoding:NSUTF8StringEncoding];
             auto outputPathCpp = std::string(outputPathC);
-            
-            html = odr::OpenDocumentReader::html(inputPathCpp, [password]() { return std::string([password UTF8String]); }, outputPathCpp, config);
-            
+
+            odr::DecodedFile file = odr::open(inputPathCpp);
+            if (file.password_encrypted()) {
+                try {
+                    file = file.decrypt(std::string([password UTF8String]));
+                } catch (odr::WrongPasswordError &) {
+                    _errorCode = @(-2);
+                    return false;
+                }
+            }
+            if (!file.is_document_file()) {
+                _errorCode = @(-5);
+                return false;
+            }
+            document = file.document_file().document();
+
+            html = odr::html::translate(*document, outputPathCpp, config).bring_offline(outputPathCpp);
+
             NSMutableArray *pageNames = [[NSMutableArray alloc] init];
             NSMutableArray *pagePaths = [[NSMutableArray alloc] init];
             for (auto &&page : html->pages()) {
                 [pageNames addObject:[NSString stringWithCString:page.name.c_str() encoding:[NSString defaultCStringEncoding]]];
 
                 [pagePaths addObject:[NSString stringWithCString:page.path.c_str() encoding:[NSString defaultCStringEncoding]]];
             }
-            
+
             _pageNames = pageNames;
             _pagePaths = pagePaths;
         } catch (odr::UnknownFileType&) {
             _errorCode = @(-5);
             return false;
-        } catch (odr::WrongPassword&) {
-            _errorCode = @(-2);
-            return false;
         } catch (...) {
             _errorCode = @(-3);
             return false;
         }
-        
+
         return true;
     }
 }
@@ -98,10 +110,10 @@ - (bool)backTranslate:(NSString *)diff into:(NSString *)outputPath {
     @synchronized(self) {
         try {
             _errorCode = 0;
-            
-            html->edit([diff cStringUsingEncoding:NSUTF8StringEncoding]);
-            
-            html->save([outputPath cStringUsingEncoding:NSUTF8StringEncoding]);
+
+            odr::html::edit(*document, [diff cStringUsingEncoding:NSUTF8StringEncoding]);
+
+            document->save([outputPath cStringUsingEncoding:NSUTF8StringEncoding]);
         } catch (...) {
             _errorCode = @(-3);
             return false;