Changeset 16392 for extensions/BatchDownloader/include

Timestamp:

Jul 6, 2012, 1:03:39 PM (12 years ago)

Author:

mistic100

Message:

• stylish download page
• if there is only one archive, the file is downloaded directly
• improve configuration page + add sliders (needs Piwigo 2.4.2)

Location:

extensions/BatchDownloader/include

Files:

• BatchDownloader.class.php (modified) (9 diffs)
• download.inc.php (modified) (4 diffs)
• events.inc.php (modified) (3 diffs)

extensions/BatchDownloader/include/BatchDownloader.class.php

@@ -260 +260 @@
    * createNextArchive
    */
-  function createNextArchive()
+  function createNextArchive($force_one_archive=false)
   {
     // set already downloaded
@@ -329 +329 @@
         
         $total_size+= $row['filesize'];
-        if ($total_size >= $this->conf['max_size']*1024) break;
+        if ($total_size >= $this->conf['max_size']*1024 and !$force_one_archive) break;
       }
       
@@ -358 +358 @@
       {
         $this->updateParam('status', 'done');
+        $this->clear(false);
       }
       
@@ -417 +418 @@
     $nb_archives = $this->getEstimatedArchiveNumber();
     
-    $out = '<ul id="download_list">';
-    if ($this->data['status'] == 'done')
+    $out = '';
+    /*if ($this->data['status'] == 'done')
     {
       $out.= '<li id="zip-1">Already downloaded</li>';
-    }
-    else
+    }*/
+    if (true)
     {
       for ($i=1; $i<=$this->data['nb_zip']; $i++)
@@ -430 +431 @@
         if ($i < $this->data['last_zip']+1)
         {
-          $out.= 'Archive #'.$i.' (already downloaded)';
+          $out.= '<img src="'.BATCH_DOWNLOAD_PATH.'template/drive.png"> Archive #'.$i.' (already downloaded)';
         }
         else if ($i == $this->data['last_zip']+1)
         {
-            $out.= '<a href="'.add_url_params($url, array('set_id'=>$this->data['set_id'],'zip'=>$i)).'" rel="nofollow"' 
+            $out.= '<a href="'.add_url_params($url, array('set_id'=>$this->data['set_id'],'zip'=>$i)).'" rel="nofollow" style="font-weight:bold;"' 
               .($i!=1 ? 'onClick="return confirm(\'Starting download Archive #'.$i.' will destroy Archive #'.($i-1).', be sure you finish the download. Continue ?\');"' : null).
-              '>Archive #'.$i.' (ready)</a>';
+              '><img src="'.BATCH_DOWNLOAD_PATH.'template/drive_go.png"> Archive #'.$i.' (ready)</a>';
         }
         else
         {
-          $out.= 'Archive #'.$i.' (pending)';
+          $out.= '<img src="'.BATCH_DOWNLOAD_PATH.'template/drive.png"> Archive #'.$i.' (pending)';
         }
         
@@ -446 +447 @@
       }
     }
-    $out.= '</ul>';
     
     return $out;
@@ -472 +472 @@
           $this->data['type'] .'-'. $this->data['type_id'] .'_'.
           $this->data['user_id'] . $this->data['set_id'] .'_'.
-          'part'. $i .'.zip';
+          ($this->data['nb_zip']!=1 ? 'part'. $i : null).
+          '.zip';
   }
   
@@ -505 +506 @@
       {
         $category = get_cat_info($this->data['type_id']);
-        $set['NAME'] = get_cat_display_name($category['upper_names']);
-        $set['sNAME'] = $category['name'];
-        $set['COMMENT'] = trigger_action('render_category_description', $category['comment']);
+        $set['NAME'] = l10n('Album').': '.get_cat_display_name($category['upper_names']);
+        $set['sNAME'] = l10n('Album').': '.trigger_event('render_category_name', $category['name']);
+        $set['COMMENT'] = trigger_event('render_category_description', $category['comment']);
         break;
       }
@@ -532 +533 @@
             .'</a>';
         }
+        
+        $set['sNAME'] = l10n('Tags').': '.strip_tags($set['COMMENT']);
         break;
       }

extensions/BatchDownloader/include/download.inc.php

@@ -15 +15 @@
     $BatchDownloader = new BatchDownloader($_GET['set_id']);
     
