Merge pull request #29 from TomTasche/feature/editing

editing

Author: TomTasche

OpenDocument.core

@@ -160,28 +160,28 @@
 			isa = PBXContainerItemProxy;
 			containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */;
 			proxyType = 1;
-			remoteGlobalIDString = E8750BA65D65423EB75AC563;
+			remoteGlobalIDString = 68722AEF2DC64BF8AB2DF7D5;
 			remoteInfo = glog;
 		};
 		E26C39322250D976009C484A /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */;
 			proxyType = 1;
-			remoteGlobalIDString = B47238B8891F4586873EEF82;
+			remoteGlobalIDString = DBADB6840206443A97F2A76D;
 			remoteInfo = miniz;
 		};
 		E26C39342250D976009C484A /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */;
 			proxyType = 1;
-			remoteGlobalIDString = AE495395BBBE4F7B9CEF6C48;
+			remoteGlobalIDString = CD40E84D34284EF7A80FB402;
 			remoteInfo = odrlib;
 		};
 		E26C39362250D976009C484A /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */;
 			proxyType = 1;
-			remoteGlobalIDString = 3E01C15B40E6472FABEEAEAC;
+			remoteGlobalIDString = B382587C51824ECE8AB80585;
 			remoteInfo = tinyxml2;
 		};
 		E29A02212365EF7800BD6A96 /* PBXContainerItemProxy */ = {
@@ -251,7 +251,7 @@
 			isa = PBXContainerItemProxy;
 			containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */;
 			proxyType = 1;
-			remoteGlobalIDString = 58D71E509A434B40833DD053;
+			remoteGlobalIDString = E08901684B824F61ACF4B07B;
 			remoteInfo = "cryptopp-object";
 		};
 /* End PBXContainerItemProxy section */
@@ -930,7 +930,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 11;
+				CURRENT_PROJECT_VERSION = 14;
 				DEVELOPMENT_TEAM = 5LS6X97G6J;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
@@ -943,7 +943,7 @@
 					"@executable_path/Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				MARKETING_VERSION = 1.8;
+				MARKETING_VERSION = 1.10;
 				PRODUCT_BUNDLE_IDENTIFIER = at.tomtasche.reader;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = OpenDocumentReader/BridgingHeader.h;
@@ -960,7 +960,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 11;
+				CURRENT_PROJECT_VERSION = 14;
 				DEVELOPMENT_TEAM = 5LS6X97G6J;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
@@ -973,7 +973,7 @@
 					"@executable_path/Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				MARKETING_VERSION = 1.8;
+				MARKETING_VERSION = 1.10;
 				PRODUCT_BUNDLE_IDENTIFIER = at.tomtasche.reader;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = OpenDocumentReader/BridgingHeader.h;

OpenDocumentReader.xcodeproj/project.pbxproj

@@ -27,8 +27,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -38,11 +36,11 @@
             ReferencedContainer = "container:OpenDocumentReader.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Release"
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
@@ -61,8 +59,6 @@
             ReferencedContainer = "container:OpenDocumentReader.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

OpenDocumentReader.xcodeproj/xcshareddata/xcschemes/OpenDocumentReader.xcscheme

