Changeset 1414 for trunk/src/org/expeditee/encryption/io/EncryptedExpReader.java

Timestamp:

06/26/19 16:02:00 (5 years ago)

Author:

bln4

Message:

More amendments to the way surrogates are handled. Including renaming classic to primary.

File:

• trunk/src/org/expeditee/encryption/io/EncryptedExpReader.java (modified) (5 diffs)

trunk/src/org/expeditee/encryption/io/EncryptedExpReader.java

@@ -14 +14 @@
 import java.util.Base64;
 import java.util.List;
+import java.util.function.BiConsumer;
 import java.util.function.Predicate;
 
@@ -30 +31 @@
 import org.expeditee.gui.FrameIO;
 import org.expeditee.io.Conversion;
+import org.expeditee.io.DefaultFrameWriter;
 import org.expeditee.io.ExpReader;
 import org.expeditee.items.Item;
@@ -122 +124 @@
         }
         
-        @Override
+//      @Override
+//      protected String readTheItems(Frame newFrame, List<DelayedAction> delayedActions) throws IOException {
+//              String next = null;
+//              Item currentItem = null;
+//              
+//              Predicate<String> endOfSection = s -> s.equals(EncryptedExpWriter.TERMINATOR + "") || s.equals(EncryptedExpWriter.TERMINATOR_WITH_CONTINUATION);
+//              while (_reader.ready() && !endOfSection.test(next = _reader.readLine())) {
+//                      if (!isValidLine(next)) {
+//                              continue;
+//                      }
+//                      
+//                      String tag = getTagEnc(next);
+//                      if (next.startsWith(DefaultFrameWriter.TYPE_AND_ID_STR + " ")) {
+//                              currentItem = newItem(next);
+//                              _linePoints.put(currentItem.getID(), currentItem);
+//                              newFrame.addItem(currentItem);
+//                              currentItem.setEncryptionDetailForTag(tag + "", EncryptionDetail.UnencryptedOnSave);
+//                      } else if (next.startsWith("SurrogateFor")) {
+//                              int parentID = Integer.parseInt(next.split(" ")[1]);
+//                              newFrame.getItemWithID(parentID).addToSurrogates(currentItem);
+//                              newFrame.addToSurrogates(currentItem);
+//                      } else if (currentItem != null && actionShouldBeDelayed(tag.charAt(0))) { 
+//                              delayedActions.add(new DelayedAction(currentItem, next));
+//                      } else if (currentItem != null) {
+//                              processBodyLine(currentItem, next);
+//                      } else {
+//                              System.err.println("Error while reading in frame (ExpReader): Found body line but no current item to apply it to.");
+//                      }
+//              }
+//                              
+//              if (next.equals(EncryptedExpWriter.TERMINATOR_WITH_CONTINUATION)) {
+//                      next = readTheItems(newFrame, delayedActions);
+//              }
+//              
+//              return next;
+//      }
+        
         protected String readTheItems(Frame newFrame, List<DelayedAction> delayedActions) throws IOException {
+                // Read the primary item.
+                BiConsumer<Item, String> addToBody = (item, line) -> newFrame.addItem(item);
+                String next = readLineAfterLine(false, addToBody, delayedActions);
+                
+                // Read the surrogate items.
+                if (next.equals(EncryptedExpWriter.TERMINATOR_WITH_CONTINUATION)) {
+                        BiConsumer<Item, String> addToSurrogates = (item, line) -> {
+                                int parentID = Integer.parseInt(line.split(" ")[1]);
+                                newFrame.getItemWithID(parentID).addToSurrogates(item);
+                                newFrame.addToSurrogates(item);
+                        };
+                        next = readLineAfterLine(true, addToSurrogates, delayedActions);
+                }
+                return next;
+        }
+        
+        private String readLineAfterLine(boolean isSurrogate, BiConsumer<Item, String> storeResult, List<DelayedAction> delayedActions) throws IOException {
                 String next = null;
                 Item currentItem = null;
                 
-                Predicate<String> endOfSection = s -> s.equals("Z") || s.equals("Z...");
+                Predicate<String> endOfSection = s -> s.equals(EncryptedExpWriter.TERMINATOR + "") || s.equals(EncryptedExpWriter.TERMINATOR_WITH_CONTINUATION);
                 while (_reader.ready() && !endOfSection.test(next = _reader.readLine())) {
                         if (!isValidLine(next)) {
@@ -134 +189 @@
                         
                         String tag = getTagEnc(next);
-                        if (next.startsWith("S ")) {
+                        if (next.startsWith(DefaultFrameWriter.TYPE_AND_ID_STR + " ")) {
                                 currentItem = newItem(next);
                                 _linePoints.put(currentItem.getID(), currentItem);
-                                newFrame.addItem(currentItem);
+                                if (!isSurrogate) {
+                                        storeResult.accept(currentItem, next);
+                                }
                                 currentItem.setEncryptionDetailForTag(tag + "", EncryptionDetail.UnencryptedOnSave);
                         } else if (next.startsWith("SurrogateFor")) {
-                                int parentID = Integer.parseInt(next.split(" ")[1]);
-                                newFrame.getItemWithID(parentID).addToSurrogates(currentItem);
+                                if (isSurrogate) {
+                                        storeResult.accept(currentItem, next);
+                                }
                         } else if (currentItem != null && actionShouldBeDelayed(tag.charAt(0))) { 
                                 delayedActions.add(new DelayedAction(currentItem, next));
@@ -151 +209 @@
                 }
                 
-                if (next.equals(EncryptedExpWriter.SURROGATE_TERMINATOR)) {
-                        next = readTheItems(newFrame, delayedActions);
-                }
-                
                 return next;
         }
+        
+//      private String readLineAfterLine(Consumer<Item> storeResult, List<DelayedAction> delayedActions) throws IOException {
+//              String next = null;
+//              Item currentItem = null;
+//              
+//              Predicate<String> endOfSection = s -> {
+//                      return s.equals(EncryptedExpWriter.TERMINATOR + "") || s.equals(EncryptedExpWriter.TERMINATOR_WITH_CONTINUATION);
+//              };
+//              while (_reader.ready() && !endOfSection.test(next = _reader.readLine())) {
+//                      if (!isValidLine(next)) {
+//                              continue;
+//                      }
+//                      
+//                      String tag = getTagEnc(next);
+//                      if (next.startsWith(DefaultFrameWriter.TYPE_AND_ID_STR + " ")) {
+//                              currentItem = newItem(next);
+//                              _linePoints.put(currentItem.getID(), currentItem);
+//                              currentItem.setEncryptionDetailForTag(tag + "", EncryptionDetail.UnencryptedOnSave);
+//                              storeResult.accept(currentItem);
+//                      } else if (next.startsWith("SurrogateFor")) {
+//                              int parentID = Integer.parseInt(next.split(" ")[1]);
+//                              newFrame.getItemWithID(parentID).addToSurrogates(currentItem);
+//                              new Delayed
+//                      }
+//              }
+//              
+//              return next;
+//      }
         
         @Override