Changeset 864 for trunk/Modules

Timestamp:

Feb 5, 2016, 11:47:36 PM (9 years ago)

Author:

chronos

Message:

• Fixed: Do not allow to regenerate multipletimes already running export task.
• Modified: Progress reimplemented as Page class extension with virtual URL to avoid execution of any scripts with path to Modules subdirectory.
• Added: Show estimated time to complete export task.

Location:

trunk/Modules

Files:

• Export/Export.php (modified) (2 diffs)
• Export/ExportOutput.php (modified) (3 diffs)
• Export/Page.php (modified) (1 diff)
• Export/Progress.php (deleted)
• Info/Info.php (modified) (1 diff)

trunk/Modules/Export/Export.php

@@ -715 +715 @@
   {
     $this->System->RegisterPage('export', 'PageExport');
+    $this->System->RegisterPage(array('export', 'progress'), 'PageExportProgress');
     $this->System->RegisterMenuItem(array(
       'Title' => 'Exporty',
@@ -723 +724 @@
     ), 2);
   }
+
+  function GetTaskProgress($TaskId)
+  {
+    $Output = '';
+    $DbResult = $this->Database->query('SELECT * FROM `ExportTask` '.
+      'LEFT JOIN `Export` ON `Export`.`Id` = `ExportTask`.`Export` WHERE '.
+      '((`Export`.`OutputType` = 9) OR (`Export`.`OutputType` = 10)) AND '.
+      '(`TimeFinish` IS NULL) OR (`Export` ='.$TaskId.') ORDER BY `Progress` DESC'); // `Export`='.$Export->Id
+    while($Task = $DbResult->fetch_assoc())
+    {
+      $Export = '<a href="'.$this->System->Link('/export/?Action=View&amp;ExportId='.$Task['Export']).'">'.$Task['Export'].'</a>';
+      if ($TaskId == $Task['Export'])
+        $Export = ''.$Export.' (tento)';
+
+      // Show progress bar
+      $Output .= ' <strong>Export '.$Export.': <div id="progress'.$Task['Export'].'">'.
+        ProgressBar(300, $Task['Progress']).'</div></strong>';
+
+      // Show estimated time to complete
+      $PrefixMultiplier = new PrefixMultiplier();
+      $EstimatedTime = (time() - MysqlDateTimeToTime($Task['TimeStart'])) / $Task['Progress'] * (100 - $Task['Progress']);
+      $Output .= 'Zbývající odhadovaný čas: '.$PrefixMultiplier->Add($EstimatedTime, '', 4, 'Time').'<br/>';
+
+      if($Task['Progress'] > 99)
+        $Output .= '<script type="text/javascript" language="JavaScript" charset="utf-8">'.
+        'setTimeout("parent.location.href=\''.$this->System->Link('/export/?Action=View&amp;Tab=7&amp;ExportId='.$TaskId).'\'", 500)'.
+        '</script>';
+    }
+    return($Output);
+  }
 }
-

trunk/Modules/Export/ExportOutput.php

@@ -235 +235 @@
     '$(document).ready(function() {'.
     'var refreshId = setInterval(function() {'.
-    '$("#progress").load("'.$System->Link('/Modules/Export/Progress.php?RedirectId='.$_GET['ExportId']).'"); '.
+    '$("#progress").load("'.$System->Link('/export/progress?i='.$_GET['ExportId']).'"); '.
     '}, 1000);'.
     '});'.
     '</script>';
 