-    if ($BatchDownloader->getParam('status') != 'done')
+    if ( isset($_GET['cancel']) )
     {
-      if (isset($_GET['zip']))
-      {
-        $BatchDownloader->deleteLastArchive();
-        $next_file = $BatchDownloader->createNextArchive();
-      }
-      else
-      {
-        $BatchDownloader->getEstimatedArchiveNumber();
-      }
+      $BatchDownloader->deleteLastArchive();
+      $BatchDownloader->clear();
+      pwg_query('DELETE FROM '.BATCH_DOWNLOAD_TSETS.' WHERE id = '.$_GET['set_id'].';');
+      $_SESSION['page_infos'][] = l10n('Download set deleted');
+      redirect('index.php');
+    }
+    
+    if ( isset($_GET['zip']) and $BatchDownloader->getParam('status') != 'done' and $_GET['zip'] > $BatchDownloader->getParam('last_zip') )
+    {
+      $BatchDownloader->deleteLastArchive();
+      $next_file = $BatchDownloader->createNextArchive();
     }
 
@@ -33 +35 @@
     {
       $set['U_DOWNLOAD'] = BATCH_DOWNLOAD_PATH . 'download.php?set_id='.$_GET['set_id'].'&zip='.$_GET['zip'];
-      array_push($page['infos'], sprintf(l10n('Archive #%d is downloading, if the download doesn\'t start automatically please <a href="%s">click here</a>'), $_GET['zip'], $set['U_DOWNLOAD']));
+      array_push($page['infos'], sprintf(l10n('The archive is downloading, if the download doesn\'t start automatically please <a href="%s">click here</a>'), $set['U_DOWNLOAD']));
     }
     
     if ($BatchDownloader->getParam('nb_images') > $conf['batch_download']['max_elements'])
     {
-      array_push($page['errors'], sprintf(
+      $template->assign('elements_error', sprintf(
         l10n('You choose to download %d pictures, but the system is limited to %d. You can edit the set, or the last %d pictures will not be downloaded.'),
         $BatchDownloader->getParam('nb_images'),
@@ -44 +46 @@
         $BatchDownloader->getParam('nb_images') - $conf['batch_download']['max_elements']
         ));
+    }
+    
+    if ($BatchDownloader->getParam('status') == 'new')
+    {
+      $set['U_CANCEL'] = BATCH_DOWNLOAD_PUBLIC . 'init_zip&amp;set_id='.$_GET['set_id'].'&amp;cancel';
     }
     
@@ -102 +109 @@
 }
 
+$template->assign('BATCH_DOWNLOAD_PATH', BATCH_DOWNLOAD_PATH);
+
 
 function batch_download_thumbnails_list_prefilter($content, &$smarty)

extensions/BatchDownloader/include/events.inc.php

@@ -24 +24 @@
     
     $page['section'] = 'download';
-    $page['title'] = l10n('Advanced Downloader').$conf['level_separator'].' ';
+    $page['title'] = l10n('Batch Downloader').$conf['level_separator'].' ';
     
     switch (@$tokens[1])
@@ -57 +57 @@
 function batch_download_index_button()
 {
-  global $page, $template, $user;
+  global $page, $template, $user, $conf;
   
   if ( !count($page['items']) or !isset($page['section']) ) return;
@@ -71 +71 @@
     {
       $BatchDownloader = new BatchDownloader('new', $page['items'], $set['type'], $set['id']);
-      redirect(BATCH_DOWNLOAD_PUBLIC . 'init_zip&set_id='.$BatchDownloader->getParam('set_id'));
+      $BatchDownloader->getEstimatedArchiveNumber();
+      
+      if (
+        $BatchDownloader->getParam('nb_images') <= $conf['batch_download']['max_elements']
+        and $BatchDownloader->getParam('nb_zip') == 1
+      )
+      {
+        $BatchDownloader->createNextArchive(true);
+        
+        $u_download = BATCH_DOWNLOAD_PATH . 'download.php?set_id='.$BatchDownloader->getParam('set_id').'&amp;zip=1';
+        
+        $null = null;
+        $template->block_footer_script(null, 'setTimeout("document.location.href = \''.$u_download.'\';", 1000);', $null, $null);
+        
+        array_push($page['infos'], sprintf(l10n('The archive is downloading, if the download doesn\'t start automatically please <a href="%s">click here</a>'), $u_download));
+      }
+      else
+      {
+        redirect(BATCH_DOWNLOAD_PUBLIC . 'init_zip&amp;set_id='.$BatchDownloader->getParam('set_id'));
+      }
     }
   }