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

Timestamp:

Jan 8, 2014, 1:05:05 PM (11 years ago)

Author:

maron

Message:

• Modify: Change store progress from file to Database

File:

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

trunk/Modules/Export/ProcessTask.php

@@ -17 +17 @@
         $System->Run();
 
-function SetProgres($Export,$per) {
-        $File = new FileStream();
-        $File->CreateFile($Export->TempDir.'progress');
-        $File->WriteLine($per);
+function SetProgress($Export,$per) {
+   global $System;
+        $System->Database->query('UPDATE `ExportTask` SET `Progress`='.$per.' WHERE `Export`='.$Export->Id);
 }
 function SetOnline() {
@@ -119 +118 @@
         $Export->Init();
 
-        SetProgres($Export,10);
+        SetProgress($Export,10);
 
         echo('Mazání starých souborů...'."\n");
@@ -127 +126 @@
         if(file_exists($Export->TempDir.'CzWoW_DBC.zip')) unlink($Export->TempDir.'CzWoW_DBC.zip');
 
-        SetProgres($Export,20);
+        SetProgress($Export,20);
         if(function_exists('gzcompress')) 
         {
@@ -134 +133 @@
           exec('zip -r -j '.$Export->TempDir.'CzWoW_DBC.zip '.$Export->TempDir.'dbc/');
           echo('Hotovo'."\n");
-          SetProgres($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);
@@ -141 +140 @@
         echo 'Caught exception: ',  $e->getMessage(), "\n";
       }
-      if (file_exists($Export->TempDir.'progress')) unlink($Export->TempDir.'progress');
     } else
     {
@@ -157 +155 @@
     if($DbRow['ExportId'] != '') 
     {     
+      try 
+      {
      // echo shell_exec('"'.dirname(__FILE__).'./client_cz_export.sh" '.$DbRow['ExportId'].'');
 
@@ -168 +168 @@
         
         // Delete old files
-        SetProgres($Export,5);
+        SetProgress($Export,5);
         echo('Delete old files...'."\n");
         DeleteOldFiles($Export->TempDir.'dbc');
@@ -175 +175 @@
         
         //copy need files
-        SetProgres($Export,10);
+        SetProgress($Export,10);
         echo('Copy files...'."\n");
         rcopy('files/'.$Export->ClientVersion['Version'].'/patch-5.MPQ', $Export->TempDir.'patch-5.MPQ');
@@ -184 +184 @@
         rcopy('files/Fonts/', $Export->TempDir.'Fonts/');       
               
-        SetProgres($Export,15);
+        SetProgress($Export,15);
         echo('Export lua...'."\n");
         $Export->ExportToLua();
-        SetProgres($Export,20);
+        SetProgress($Export,20);
         echo('Export CzWoW...'."\n");
         $Export->MakeAddon();
-        SetProgres($Export,30);
+        SetProgress($Export,35);
         echo('Export dbc...'."\n");
         $Export->ExportToDBC();
       
         echo('Create readme...'."\n");
-        SetProgres($Export,60);
+        SetProgress($Export,65);
         $File = new FileStream();
         $File->CreateFile($Export->TempDir.'ReadMe.htm');
@@ -202 +202 @@
         
         echo('Packing files...'."\n");
-        SetProgres($Export,70);
+        SetProgress($Export,70);
         $workdir = str_replace('/',DIRECTORY_SEPARATOR,$Export->TempDir);
         MPQPack($workdir.'lua');
-        SetProgres($Export,80);
+        SetProgress($Export,80);
         MPQPack($workdir.'dbc');
 
-        SetProgres($Export,90);
+        SetProgress($Export,90);
         echo('Creating instalator...'."\n");
         if (DIRECTORY_SEPARATOR == '/') // linux
@@ -216 +216 @@
           echo exec('"'.$workdir.$nsifile.'" '); //"c:\Program Files (x86)\NSIS\makensisw.exe" /Xscriptcmd 
 
-        SetProgres($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";
+      }
     } else
     {