Changeset 23318

Timestamp:

Jun 18, 2013, 3:38:03 AM (11 years ago)

Author:

mistic100

Message:

it's late! some corrections, code cleaning & filter by size on admin page

Location:

extensions/BatchDownloader

Files:

• admin/sets.php (modified) (4 diffs)
• admin/template/sets.tpl (modified) (3 diffs)
• admin/template/style.css (modified) (1 diff)
• include/BatchDownloader.class.php (modified) (21 diffs)
• include/events.inc.php (modified) (1 diff)
• include/functions.inc.php (modified) (2 diffs)
• template/init_zip.tpl (modified) (1 diff)

extensions/BatchDownloader/admin/sets.php

@@ -64 +64 @@
   }
   
-  $order_by = $_POST['order_by'].' '.$_POST['direction'];
+  if ($_POST['size'] != -1)
+  {
+    array_push($where_clauses, 'size = "'.$_POST['size'].'"');
+  }
+  
+  if ($_POST['order_by'] == 'size')
+  {
+    $order_by = 'FIND_IN_SET(size, "square,thumb,2small,xsmall,small,medium,large,xlarge,xxlarge,original") '.$_POST['direction'];
+  }
+  else
+  {
+    $order_by = $_POST['order_by'].' '.$_POST['direction'];
+  }
 }
 
@@ -122 +134 @@
   );
 
+$page['size_items'] = array(
+  -1 => '------------',
+  );
+foreach (ImageStdParams::get_defined_type_map() as $params)
+{
+  $page['size_items'][ $params->type ] = l10n($params->type);
+}
+$page['size_items']['original'] = l10n('Original');
+
 $page['order_by_items'] = array(
   'date_creation' => l10n('Creation date'),
@@ -127 +148 @@
   'nb_images' => l10n('Number of images'),
   'nb_archives' => l10n('Number of archives'),
+  'size' => l10n('Photo sizes'),
   );
 
@@ -139 +161 @@
   'type_options' => $page['type_items'],
   'type_selected' => isset($_POST['type']) ? $_POST['type'] : '',
+  'size_options' => $page['size_items'],
+  'size_selected' => isset($_POST['size']) ? $_POST['size'] : '',
   'order_options' => $page['order_by_items'],
   'order_selected' => isset($_POST['order_by']) ? $_POST['order_by'] : '',

extensions/BatchDownloader/admin/template/sets.tpl

@@ -17 +17 @@
     {'Set type'|@translate}
     {html_options name=type options=$type_options selected=$type_selected}
+  </label>
+  
+  <label>
+    {'Photo sizes'|@translate}
+    {html_options name=size options=$size_options selected=$size_selected}
   </label>
   
@@ -49 +54 @@
       <td class="type">{'Set type'|@translate}</td>
       <td class="date">{'Creation date'|@translate}</td>
-      <td class="size">{'Total size'|@translate}</td>
+      <td class="img_size">{'Photo sizes'|@translate}</td>
       <td class="images">{'Number of images'|@translate}</td>
       <td class="archives">{'Number of archives'|@translate}</td>
+      <td class="size">{'Total size'|@translate}</td>
       <td class="status">{'Status'|@translate}</td>
       <td class="action">{'Actions'|@translate}</td>
@@ -62 +68 @@
     <td>{$set.NAME}</td>
     <td style="text-align:center;">{$set.DATE_CREATION}</td>
-    <td>{$set.TOTAL_SIZE}</td>
+    <td>{if $set.SIZE=='original'}{'Original'|@translate}{else}{$set.SIZE|@translate}{/if}</td>
     <td>{$set.NB_IMAGES}</td>
     <td>{$set.NB_ARCHIVES}</td>
+    <td>{$set.TOTAL_SIZE}</td>
     <td>
       {$set.STATUS|@translate}

extensions/BatchDownloader/admin/template/style.css

@@ -38 +38 @@
   width:100px;
 }
+.table2 .img_size {
+  width:120px;
+}
 .table2 .images {
   width:100px;

extensions/BatchDownloader/include/BatchDownloader.class.php

@@ -12 +12 @@
    * @param: mixed set id (##|'new')
    * @param: array images
-   * @param: string set type ('album'|'tag'|'selection')
-   * @param: int set type id (for retrieving album infos for instance)
+   * @param: string set type (calendar,category,flat,tags,search,favorites,most_visited,best_rated,list,recent_pics,collection)
+   * @param: mixed set type id (for calendar,category,tags,search,collection)
    * @param: string size to download
    */
@@ -32 +32 @@
       'nb_images' => 0,
       'total_size' => 0,
-      'estimated_total_size' => 0,
       'status' => 'new',
+      'estimated_total_size' => 0, // not in db
       );
     $this->images = array();
@@ -43 +43 @@
 SELECT *
   FROM '.BATCH_DOWNLOAD_TSETS.'
-  WHERE
-    id = '.$set_id.'
+  WHERE id = '.$set_id.'
     '.(!is_admin() ? 'AND user_id = '.$this->data['user_id'] : null).'
 ;';
@@ -56 +55 @@
           );
         