@@ -46,24 +46,26 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     func application(_ app: UIApplication, open inputURL: URL, options: [UIApplication.OpenURLOptionsKey : Any] = [:]) -> Bool {
         guard let documentBrowserViewController = window?.rootViewController as? DocumentBrowserViewController else {
-            print("*** The root view is not a document browser! ***")
+            Crashlytics.sharedInstance().throwException()
+            
             return false
         }
 
         documentBrowserViewController.revealDocument(at: inputURL, importIfNeeded: true) { (revealedDocumentURL, error) in
 
             guard error == nil else {
-                print("*** Failed to reveal the document at %@. Error: %@. ***")
+                Crashlytics.sharedInstance().recordError(error!)
+                Crashlytics.sharedInstance().throwException()
+                
                 return
             }
 
             guard let url = revealedDocumentURL else {
-                print("*** No URL revealed. ***")
+                Crashlytics.sharedInstance().throwException()
+                
                 return
             }
-            
-            print("==> Revealed URL")
-            
+                        
             documentBrowserViewController.presentDocument(at: url)
         }
 

OpenDocumentReader/AppDelegate.swift

@@ -16,7 +16,8 @@
 @property NSArray *pageNames;
 @property NSNumber *errorCode;
 
-- (bool)translate:(NSString *)inputPath into:(NSString *)outputPath at:(NSNumber *)page with:(NSString *)password;
+- (bool)translate:(NSString *)inputPath into:(NSString *)outputPath at:(NSNumber *)page with:(NSString *)password editable:(bool)editable;
+- (bool)backTranslate:(NSString *)inputPath into:(NSString *)outputPath;
 @end
 
 #endif /* CoreWrapper_h */

OpenDocumentReader/CoreWrapper.h

@@ -14,50 +14,86 @@
 #include "TranslationConfig.h"
 #include "FileMeta.h"
 
-@implementation CoreWrapper
-- (bool)translate:(NSString *)inputPath into:(NSString *)outputPath at:(NSNumber *)page with:(NSString *)password {
-    try {
-        odr::TranslationHelper translator;
-        bool opened = translator.openOpenDocument([inputPath cStringUsingEncoding:NSUTF8StringEncoding]);
-        if (!opened) {
-            _errorCode = @(-1);
-            return false;
-        }
-        
-        const auto meta = translator.getMeta();
-        
-        bool decrypted = !meta->encrypted;
-        if (password != nil) {
-            decrypted = translator.decrypt([password cStringUsingEncoding:NSUTF8StringEncoding]);
-        }
-        
-        if (!decrypted) {
-            _errorCode = @(-2);
+@implementation CoreWrapper {
+    odr::TranslationHelper translator;
+    bool initialized;
+}
+
+- (bool)translate:(NSString *)inputPath into:(NSString *)outputPath at:(NSNumber *)page with:(NSString *)password editable:(bool)editable {
+    @synchronized(self) {
+        try {
+            _errorCode = 0;
+                    
+            if (!initialized) {
+                bool opened = translator.openOpenDocument([inputPath cStringUsingEncoding:NSUTF8StringEncoding]);
+                if (!opened) {
+                    _errorCode = @(-1);
+                    return false;
+                }
+                
+                const auto meta = translator.getMeta();
+                
+                bool decrypted = !meta->encrypted;
+                if (password != nil) {
+                    decrypted = translator.decrypt([password cStringUsingEncoding:NSUTF8StringEncoding]);
+                }
+                
+                if (!decrypted) {
+                    _errorCode = @(-2);
+                    return false;
+                }
+                
+                NSMutableArray *pageNames = [[NSMutableArray alloc] init];
+                if (meta->type == odr::FileType::OPENDOCUMENT_TEXT) {
+                    [pageNames addObject:@"Text document"];
+                } else {
+                    for (auto page = meta->entries.begin(); page != meta->entries.end(); page++) {
+                        auto pageName = page->name;
+                        
+                        [pageNames addObject:[NSString stringWithCString:pageName.c_str() encoding:[NSString defaultCStringEncoding]]];
+                    }
+                }
+                _pageNames = pageNames;
+                
+                initialized = true;
+            }
+            
+            odr::TranslationConfig config = {};
+            config.editable = editable;
+            config.entryOffset = page.intValue;
+            config.entryCount = 1;
+            
+            bool translated = translator.translate([outputPath cStringUsingEncoding:NSUTF8StringEncoding], config);
+            if (!translated) {
+                _errorCode = @(-4);
+                return false;
+            }
+        } catch (...) {
+            _errorCode = @(-3);
             return false;
         }
 
-        odr::TranslationConfig config = {};
-        config.entryOffset = page.intValue;
-        config.entryCount = 1;
-        
-        NSMutableArray *pageNames = [[NSMutableArray alloc] init];
-        if (meta->type == odr::FileType::OPENDOCUMENT_TEXT) {
-            [pageNames addObject:@"Text document"];
-        } else {
-            for (auto page = meta->entries.begin(); page != meta->entries.end(); page++) {
-                auto pageName = page->name;
-                
-                [pageNames addObject:[NSString stringWithCString:pageName.c_str() encoding:[NSString defaultCStringEncoding]]];
+        return true;
+    }
+}
+
+- (bool)backTranslate:(NSString *)inputPath into:(NSString *)outputPath {
+    @synchronized(self) {
+        try {
+            _errorCode = 0;
+            
+            bool translated = translator.backTranslate([inputPath cStringUsingEncoding:NSUTF8StringEncoding], [outputPath cStringUsingEncoding:NSUTF8StringEncoding]);
+            if (!translated) {
+                _errorCode = @(-4);
+                return false;
             }
+        } catch (...) {
+            _errorCode = @(-3);
+            return false;
         }
-        _pageNames = pageNames;
 
-        translator.translate([outputPath cStringUsingEncoding:NSUTF8StringEncoding], config);
-    } catch (...) {
-        _errorCode = @(-3);
-        return false;
+        return true;
     }
-    
-    return true;
 }
+
 @end