Changeset 670

Timestamp:

Dec 24, 2013, 5:48:40 PM (11 years ago)

Author:

maron

Message:

• Fixed: bad description
• Added: progress in generation

Location:

trunk

Files:

• Modules/Export/ExportOutput.php (modified) (3 diffs)
• Modules/Export/ProcessTask.php (modified) (5 diffs)
• Modules/Export/files/3.3.5a/Instalace_CzechWoW.nsi (modified) (1 diff)
• includes/Version.php (modified) (1 diff)

trunk/Modules/Export/ExportOutput.php

@@ -204 +204 @@
   $DbResult = $System->Database->query('SELECT * FROM `ExportTask` WHERE `Export` = '.$ExportId);
   $ExportTask = $DbResult->fetch_assoc();
+  $Export = new Export($System);
+  $Export->Id = $ExportId;
+  $Export->Init();
   if($ExportTask['TimeFinish'] > $ExportTask['TimeStart'])
   {
-    $Export = new Export($System);
-    $Export->Id = $ExportId;
-    $Export->Init();
     $Output .= '<strong>Souhrný balík: <a href="'.$System->Link('/'.$Export->TempDirRelative.'CzWoW_DBC.zip').'">CzWoW_DBC.zip</a></strong><br/>';
     $DbResult = $System->Database->query('SELECT `Group`.* FROM `ExportGroup` JOIN `Group` ON `Group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$Export->Id.' AND `Group`.`DBCFileName` != ""');
@@ -216 +216 @@
         $Output .= '<a href="'.$System->Link('/'.$Export->TempDirRelative.'dbc/'.$Group['DBCFileName'].'.dbc').'">'.$Group['DBCFileName'].'.dbc</a><br/>';
     }
-  } else $Output .= '<strong>Soubor čeká na zpracování ve frontě.</strong><br/>';
+  } else {
+  
+    $Line = 0;
+    if (file_exists (dirname(__FILE__).'/../../'.$Export->TempDirRelative.'progress')) {
+      $File = new FileStream();
+      $File->OpenFile(dirname(__FILE__).'/../../'.$Export->TempDirRelative.'progress');
+      $Line = $File->ReadLine();  
+    }
+        $Output .= '<script type="text/javascript" language="JavaScript" charset="utf-8">'.
+                                 'setTimeout("parent.location.href=\''.$System->Link('/export/?Action=View&Tab=7&ExportId='.$Export->Id).'\'", 4000)'.
+                                                 '</script>';
+    $Output .= ' <strong>Zbývá procent: '.ProgressBar(300, $Line).'</strong>';
+    $Output .= '<br/><br/><strong>Soubor čeká na zpracování ve frontě.</strong><br/>';
+  } 
   return($Output);
 }
@@ -242 +255 @@
   $DbResult = $System->Database->query('SELECT * FROM `ExportTask` WHERE `Export` = '.$ExportId);
   $ExportTask = $DbResult->fetch_assoc();
+  $Export = new Export($System);
+  $Export->Id = $ExportId;
+  $Export->Init();
+  $Export->LoadFilters();
   if($ExportTask['TimeFinish'] > $ExportTask['TimeStart'])
   {
-    $Export = new Export($System);
-    $Export->Id = $ExportId;
-    $Export->Init();
-    $Export->LoadFilters();
+   // unlink($Export->TempDirRelative.'progress');
     $Output .= '<strong>Souhrný EXE balík: <a href="'.$System->Link('/'.$Export->TempDirRelative.'Instalace_CzechWoW_'.$Export->ClientVersion['Version'].'.exe').'">Instalace_CzechWoW_'.$Export->ClientVersion['Version'].'.exe</a></strong><br/>';
 
-  } else $Output .= '<strong>Soubor čeká na zpracování ve frontě.</strong><br/>';
+  } else {
+    
+    $Line = 0;
+    if (file_exists (dirname(__FILE__).'/../../'.$Export->TempDirRelative.'progress')) {
+      $File = new FileStream();
+      $File->OpenFile(dirname(__FILE__).'/../../'.$Export->TempDirRelative.'progress');
+      $Line = $File->ReadLine();  
+    }
+        $Output .= '<script type="text/javascript" language="JavaScript" charset="utf-8">'.
+                                 'setTimeout("parent.location.href=\''.$System->Link('/export/?Action=View&Tab=7&ExportId='.$Export->Id).'\'", 4000)'.
+                                                 '</script>';
+    $Output .= ' <strong>Zbývá procent: '.ProgressBar(300, $Line).'</strong>';
+    $Output .= '<br/><br/><strong>Soubor čeká na zpracování ve frontě.</strong><br/>';
+  }
   return($Output);
 }

trunk/Modules/Export/ProcessTask.php

@@ -14 +14 @@
         $System->Run();
 
+function SetProgres($Export,$per) {
+        $File = new FileStream();
+        $File->CreateFile($Export->TempDir.'progress');
+        $File->WriteLine(10);
+}
+
 while(1)
 {
@@ -28 +34 @@
         $Export->Id = $DbRow['ExportId'];
         $Export->Init();
+
+        SetProgres($Export,10);
+
         echo('Mazání starých souborů...'."\n");
         
@@ -42 +51 @@
         if(file_exists($Export->TempDir.'CzWoW_DBC.zip')) unlink($Export->TempDir.'CzWoW_DBC.zip');
 
+        SetProgres($Export,20);
         if(function_exists('gzcompress')) 
         {
@@ -48 +58 @@
           exec('zip -r -j '.$Export->TempDir.'CzWoW_DBC.zip '.$Export->TempDir.'dbc/');
           echo('Hotovo'."\n");
+          SetProgres($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);
@@ -54 +65 @@
         echo 'Caught exception: ',  $e->getMessage(), "\n";
       }
+      SetProgres($Export,100);
     } else
     {

trunk/Modules/Export/files/3.3.5a/Instalace_CzechWoW.nsi

@@ -191 +191 @@
   !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
     !insertmacro MUI_DESCRIPTION_TEXT ${Base} "Základní soubory"
-    !insertmacro MUI_DESCRIPTION_TEXT ${Fonts} "Fonty do hry, pro správné zobrazování diakritikys"
+    !insertmacro MUI_DESCRIPTION_TEXT ${Fonts} "Fonty do hry, pro správné zobrazování diakritiky"
     !insertmacro MUI_DESCRIPTION_TEXT ${Interface} "Pøeloží Rozhraní, Kouzla, Herní tipy, Úspìchy, Místa, Rasy postav aj."
     !insertmacro MUI_DESCRIPTION_TEXT ${Addon} "Pøeloží Výpravy, Slova NPC, Knížky aj."

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update. 
 
-$Revision = 669; // Subversion revision
+$Revision = 670; // Subversion revision
 $DatabaseRevision = 666; // Database structure revision 
 $ReleaseTime = '2013-12-24';