[PlaneShift-svn] SF.net SVN: planeshift:[2503] stable

[<mg...@us...>]

Revision: 2503
          http://planeshift.svn.sourceforge.net/planeshift/?rev=2503&view=rev
Author:   mgist
Date:     2008-11-25 03:55:01 +0000 (Tue, 25 Nov 2008)

Log Message:
-----------
- Merged r2497-2502 from trunk.

Modified Paths:
--------------
    stable/docs/compiling.html
    stable/docs/history.txt
    stable/src/pslaunch/updaterengine.cpp

Property Changed:
----------------
    stable/


Property changes on: stable
___________________________________________________________________
Modified: svn:mergeinfo
   - /personal/Xordan:1745,1812,1894,2270,2272,2283,2330,2333,2336
/trunk:1-2108,2110,2112,2114,2116-2119,2121,2123-2124,2126,2128,2130,2132-2133,2135-2465,2469,2472,2481,2487,2489
   + /personal/Xordan:1745,1812,1894,2270,2272,2283,2330,2333,2336
/trunk:1-2108,2110,2112,2114,2116-2119,2121,2123-2124,2126,2128,2130,2132-2133,2135-2465,2469,2472,2481,2487,2489,2497-2502

Modified: stable/docs/compiling.html
===================================================================
--- stable/docs/compiling.html	2008-11-25 03:52:27 UTC (rev 2502)
+++ stable/docs/compiling.html	2008-11-25 03:55:01 UTC (rev 2503)
@@ -42,9 +42,9 @@
     // Source versions are listed here and automatically updated in the body.
     // Standard revisions (CSrev) are the ones that are compatible with Laanx.
     // An additional CS revision (CSrev_HEAD) may be specified for the latest version of PS.
-    var CSrev = "31565";  // CS_SOURCE_REV
+    var CSrev = "31626";  // CS_SOURCE_REV
     var CAL3Drev = "507"; // CAL3D_SOURCE_REV
-    var CSrev_HEAD = "31565";  // CS_SOURCE_REV_HEAD
+    var CSrev_HEAD = "31626";  // CS_SOURCE_REV_HEAD
     var CAL3Drev_HEAD = "507"; // CAL3D_SOURCE_REV_HEAD
     var csWinLibsVersionStab = "1.3_004"; // cs win32 libs version.
     var csWinLibsVersion = "1.3_004"; // cs win32 libs version.

Modified: stable/docs/history.txt
===================================================================
--- stable/docs/history.txt	2008-11-25 03:52:27 UTC (rev 2502)
+++ stable/docs/history.txt	2008-11-25 03:55:01 UTC (rev 2503)
@@ -1,4 +1,7 @@
-*** 2008-11-23 by Dave Bentham
+*** 2008-11-25 by Mike Gist
+- Added a check to the updater so it doesn't re-download files which are already up to date.
+
+*** 2008-11-23 by Dave Bentham
 - Slight reorganisation of MiniGames classes/files; including renaming 
   psMiniGameManager to MiniGameManager (following Keith's lead).
 

Modified: stable/src/pslaunch/updaterengine.cpp
===================================================================
--- stable/src/pslaunch/updaterengine.cpp	2008-11-25 03:52:27 UTC (rev 2502)
+++ stable/src/pslaunch/updaterengine.cpp	2008-11-25 03:55:01 UTC (rev 2503)
@@ -713,6 +713,22 @@
                 csString oldFilePath = newFilePath;
                 oldFilePath.AppendFmt(".old");
 
+                // Start by checking whether the existing file is already up to date.
+                csRef<iDataBuffer> buffer = vfs->ReadFile("/this/" + newFilePath);
+                if(buffer)
+                {
+                  csMD5::Digest md5 = csMD5::Encode(buffer->GetData(), buffer->GetSize());
+                  csString md5sum = md5.HexString();
+
+                  csString fileMD5 = next->GetAttributeValue("md5sum");
+
+                  // If it's up to date then skip this file.
+                  if(md5sum.Compare(fileMD5))
+                  {
+                    continue;
+                  }
+                }
+
                 // Move old file to a temp location ready for input.
                 fileUtil->MoveFile("/this/" + newFilePath, "/this/" + oldFilePath, true, false, true);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.