Changeset 12733

Timestamp:

Dec 14, 2011, 5:54:42 PM (12 years ago)

Author:

patdenice

Message:

Thumbnails can be generated in admin pannel.

Location:

extensions/GThumb

Files:

• admin.php (modified) (3 diffs)
• functions.inc.php (modified) (1 diff)
• language/en_UK/plugin.lang.php (modified) (1 diff)
• language/fr_FR/plugin.lang.php (modified) (1 diff)
• main.inc.php (modified) (1 diff)
• template/admin.tpl (modified) (2 diffs)
• template/pbar-ani.gif (added)

extensions/GThumb/admin.php

@@ -3 +3 @@
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 
-global $template, $conf;
+global $template, $conf, $page;
 
 load_language('plugin.lang', GTHUMB_PATH);
@@ -16 +16 @@
   gtdeltree(GTHUMB_CACHE_DIR);
   redirect('admin.php?page=plugin-GThumb');
+}
+
+// Generate cache
+if (isset($_GET['generatecache']))
+{
+  if ($_GET['generatecache'] == 'complete')
+  {
+    array_push($page['infos'], l10n('Cache have been generated'));
+  }
+  else
+  {
+    $query = 'SELECT id, path, md5sum, tn_ext FROM '.IMAGES_TABLE.';';
+    $result = pwg_query($query);
+    $cache_dir = GTHUMB_CACHE_DIR.'/'.$conf['GThumb']['height'].'/';
+    $missing = array();
+
+    while ($row = pwg_db_fetch_assoc($result))
+    {
+      if (!is_file($cache_dir.md5($row['path'].(!empty($row['md5sum']) ? $row['md5sum'] : '')).'.'.$row['tn_ext'])
+        and in_array(get_extension($row['path']), $conf['picture_ext']))
+      {
+        array_push($missing, $row['id']);
+      }
+    }
+    echo json_encode($missing);
+    exit();
+  }
 }
 
@@ -70 +97 @@
 // Informations
 $data = gtdirsize(GTHUMB_CACHE_DIR);
-if ($data['size'] > 1024 * 1024)
-  $data['size'] = round($data['size'] / (1024 * 1024), 2).' MB';
-else
-  $data['size'] = round($data['size'] / 1024, 2).' KB';
 
 $template->assign(
   array(
-    'NB_ELEMENTS' => l10n_dec('%d file', '%d files', $data['nb_files']),
-    'ELEMENTS_SIZE' => $data['size'],
+    'NB_FILES' => $data['nb_files'],
+    'CACHE_SIZE' => $data['size'],
     'PWG_TOKEN' => get_pwg_token(),
   )

extensions/GThumb/functions.inc.php

@@ -80 +80 @@
     'width' => $result['width'],
     'height' => $result['height'],
+    'filesize' => filesize($file),
   );
 }

extensions/GThumb/language/en_UK/plugin.lang.php

@@ -7 +7 @@
 $lang['Scale thumbnails'] = 'Scale thumbnails';
 $lang['Cache Informations'] = 'Cache Informations';
-$lang['Clear the cache'] = 'Clear the cache';
+$lang['Purge thumbnails cache'] = 'Purge thumbnails cache';
 $lang['%d file'] = '%d file';
 $lang['%d files'] = '%d files';
+$lang['Cache have been generated'] = 'Cache have been generated';
+$lang['Pre-cache thumbnails'] = 'Pre-cache thumbnails';
 
 ?>

extensions/GThumb/language/fr_FR/plugin.lang.php

@@ -7 +7 @@
 $lang['Scale thumbnails'] = 'Redimensionner les miniatures';
 $lang['Cache Informations'] = 'Informations du cache';
-$lang['Clear the cache'] = 'Effacer le cache';
+$lang['Purge thumbnails cache'] = 'Vider le cache';
 $lang['%d file'] = '%d fichier';
 $lang['%d files'] = '%d fichiers';
+$lang['Cache have been generated'] = 'Le cache a été généré';
+$lang['Pre-cache thumbnails'] = 'Mettre en cache les miniatures';
 
 ?>

extensions/GThumb/main.inc.php

@@ -144 +144 @@
   global $conf;
 