-        // make sur all pictures of the set exist
+        // make sure all pictures of the set exist
         $query = '
 DELETE FROM '.BATCH_DOWNLOAD_TIMAGES.'
@@ -66 +65 @@
       
         $query = '
-SELECT
-    image_id,
-    zip
+SELECT *
   FROM '.BATCH_DOWNLOAD_TIMAGES.'
   WHERE set_id = '.$this->data['id'].'
@@ -89 +86 @@
       if ($size != 'original')
       {
-        $type_map = array_keys(ImageStdParams::get_defined_type_map());
-        if (!in_array($size, $type_map))
+        $types = array_keys(ImageStdParams::get_defined_type_map());
+        if (!in_array($size, $types))
         {
           throw new Exception(sprintf(l10n('Invalid size %s'), $size));
@@ -166 +163 @@
   /**
    * getImages
-   * @return: array
+   * @return: array(image_id => zip_idx)
    */
   function getImages()
@@ -213 +210 @@
   function addImages($image_ids)
   {
-    global $conf;
-    
     if (empty($image_ids) or !is_array($image_ids)) return;
     
@@ -229 +224 @@
     {
       if ($this->isInSet($image_id)) continue;
-      if (!in_array(get_extension($file), $conf['batch_download']['allowed_ext'])) continue;
+      if (!in_array(get_extension($file), $this->conf['allowed_ext'])) continue;
       
       $this->images[ $image_id ] = 0;
-      array_push($inserts, array('set_id'=>$this->data['id'], 'image_id'=>$image_id, 'zip'=>0));
-    }
-    
-    mass_inserts(
-      BATCH_DOWNLOAD_TIMAGES,
-      array('set_id', 'image_id', 'zip'),
-      $inserts
-      );
+      $inserts[] = array(
+        'set_id' => $this->data['id'],
+        'image_id' => $image_id,
+        'zip' => 0,
+        );
+    }
+    
+    if (count($inserts))
+    {
+      mass_inserts(
+        BATCH_DOWNLOAD_TIMAGES,
+        array('set_id','image_id','zip'),
+        $inserts
+        );
+    }
       
     $this->updateParam('nb_images', count($this->images));
@@ -259 +261 @@
   
   /**
-   * get missing derivatives files
+   * getMissingDerivatives
+   * @param: bool update, if true, update IMAGE_SIZES with FS datas
    * @return: array of i.php urls
    */
@@ -268 +271 @@
       return array();
     }
-    
-    global $conf;
     
     $root_url = get_root_url();
@@ -280 +281 @@
     $to_update = $urls = $inserts = array();
     
+    global $conf;
+    $conf['old_question_mark_in_urls'] = $conf['question_mark_in_urls'];
+    $conf['old_php_extension_in_urls'] = $conf['php_extension_in_urls'];
+    $conf['old_derivative_url_style'] = $conf['derivative_url_style'];
     $conf['question_mark_in_urls'] = $conf['php_extension_in_urls'] = true;
-    $conf['derivative_url_style'] = 2; //script
+    $conf['derivative_url_style'] = 2;
     
     // images which we need to update stats
@@ -287 +292 @@
     {
       $query = '
-SELECT image_id, filemtime FROM '.IMAGE_SIZES_TABLE.'
+SELECT image_id, filemtime
+  FROM '.IMAGE_SIZES_TABLE.'
   WHERE image_id IN('.implode(',', $image_ids).')
     AND type = "'.$this->data['size'].'"
@@ -328 +334 @@
       {
         $derivative = new DerivativeImage($this->data['size'], $src_image);
-        // if ($this->data['size'] != $derivative->get_type()) continue;
         
         $filemtime = @filemtime($derivative->get_path());
@@ -369 +374 @@
     }
     
+    $conf['question_mark_in_urls'] = $conf['old_question_mark_in_urls'];
+    $conf['php_extension_in_urls'] = $conf['old_php_extension_in_urls'];
+    $conf['derivative_url_style'] = $conf['old_derivative_url_style'];
+    
     return $urls;
   }
@@ -412 +421 @@
       }
       
