Changeset 867 for trunk/Modules/Export/ProcessTask.php

Timestamp:

Feb 6, 2016, 12:54:26 AM (8 years ago)

Author:

chronos

Message:

• Added: Export task TimeQueued time which is different to TimeStart time which is actual time when task was started to be processed.
• Fixed: Updated also export of DBC files.

File:

• trunk/Modules/Export/ProcessTask.php (modified) (13 diffs)

trunk/Modules/Export/ProcessTask.php

@@ -50 +50 @@
 {
   //TMP="Z:\\a\\www\\wowpreklad\\tmp\\Export\\${EXPORTID}\\"
-  $patch = str_replace(DIRECTORY_SEPARATOR,'\\',$patch);
+  $patch = str_replace(DIRECTORY_SEPARATOR,'\\', $patch);
   $patch = 'Z:'.$patch;
   return $patch;
@@ -97 +97 @@
 {
   // DBC files
-  $DbResult = $System->Database->query('SELECT `ExportTask`.`Export`, `Export`.`Id` AS `ExportId` FROM `ExportTask`'.
-    ' LEFT JOIN `Export` ON `Export`.`Id` = `ExportTask`.`Export` WHERE `Export`.`OutputType` = 9 AND `ExportTask`.`TimeFinish` IS NULL');
+  $DbResult = $System->Database->query('SELECT `ExportTask`.`Id`, `ExportTask`.`Export`, `Export`.`Id` AS `ExportId` FROM `ExportTask`'.
+    ' LEFT JOIN `Export` ON `Export`.`Id` = `ExportTask`.`Export` WHERE (`Export`.`OutputType` = 9) '.
+    ' AND (`ExportTask`.`TimeFinish` IS NULL)');
   while($DbRow = $DbResult->fetch_assoc())
   {
@@ -106 +107 @@
       try
       {
+        $System->Database->update('ExportTask', '`Id`='.$DbRow['Id'], array('TimeStart' => 'NOW()'));
+
         $Export = new Export($System);
         $Export->Id = $DbRow['ExportId'];
         $Export->Init();
 
-        SetProgress($Export,10);
+        SetProgress($Export, 10);
 
         echo('Mazání starých souborů...'."\n");
@@ -118 +121 @@
         if(file_exists($Export->TempDir.'CzWoW_DBC.zip')) unlink($Export->TempDir.'CzWoW_DBC.zip');
 
-        SetProgress($Export,20);
+        SetProgress($Export, 20);
         if(function_exists('gzcompress'))
         {
@@ -125 +128 @@
           exec('zip -r -j '.$Export->TempDir.'CzWoW_DBC.zip '.$Export->TempDir.'dbc/');
           echo('Hotovo'."\n");
-          SetProgress($Export,80);
+          SetProgress($Export, 80);
         } else echo('Funkce pro tvorbu Zip souboru není podporována!'."\n");
         $System->Database->query('UPDATE `ExportTask` SET `TimeFinish`=NOW() WHERE `Export`='.$Export->Id);
@@ -132 +135 @@
         echo 'Caught exception: ',  $e->getMessage(), "\n";
       }
-      SetProgress($Export,100);
+      SetProgress($Export, 100);
     } else
     {
@@ -140 +143 @@
   }
 
-  //EXE files
-  $DbResult = $System->Database->query('SELECT `ExportTask`.`Export`, `Export`.`Id` AS `ExportId` FROM `ExportTask`'.
-    ' LEFT JOIN `Export` ON `Export`.`Id` = `ExportTask`.`Export` WHERE `Export`.`OutputType` = 10 AND `ExportTask`.`TimeFinish` IS NULL');
+  // EXE files
+  $DbResult = $System->Database->query('SELECT `ExportTask`.`Id`, `ExportTask`.`Export`, `Export`.`Id` AS `ExportId` FROM `ExportTask`'.
+    ' LEFT JOIN `Export` ON `Export`.`Id` = `ExportTask`.`Export` WHERE (`Export`.`OutputType` = 10) '.
+    ' AND (`ExportTask`.`TimeFinish` IS NULL)');
   while($DbRow = $DbResult->fetch_assoc())
   {
@@ -150 +154 @@
       try
       {
+        $System->Database->update('ExportTask', '`Id`='.$DbRow['Id'], array('TimeStart' => 'NOW()'));
      // echo shell_exec('"'.dirname(__FILE__).'./client_cz_export.sh" '.$DbRow['ExportId'].'');
 
@@ -161 +166 @@
 
         // Delete old files
-        SetProgress($Export,1);
+        SetProgress($Export, 1);
         echo('Delete old files...'."\n");
         DeleteOldFiles($Export->TempDir.'dbc');
@@ -168 +173 @@
 
         //copy need files
-        SetProgress($Export,5);
+        SetProgress($Export, 5);
         echo('Copy files...'."\n");
         rcopy('files/'.$Export->ClientVersion['Version'].'/patch-5.MPQ', $Export->TempDir.'patch-5.MPQ');
@@ -177 +182 @@
         rcopy('files/Fonts/', $Export->TempDir.'Fonts/');
 
-        SetProgress($Export,10);
+        SetProgress($Export, 10);
         echo('Export lua...'."\n");
         $Export->ExportToLua();
-        SetProgress($Export,15);
+        SetProgress($Export, 15);
         echo('Export CzWoW...'."\n");
         $Export->MakeAddon();
-        SetProgress($Export,30);
+        SetProgress($Export, 30);
         echo('Export dbc...'."\n");
         $Export->ExportToDBC();
 
         echo('Create readme...'."\n");
-        SetProgress($Export,60);
+        SetProgress($Export, 60);
         $File = new FileStream();
         $File->CreateFile($Export->TempDir.'ReadMe.htm');
@@ -195 +200 @@
 
         echo('Packing files...'."\n");
-        SetProgress($Export,70);
-        $workdir = str_replace('/',DIRECTORY_SEPARATOR,$Export->TempDir);
+        SetProgress($Export, 70);
+        $workdir = str_replace('/',DIRECTORY_SEPARATOR, $Export->TempDir);
         MPQPack($workdir.'lua');
-        SetProgress($Export,80);
+        SetProgress($Export, 80);
         MPQPack($workdir.'dbc');
 
-        SetProgress($Export,90);
+        SetProgress($Export, 90);
         echo('Creating instalator...'."\n");
         if (DIRECTORY_SEPARATOR == '/') // linux
@@ -209 +214 @@
           echo exec('"'.$workdir.$nsifile.'" '); //"c:\Program Files (x86)\NSIS\makensisw.exe" /Xscriptcmd
 
-        SetProgress($Export,100);
+        SetProgress($Export, 100);
         echo ("\n"."Hotovo"."\n");
         $System->Database->query('UPDATE `ExportTask` SET `TimeFinish`=NOW() WHERE `Export`='.$DbRow['Export']);
       } catch (Exception $e)
       {
-        echo 'Caught exception: ',  $e->getMessage(), "\n";
+        echo 'Caught exception: ', $e->getMessage(), "\n";
       }
     } else