Changeset 13038

Timestamp:

Feb 6, 2012, 9:59:20 PM (13 years ago)

Author:

rvelices

Message:

multisize - added the coi (still to affine the admin ui + language)
multisize - derivatives can be revuild from a larger derviative instead of the original

Location:

trunk

Files:

• admin/picture_coi.php (added)
• admin/picture_modify.php (modified) (1 diff)
• admin/themes/default/template/picture_coi.tpl (added)
• admin/themes/default/template/picture_modify.tpl (modified) (1 diff)
• i.php (modified) (5 diffs)
• include/dblayer/functions_mysql.inc.php (modified) (2 diffs)
• include/derivative.inc.php (modified) (5 diffs)
• include/derivative_params.inc.php (modified) (2 diffs)
• include/derivative_std_params.inc.php (modified) (4 diffs)
• install/db/116-database.php (added)
• install/piwigo_structure-mysql.sql (modified) (1 diff)
• themes/default/js/plugins/Jcrop.gif (added)
• themes/default/js/plugins/jquery.Jcrop.css (added)
• themes/default/js/plugins/jquery.Jcrop.js (added)
• themes/default/js/plugins/jquery.Jcrop.min.js (added)

trunk/admin/picture_modify.php

@@ -304 +304 @@
   );
 
+if (in_array(get_extension($row['path']),$conf['picture_ext']))
+{
+  $template->assign('U_COI', get_root_url().'admin.php?page=picture_coi&image_id='.$_GET['image_id']);
+}
+
 // image level options
 $selected_level = isset($_POST['level']) ? $_POST['level'] : $row['level'];

trunk/admin/themes/default/template/picture_modify.tpl

@@ -84 +84 @@
       </tr>
       {/if}
-
+{if isset($U_COI)}
+      <tr>
+        <td></td>
+        <td><a href="{$U_COI}">{'Not cropped correctly?'|@translate}</a></td>
+      </tr>
+{/if}
     </table>
 

trunk/i.php

@@ -233 +233 @@
   }
   array_shift($deriv);
-  $page['coi'] = '';
-  if (count($deriv) && $deriv[0][0]=='c' && $deriv[0][1]=='i')
-  {
-    $page['coi'] = substr(array_shift($deriv), 2);
-    preg_match('#^[a-zA-Z]{4}$#', $page['coi']) or ierror('Invalid center of interest', 400);
-  }
 
   if ($page['derivative_type'] == IMG_CUSTOM)
@@ -257 +251 @@
       ierror('Too big', 403);
     }
-    
+
     $key = array();
     $params->add_url_tokens($key);
@@ -267 +261 @@
   }
 
-  if (!is_file(PHPWG_ROOT_PATH.$req.$ext) and
-      is_file(PHPWG_ROOT_PATH.'../'.$req.$ext) )
+  if (is_file(PHPWG_ROOT_PATH.$req.$ext))
+  {
+    $req = './'.$req; // will be used to match #iamges.path
+  }
+  elseif (is_file(PHPWG_ROOT_PATH.'../'.$req.$ext))
+  {
     $req = '../'.$req;
+  }
 
   $page['src_location'] = $req.$ext;
@@ -276 +275 @@
 }
 
+function try_switch_source(DerivativeParams $params, $original_mtime)
+{
+  global $page;
+  $candidates = array();
+  foreach(ImageStdParams::get_defined_type_map() as $candidate)
+  {
+    if ($candidate->type == $params->type)
+      continue;
+    if ($candidate->use_watermark != $params->use_watermark)
+      continue;
+    if ($candidate->max_width() < $params->max_width() || $candidate->max_height() < $params->max_height())
+      continue;
+    if ($params->sizing->max_crop==0)
+    {
+      if ($candidate->sizing->max_crop!=0)
+        continue;
+    }
+    else
+    {
+      if ($candidate->sizing->max_crop!=0)
+        continue; // this could be optimized
+      if (!isset($page['original_size']))
+        continue;
+      $candidate_size = $candidate->compute_final_size($page['original_size']);
+      if ($candidate_size[0] < $params->sizing->min_size[0] || $candidate_size[1] < $params->sizing->min_size[1] )
+        continue;
+    }
+    $candidates[] = $candidate;
+  }
+
+  foreach( array_reverse($candidates) as $candidate)
+  {
+    $candidate_path = $page['derivative_path'];
+    $candidate_path = str_replace( '-'.derivative_to_url($params->type), '-'.derivative_to_url($candidate->type), $candidate_path);
+    $candidate_mtime = @filemtime($candidate_path);
+    if ($candidate_mtime === false
+      || $candidate_mtime < $original_mtime
+      || $candidate_mtime < $candidate->last_mod_time)
+      continue;
+    $params->use_watermark = false;
+    $params->sharpen = min(1, $params->sharpen);
+    $page['src_path'] = $candidate_path;
+    $page['src_url'] = $page['root_path'] . substr($candidate_path, strlen(PHPWG_ROOT_PATH));
+  }
+}
 
 function send_derivative($expires)
@@ -362 +406 @@
   send_derivative($expires);
 }
