[jtcfrost-cvs] frost-wot/source/frost/threads MessageUploadThread.java,1.76,1.77

[<jtc...@li...>]

Update of /cvsroot/jtcfrost/frost-wot/source/frost/threads
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8586/source/frost/threads

Modified Files:
	MessageUploadThread.java 
Log Message:
added SENT folder (not yet in GUI)

Index: MessageUploadThread.java
===================================================================
RCS file: /cvsroot/jtcfrost/frost-wot/source/frost/threads/MessageUploadThread.java,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** MessageUploadThread.java	10 Oct 2005 06:32:51 -0000	1.76
--- MessageUploadThread.java	5 Feb 2006 17:54:17 -0000	1.77
***************
*** 618,621 ****
--- 618,624 ----
          boolean error = false;
          boolean tryAgain;
+         
+         String upKey = null;
+         
          while (!success) {
              // find first free index slot
***************
*** 645,649 ****
              // try to insert message
              String[] result = new String[2];
!             String upKey = composeUpKey(index);
              String downKey = composeDownKey(index);
  
--- 648,652 ----
              // try to insert message
              String[] result = new String[2];
!             upKey = composeUpKey(index);
              String downKey = composeDownKey(index);
  
***************
*** 690,701 ****
  
          if (!error) {
-             // we will see the message if received from freenet
-             messageFile.delete();
-             zipFile.delete();
- 
              logger.info("*********************************************************************\n"
                      + "Message successfully uploaded to board '" + board.getName() + "'.\n"
                      + "*********************************************************************");
              tryAgain = false;
          } else {
              logger.warning("TOFUP: Error while uploading message.");
--- 693,716 ----
  
          if (!error) {
              logger.info("*********************************************************************\n"
                      + "Message successfully uploaded to board '" + board.getName() + "'.\n"
                      + "*********************************************************************");
+ 
              tryAgain = false;
+ 
+             // move message file to sent folder
+             
+             // upKey is KSK@.../msg.xml, we want msg.xml name
+             String finalName = upKey.substring( upKey.lastIndexOf("/")+1 );
+ 
+             File sentTarget = new File( frostSettings.getValue("sent.dir") + finalName );
+             boolean wasOk = messageFile.renameTo(sentTarget);
+             if( !wasOk ) {
+                 logger.severe("Error: rename of '"+messageFile.getPath()+"' into '"+sentTarget.getPath()+"' failed!");
+             }
+ 
+             messageFile.delete();
+             zipFile.delete();
+ 
          } else {
              logger.warning("TOFUP: Error while uploading message.");