-  if (!in_array(get_extension($picture['file']), $conf['picture_ext']))
+  if (!in_array(get_extension($picture['path']), $conf['picture_ext']))
   {
     $file = get_thumbnail_url($picture);

extensions/GThumb/template/admin.tpl

@@ -52 +52 @@
 <fieldset id="cacheinfo">
 <legend>{'Cache Informations'|@translate}</legend>
-<p>
-{$NB_ELEMENTS}, {$ELEMENTS_SIZE}<br>
-<a href="admin.php?page=plugin-GThumb&amp;pwg_token={$PWG_TOKEN}&amp;deletecache=true" onclick="return confirm('{'Are you sure?'|@translate}');">{'Clear the cache'|@translate}</a>
+<p id="cache_data">&nbsp;</p>
+<p id="GThumbAction">
+  <button onclick="GThumb.deletecache();">{'Purge thumbnails cache'|@translate}</button>
+  <button onclick="GThumb.generatecache();">{'Pre-cache thumbnails'|@translate}</button>
 </p>
+<div id="GThumbProgressbar" style="display:none;">
+  {'Generating cache, please wait...'|@translate}<br>
+  <div id="progressbar"></div>
+</div>
 </fieldset>
 
@@ -61 +66 @@
 <style type="text/css">
 #GThumb td { padding-bottom: 12px; }
-#cacheinfo p { text-align:left; line-height:20px; margin:20px }
+#cacheinfo p, #GThumbProgressbar { text-align:left; line-height:20px; margin:20px }
+.ui-progressbar-value { background-image: url(plugins/GThumb/template/pbar-ani.gif); }
 </style>
 {/literal}{/html_head}
+
+{combine_script id='jquery.ui.progressbar' load='footer'}
+{combine_script id='jquery.ajaxmanager' load='footer' path='themes/default/js/plugins/jquery.ajaxmanager.js'}
+
+{footer_script}
+var pwg_token = '{$PWG_TOKEN}';
+var confirm_message = '{'Are you sure?'|@translate}';
+var nb_files_str  = '{'%d file'|@translate}';
+var nb_files_str_plur = '{'%d files'|@translate}';
+var lang_info_zero_plural = {if $lang_info.zero_plural}true{else}false{/if};
+var cache_size = {$CACHE_SIZE};
+var nb_files = {$NB_FILES};
+
+{literal}
+var GThumb = {
+
+  total: 0,
+  done: 0,
+
+  queue: jQuery.manageAjax.create('queued', { 
+    queue: true,  
+    cacheResponse: false,
+    maxRequests: 3
+  }),
+
+  deletecache: function() {
+    if (confirm(confirm_message)) {
+      window.location = 'admin.php?page=plugin-GThumb&deletecache=true&pwg_token='+pwg_token;
+    }
+  },
+
+  generatecache: function() {
+    jQuery("#progressbar").progressbar({value: 0});
+    jQuery.ajax({
+      url: 'admin.php?page=plugin-GThumb&generatecache=request',
+      dataType: 'json',
+      success: function(data) {
+        if (data.length > 0) {
+          jQuery("#GThumbProgressbar, #GThumbAction").toggle();
+          GThumb.total = data.length;
+          for (i=0;i<data.length;i++) {
+            GThumb.queue.add({
+              type: 'GET', 
+              url: 'ws.php', 
+              data: {
+                method: 'pwg.images.getGThumbPlusThumbnail',
+                image_id: data[i],
+                format: 'json'
+              },
+              dataType: 'json',
+              success: function(data) {
+                nb_files++;
+                cache_size += data.result.filesize;
+                updateCacheSizeAndFiles();
+                GThumb.progressbar();
+              },
+              error: GThumb.progressbar
+            });
+          }
+        } else {
+          window.location = 'admin.php?page=plugin-GThumb&generatecache=complete';
+        }
+      },
+      error: function() {
+        alert('An error occured');
+      }
+    });
+    return false;
+  },
+
+  progressbar: function() {
+    jQuery( "#progressbar" ).progressbar({
+      value: Math.round(++GThumb.done * 100 / GThumb.total)
+    });
+    if (GThumb.done == GThumb.total) {
+      window.location = 'admin.php?page=plugin-GThumb&generatecache=complete';
+    }
+  }
+};
+
+function updateCacheSizeAndFiles() {
+  
+  if ( nb_files > 1 || (nb_files == 0 && lang_info_zero_plural)) {
+    nbstr = nb_files_str_plur;
+  } else {
+    nbstr = nb_files_str;
+  }
+
+  ret = nbstr.replace('%d', nb_files) + ', ';
+
+  if (cache_size > 1024 * 1024)
+    ret += Math.round((cache_size / (1024 * 1024))*100)/100 + ' MB';
+  else
+    ret += Math.round((cache_size / 1024)*100)/100 + ' KB';
+
+  jQuery("#cache_data").html(ret);
+}
+
+updateCacheSizeAndFiles();
+{/literal}{/footer_script}