+
+$page['coi'] = null;
+if (strpos($page['src_location'], '/pwg_representative/')===false
+    && strpos($page['src_location'], 'themes/')===false
+    && strpos($page['src_location'], 'plugins/')===false)
+{
+  @include(PHPWG_ROOT_PATH.PWG_LOCAL_DIR .'config/database.inc.php');
+  include(PHPWG_ROOT_PATH .'include/dblayer/functions_'.$conf['dblayer'].'.inc.php');
+  try
+  {
+    $pwg_db_link = pwg_db_connect($conf['db_host'], $conf['db_user'],
+                                  $conf['db_password'], $conf['db_base']);
+    $query = 'SELECT coi, width, height FROM '.$prefixeTable.'images WHERE path=\''.$page['src_location'].'\'';
+    if ( ($row=pwg_db_fetch_assoc(pwg_query($query))) )
+    {
+      if (isset($row['width']))
+      {
+        $page['original_size'] = array($row['width'],$row['height']);
+      }
+      $page['coi'] = $row['coi'];
+    }
+    mysql_close($pwg_db_link);
+    if (!$row)
+    {
+      ierror('Db file path not found', 404);
+    }
+  }
+  catch (Exception $e)
+  {
+    ilog("db error", $e->getMessage());
+  }
+}
+
+try_switch_source($params, $src_mtime);
 
 if (!mkgetdir(dirname($page['derivative_path'])))

trunk/include/dblayer/functions_mysql.inc.php

@@ -85 +85 @@
   global $conf,$page,$debug,$t2;
 
-  $start = get_moment();
+  $start = microtime(true);
   ($result = mysql_query($query)) or my_error($query, $conf['die_on_sql_error']);
 
-  $time = get_moment() - $start;
+  $time = microtime(true) - $start;
 
   if (!isset($page['count_queries']))
@@ -200 +200 @@
   while ($row = mysql_fetch_assoc($result))
   {
-    array_push($array, $row[$fieldname]);
+    $array[] = $row[$fieldname];
   }
 

trunk/include/derivative.inc.php

@@ -28 +28 @@
   public $rel_path;
 
-  public $coi=null;
   private $size=null;
   private $flags=0;
@@ -35 +34 @@
   {
     global $conf;
-    
+
     $this->id = $infos['id'];
     $ext = get_extension($infos['path']);
@@ -55 +54 @@
     }
 
-    $this->coi = @$infos['coi'];
     if (!$this->size && isset($infos['width']) && isset($infos['height']))
     {
@@ -168 +166 @@
     $tokens=array();
     $tokens[] = substr($params->type,0,2);
-
-    if ($params->sizing->max_crop != 0 and !empty($src->coi))
-    {
-      $tokens[] = 'ci'.$src->coi;
-    }
 
     if ($params->type==IMG_CUSTOM)
@@ -258 +251 @@
       return $this->src_image->get_size();
     }
-    return $this->params->compute_final_size($this->src_image->get_size(), $this->src_image->coi);
+    return $this->params->compute_final_size($this->src_image->get_size());
   }
 

trunk/include/derivative_params.inc.php

@@ -46 +46 @@
 function fraction_to_char($f)
 {
-        return ord('a') + round($f*25);
+        return chr(ord('a') + round($f*25));
 }
 
@@ -258 +258 @@
   }
 
-  function compute_final_size($in_size, $coi)
-  {
-    $this->sizing->compute( $in_size, $coi, $crop_rect, $scale_size );
+  function compute_final_size($in_size)
+  {
+    $this->sizing->compute( $in_size, null, $crop_rect, $scale_size );
     return $scale_size != null ? $scale_size : $in_size;
   }

trunk/include/derivative_std_params.inc.php

@@ -73 +73 @@
     return self::$all_type_map[$type];
   }
-  
+
   static function get_custom($w, $h, $crop=0, $minw=null, $minh=null)
   {
@@ -99 +99 @@
     global $conf;
     $arr = @unserialize($conf['derivatives']);
-    if (false!==$arr)
-    {
-      self::$type_map = $arr['d'];
-      self::$watermark = @$arr['w'];
-      if (!self::$watermark) self::$watermark = new WatermarkParams();
-    }
-    else
-    {
-      self::make_default();
-    }
-    self::build_maps();
-  }
-
-  static function load_from_file()
-  {
-    global $conf;
-    $arr = @unserialize(@file_get_contents(PHPWG_ROOT_PATH.$conf['data_location'].'derivatives.dat'));
     if (false!==$arr)
     {
@@ -131 +114 @@
   }
 
+  static function load_from_file()
+  {
+    global $conf;
+    $arr = @unserialize(@file_get_contents(PHPWG_ROOT_PATH.$conf['data_location'].'derivatives.dat'));
+    if (false!==$arr)
+    {
+      self::$type_map = $arr['d'];
+      self::$watermark = @$arr['w'];
+      if (!self::$watermark) self::$watermark = new WatermarkParams();
+      self::$custom = @$arr['c'];
+      if (!self::$custom) self::$custom = array();
+    }
+    else
+    {
+      self::make_default();
+    }
+    self::build_maps();
+  }
+
   static function set_watermark($watermark)
   {
     self::$watermark = $watermark;
   }
-  
+
   static function set_and_save($map)
   {
@@ -177 +179 @@
     }
   }
-  
+
   private static function build_maps()
   {

trunk/install/piwigo_structure-mysql.sql

@@ -186 +186 @@
   `width` smallint(9) unsigned default NULL,
   `height` smallint(9) unsigned default NULL,
+        `coi` char(4) default NULL COMMENT 'center of interest',
   `representative_ext` varchar(4) default NULL,
   `date_metadata_update` date default NULL,