-  $Output .= ' <strong><div id="progress"></div></strong><br />';
-
+  $Output .= ' <div id="progress">'.$System->ModuleManager->Modules['Export']->GetTaskProgress($_GET['ExportId'] * 1).
+    '</div><br />';
+
+  // Check if process task is running
   $DbResult = $System->Database->query('SELECT * FROM `ExportTask` '.
     'LEFT JOIN `Export` ON `Export`.`Id` = `ExportTask`.`Export` '.
-    'WHERE ((`Export`.`OutputType` = 9) OR (`Export`.`OutputType` = 10)) AND (`TimeFinish` IS NULL) AND (`TimeStart` < (NOW() - 10000))');
+    'WHERE ((`Export`.`OutputType` = 9) OR (`Export`.`OutputType` = 10)) AND '.
+    '(`TimeFinish` IS NULL) AND (`TimeStart` < (NOW() - 10000))');
   if($DbResult->num_rows > 0)
   {
@@ -262 +265 @@
 
   $Output = '';
-  if(array_key_exists('Regenerate', $_POST))
-  {
-    $System->Database->query('UPDATE ExportTask SET TimeStart = NOW(),  `Progress`=0,  TimeFinish = NULL WHERE Export = '.$ExportId);
-    $Output .= ShowMessage('Soubor zařazen znovu ke zpracování do fronty.');
-    $System->ModuleManager->Modules['Log']->WriteLog('Zadání úlohy pro vygenerování exe souboru', LOG_TYPE_DOWNLOAD);
-  }
-
-  $Output .= '<form action="?Action=View&amp;Tab=7&amp;ExportId='.$ExportId.'" method="post"><input type="submit" name="Regenerate" value="Přegenerovat"/></form><br />';
+  // Allow to regenerate output if it was previously finished
+  $DbResult = $System->Database->query('SELECT `Id` FROM `ExportTask` WHERE (`Export` = '.$ExportId.
+    ') AND ((`TimeFinish` < `TimeStart`) OR (`TimeFinish` IS NULL))');
+  if($DbResult->num_rows == 0)
+  {
+    if(array_key_exists('Regenerate', $_POST))
+    {
+      $System->Database->query('UPDATE `ExportTask` SET `TimeStart` = NOW(), `Progress`=0, `TimeFinish` = NULL WHERE `Export` = '.$ExportId);
+      $Output .= ShowMessage('Soubor zařazen znovu ke zpracování do fronty.');
+      $System->ModuleManager->Modules['Log']->WriteLog('Zadání úlohy pro vygenerování exe souboru', LOG_TYPE_DOWNLOAD);
+    } else {
+      $Output .= '<form action="?Action=View&amp;Tab=7&amp;ExportId='.$ExportId.'" method="post">'.
+        '<input type="submit" name="Regenerate" value="Přegenerovat"/></form><br />';
+    }
+  }
+
   $Output .= 'U souhrné instalace češtiny funguje export textů jinak, protože generování je náročné, jsou požadavky zařazovány do fronty a postupně zpracovávány.<br /><br />';
 
-  $DbResult = $System->Database->query('SELECT * FROM ExportTask WHERE Export = '.$ExportId);
+  // Start task for the first time if export task was not yet started
+  $DbResult = $System->Database->query('SELECT * FROM `ExportTask` WHERE `Export` = '.$ExportId);
   if($DbResult->num_rows == 0)
   {
@@ -283 +295 @@
   if($ExportTask['TimeFinish'] > $ExportTask['TimeStart'])
   {
-    $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/>';
+    $FileName = 'Instalace_CzechWoW_'.$Export->ClientVersion['Version'].'.exe';
+    $Output .= '<strong>Souhrný EXE balík: <a href="'.$System->Link('/'.$Export->TempDirRelative.$FileName).'">'.$FileName.'</a></strong><br/>';
   } else {
     $Output .= ShowProgress($Export);

trunk/Modules/Export/Page.php

@@ -828 +828 @@
   }
 }
+
+class PageExportProgress extends Page
+{
+  function __construct($System)
+  {
+    parent::__construct($System);
+    $this->RawPage = true;
+  }
+
+  function Show()
+  {
+    if(array_key_exists('i', $_GET))
+      $Output = $this->System->ModuleManager->Modules['Export']->GetTaskProgress($_GET['i'] * 1);
+      else $Output = 'Missing task id';
+    return($Output);
+  }
+}

trunk/Modules/Info/Info.php

@@ -93 +93 @@
 'Addon jako takový je běžný doplněk do hry a je možné jej bez problémů používat i na oficiálních serverech.<br/>'.
 '<iframe width="420" height="315" src="https://www.youtube.com/embed/6EhBFv59syk" frameborder="0" allowfullscreen></iframe><br/>'.
-'<img src="images/promotion.bmp" width="800" alt="addon-obr">';
+'<img src="'.$this->System->Link('/images/promotion.bmp').'" width="800" alt="addon-obr">';
     return($Output);
   }