-      $this->getEstimatedArchiveNumber();
+      $this->getEstimatedArchiveNumber(true);
       
       $this->updateParam('date_creation', date('Y-m-d H:i:s'));
@@ -572 +581 @@
     }
     
-    list($total) = pwg_db_fetch_row(pwg_query($query));
-    $this->data['estimated_total_size'] = $total;
-    return $total;
+    list($this->data['estimated_total_size']) = pwg_db_fetch_row(pwg_query($query));
+    return $this->data['estimated_total_size'];
   }
   
@@ -581 +589 @@
    * @return: int
    */
-  function getEstimatedArchiveNumber()
+  function getEstimatedArchiveNumber($force=false)
   {
     if ($this->data['status'] == 'done') return $this->data['nb_zip'];
-    
-    return ceil( $this->getEstimatedTotalSize() / ($this->conf['max_size']*1024) );
+    if ( !empty($this->data['nb_zip']) and !$force ) return $this->data['nb_zip'];
+    
+    $this->updateParam('nb_zip', ceil( $this->getEstimatedTotalSize($force) / ($this->conf['max_size']*1024) ));
+    return $this->data['nb_zip'];
   }
   
@@ -649 +659 @@
     $path.= $set['BASENAME'] . '_';
     $path.= $this->data['user_id'] . $this->data['id'];
-    $path.= '_part' . $i;
-    $path.= '.zip';
+    $path.= '_part' . $i . '.zip';
     
     return $path;
@@ -657 +666 @@
   /**
    * getNames
-   * @return: array
+   * @return: array 
+   *    NAME, set name with HTML
+   *    sNAME, set name without HTML
+   *    BASENAME, set filename
+   *    COMMENT, set comment
    */
   function getNames()
@@ -848 +861 @@
       'NB_IMAGES' =>     $this->data['nb_images'],
       'NB_ARCHIVES' =>   $this->data['status']=='new' ? l10n('Unknown') : $this->getEstimatedArchiveNumber(),
-      'STATUS' =>        $this->data['status'],
+      'STATUS' =>        $this->data['status']=='ready' ? 'new' : $this->data['status'],
       'LAST_ZIP' =>      $this->data['last_zip'],
       'TOTAL_SIZE' =>    $this->data['status']=='new' ? l10n('Unknown') : sprintf(l10n('%d MB'), ceil($this->getEstimatedTotalSize()/1024)),
       'DATE_CREATION' => format_date($this->data['date_creation'], true),
-      'SIZE_ID' =>       $this->data['size'],
-      'SIZE' =>          $this->data['size']=='original' ? l10n('Original') : l10n($this->data['size']),
+      'SIZE' =>          $this->data['size'],
       );
       

extensions/BatchDownloader/include/events.inc.php

@@ -141 +141 @@
     'BATCH_DWN_URL' => $url,
     ));
-    
-  $type_map = ImageStdParams::get_defined_type_map();
-  foreach ($type_map as $params)
+  
+  foreach (ImageStdParams::get_defined_type_map() as $params)
   {
     $template->append(

extensions/BatchDownloader/include/functions.inc.php

@@ -34 +34 @@
       {
         $batch_type = 'flat';
-        $batch_id = 0;
+        $batch_id = null;
       }
       break;
@@ -58 +58 @@
     case 'recent_pics':
       $batch_type = $page['section'];
-      $batch_id = 0;
+      $batch_id = null;
       break;
     default:

extensions/BatchDownloader/template/init_zip.tpl

@@ -93 +93 @@
     <li class="error">{$elements_error}</li>
     <li><b>{'%d photos'|@translate|@sprintf:$set.NB_IMAGES}</b>{if $set.U_EDIT_SET}, <a href="{$set.U_EDIT_SET}" rel="nofollow">{'Edit the set'|@translate}</a>{/if}</li>
-    <li><b>{'Size'|@translate}:</b> {$set.SIZE} {if $set.SIZE_INFO}<span class="downloadSizeDetails">({$set.SIZE_INFO})</span>{/if}</li>
+    <li><b>{'Photo sizes'|@translate}:</b> {if $set.SIZE=='original'}{'Original'|@translate}{else}{$set.SIZE|@translate}{/if} {if $set.SIZE_INFO}<span class="downloadSizeDetails">({$set.SIZE_INFO})</span>{/if}</li>
     <li><b>{'Estimated size'|@translate}:</b> {$set.TOTAL_SIZE}</li>
     <li><b>{'Estimated number of archives'|@translate}:</b> {$set.NB_ARCHIVES} <i>({'real number of archives can differ'|@translate})</i></li>