about fixing online message exchange but - snapshot - still works

Author: thsc42

src/main/java/net/sharksystem/asap/engine/ASAPChunkStorageFS.java

@@ -74,7 +74,8 @@ String getChunkFileTrunkname(int era, String uri) {
     String setupChunkFolder(int era, String targetUrl) {
         String eraFolderString = this.getPath(era);
         File eraFolder = new File(eraFolderString);
-        Log.writeLog(this, "setup chunk / era folder: " + eraFolderString);
+        Log.writeLog(this, "setup chunk folder: " + eraFolderString);
+        Log.writeLog(this, "setup chunk folder-file: " + eraFolder);
         if(!eraFolder.exists()) {
             Log.writeLog(this, "folder does not exist - create: " + eraFolderString);
             eraFolder.mkdirs();

src/main/java/net/sharksystem/asap/engine/ASAPEngine.java

@@ -436,6 +436,7 @@ public void handleASAPAssimilate(ASAP_AssimilationPDU_1_0 asapAssimilationPDU, A
 
         // iterate messages and stream into chunk
         InputStream protocolInputStream = asapAssimilationPDU.getInputStream();
+        Log.writeLog(this, this.toString(), "take data to local chunk or transient message: " + messagesContainer);
         this.streamReceivedMessages2Container(messagesContainer, protocolInputStream,
                 messageOffsets, asapAssimilationPDU.getLength());
 
@@ -489,6 +490,7 @@ public void handleASAPAssimilate(ASAP_AssimilationPDU_1_0 asapAssimilationPDU, A
     private ASAPInternalChunk getIncomingChunk(String encounteredPeer, ASAP_AssimilationPDU_1_0 asapAssimilationPDU)
             throws IOException, ASAPException {
 
+        Log.writeLog(this, this.toString(), "called: get incoming chunk");
         String uri = asapAssimilationPDU.getChannelUri();
         int eraSender = asapAssimilationPDU.getEra();
         String senderE2E = asapAssimilationPDU.getSender();
@@ -502,9 +504,9 @@ private ASAPInternalChunk getIncomingChunk(String encounteredPeer, ASAP_Assimila
             ASAPInternalChunk localChunk = null;
             // is there a local chunk - to clone recipients from?
             if (this.channelExists(uri)) {
-//                localChunk = incomingChunkStorage.getChunk(uri, this.getEra());
-                localChunk = incomingChunkStorage.getChunk(uri, eraSender);
-            } else {
+                Log.writeLog(this, this.toString(), "get local chunk to copy channel data");
+                localChunk = incomingChunkStorage.getChunk(uri, this.getEra()); // get channel information
+            } else { // no information that can be copied
                 Log.writeLog(this, this.toString(), "asked to set up new channel: (uri/senderE2E): "
                         + uri + " | " + senderE2E);
                 // this channel is new to local peer - am I allowed to create it?
@@ -518,12 +520,14 @@ private ASAPInternalChunk getIncomingChunk(String encounteredPeer, ASAP_Assimila
                     this.createChannel(uri);
                 }
             }
+            Log.writeLog(this, this.toString(), "create new chunk to assimilate received data");
             ASAPInternalChunk incomingChunk = incomingStorage.createNewChunk(uri, eraSender);
 
             if (localChunk != null) {
                 Log.writeLog(this, this.toString(), "copy local meta data into newly created incoming chunk");
                 incomingChunk.copyMetaData(this.getChannel(uri));
             }
+            Log.writeLog(this, this.toString(), "new incoming chunk created: " + incomingChunk);
             return incomingChunk;
         } else {
             // already exists. Add message if sender == originator and era last era of this channel

src/main/java/net/sharksystem/asap/engine/ASAPInternalChunkFS.java

@@ -81,15 +81,16 @@ public List<CharSequence> getDeliveredTo() {
         this(storage, uri, era, null);
     }
 
-    ASAPInternalChunkFS(ASAPChunkStorageFS storage, String targetUri, int era, String sender) throws IOException {
+    ASAPInternalChunkFS(ASAPChunkStorageFS storage, String uri, int era, String sender) throws IOException {
         this.storage = storage;
-        if(targetUri != null) {
-            this.uri = targetUri;
+        if(uri != null) {
+            this.uri = uri;
         }
         this.era = era;
         this.sender = sender;
-        
-        String trunkName = this.storage.setupChunkFolder(era, targetUri);
+
+        //Log.writeLog(this, this.toString(), "construct chunkFS");
+        String trunkName = this.storage.setupChunkFolder(era, uri);
 
         // init
         this.initFiles(trunkName);
@@ -105,12 +106,16 @@ public ASAPInternalChunkFS(ASAPChunkStorageFS storage, String trunkName) throws
     private void initFiles(String trunkName) throws IOException {
         String messageFileName = trunkName + "." +  DATA_EXTENSION;
         String metaFileName = trunkName + "." + META_DATA_EXTENSION;
-        
+
         this.messageFile = new File(messageFileName);
         this.metaFile = new File(metaFileName);
 
         // init meta file - message file keeps untouched (good idea?)
         if(!this.metaFile.exists()) {
+            if(!this.metaFile.getParentFile().exists()) {
+                this.metaFile.getParentFile().mkdirs();
+                Log.writeLog(this, "parent folder created: " + this.messageFile.getParentFile().exists());
+            }
             this.metaFile.createNewFile();
         }
 
@@ -181,32 +186,32 @@ public void addMessage(byte[] messageAsBytes) throws IOException {
     }
 
     public void addMessage(InputStream messageByteIS, long length) throws IOException {
-        Log.writeLog(this, "going to add message to chunkFS" );
+        //Log.writeLog(this, "going to add message to chunkFS" );
         if(length > Integer.MAX_VALUE) {
             throw new IOException("message must not be longer than Integer.MAXVALUE");
         }
 
         long offset = 0;
         if(!this.messageFile.exists()) {
-            Log.writeLog(this, "content file does not exist yet - create: " + this.messageFile.getName());
-            Log.writeLog(this, "apath " + this.messageFile.getAbsolutePath());
-            Log.writeLog(this, "cpath " + this.messageFile.getCanonicalPath());
-            Log.writeLog(this, "path " + this.messageFile.getPath());
+            if(!this.messageFile.getParentFile().exists()) {
+                this.messageFile.getParentFile().mkdirs();
+                Log.writeLog(this, "parent folder created: " + this.messageFile.getParentFile().exists());
+            }
             this.messageFile.createNewFile();
         } else {
             offset = this.messageFile.length();
         }
-        Log.writeLog(this, "got chunk content file length: " + offset);
+        //Log.writeLog(this, "got chunk content file length: " + offset);
 
         OutputStream os = new FileOutputStream(this.messageFile, true);
-        Log.writeLog(this, "opened chunk content file to append data");
+        //Log.writeLog(this, "opened chunk content file to append data");
 
-        Log.writeLog(this, "write message to the end of chunk file");
+        //Log.writeLog(this, "write message to the end of chunk file");
         while(length-- > 0) {
             os.write(messageByteIS.read());
         }
 
-        Log.writeLog(this, "closing");
+        //Log.writeLog(this, "closing");
         os.close();
 
         // remember offset if not 0
@@ -454,4 +459,7 @@ public int getEra() throws IOException {
         return this.era;
     }
 
+    public String toString() {
+        return "sender: " + this.sender + " | era: " + era + " | metafile: " + this.metaFile;
+    }
 }