Add new sync option

admin/admin_batchmanager.php

@@ -94,6 +94,10 @@ function vjs_loc_end_element_set_global()
 	<label><input type="checkbox" name="vjs_posteroverlay" value="1" /> Add film effect</label>
 	<br/><small>Apply an overlay on the poster creation.</small>
       </li>
+      <li>
+	<label><input type="checkbox" name="vjs_check_poster" value="1"/> Use existing poster in \'pwg_representative\' folder.</label>
+	<br/><small>Check if there is a poster with the extension .jpg, .jpeg, .png or .gif in the \'pwg_representative\' folder.</small>
+      </li>
     </ul>
     <legend>Thumbnail</legend>
     <ul>
@@ -121,7 +125,7 @@ function vjs_element_set_global_action($action, $collection)
 
 	global $page, $conf, $prefixeTable;
 
-	$query = "SELECT `id`, `file`, `path`
+	$query = "SELECT `id`, `file`, `path`, `representative_ext`
 			FROM ".IMAGES_TABLE."
 			WHERE id IN (".implode(',',$collection).")";
 
@@ -143,6 +147,7 @@ function vjs_element_set_global_action($action, $collection)
 	    'simulate'          => true,
 	    'cat_id'            => 0,
 	    'subcats_included'  => true,
+	    'check_poster'      => false,
 	);
 
 	if(isset($_POST['submit']))
@@ -159,6 +164,7 @@ function vjs_element_set_global_action($action, $collection)
 	        'thumbsec'          => $_POST['vjs_thumbsec'],
 	        'thumbsize'         => $_POST['vjs_thumbsize'],
 	        'simulate'          => false,
+	        'check_poster'      => isset($_POST['vjs_check_poster']),
 	    );
 
 	    // Merge default value with user data from the form
@@ -200,6 +206,7 @@ function vjs_loc_begin_element_set_unit()
 	    'simulate'          => true,
 	    'cat_id'            => 0,
 	    'subcats_included'  => true,
+	    'check_poster'      => false,
 	);
 
 	$collection = explode(',', $_POST['element_ids']);
@@ -220,12 +227,13 @@ function vjs_loc_begin_element_set_unit()
 		    'thumbsec'          => $_POST['vjs_thumbsec-'.$id],
 		    'thumbsize'         => $_POST['vjs_thumbsize-'.$id],
 		    'simulate'          => false,
+		    'check_poster'      => isset($_POST['vjs_check_poster-'.$id]),
 		);
 
 		// Merge default value with user data from the form
 		$sync_options = array_merge($sync_options, $sync_options_form);
 
-		$query = "SELECT `id`, `file`, `path`
+		$query = "SELECT `id`, `file`, `path`, `representative_ext`
 				FROM ".IMAGES_TABLE."
 				WHERE `id`='".$id."';";
 
@@ -292,6 +300,10 @@ function vjs_prefilter_batch_manager_unit($content)
 	<label><input type="checkbox" name="vjs_posteroverlay-{$element.id}" value="1" /> Add film effect</label>
 	<br/><small>Apply an overlay on the poster creation.</small>
       </li>
+      <li>
+	<label><input type="checkbox" name="vjs_check_poster-{$element.id}" value="1"/> Use existing poster in \'pwg_representative\' folder.</label>
+	<br/><small>Check if there is a poster with the extension .jpg, .jpeg, .png or .gif in the \'pwg_representative\' folder.</small>
+      </li>
     </ul>
     <legend>Thumbnail</legend>
     <ul>

admin/admin_photo.php

@@ -77,6 +77,7 @@
     'simulate'          => false,
     'cat_id'            => 0,
     'subcats_included'  => true,
+    'check_poster'      => false,
 );
 
 // Get image details if video type
@@ -109,6 +110,7 @@
 $query = "SELECT * FROM ".$prefixeTable."image_videojs WHERE `id`=".$_GET['image_id'].";";
 $result = pwg_query($query);
 $videojs_metadata = pwg_db_fetch_assoc($result);
+$exif = null;
 if (isset($videojs_metadata) and isset($videojs_metadata['metadata']))
 {
 	$video_metadata = unserialize($videojs_metadata['metadata']);

admin/admin_sync.php

@@ -45,6 +45,7 @@
     'simulate'          => true,
     'cat_id'            => 0,
     'subcats_included'  => true,
+    'check_poster'      => false,
 );
 
 if ( isset($_POST['submit']) and isset($_POST['postersec']) )
@@ -63,6 +64,7 @@
         'simulate'          => isset($_POST['simulate']),
         'cat_id'            => isset($_POST['cat_id']) ? (int)$_POST['cat_id'] : 0,
         'subcats_included'  => isset($_POST['subcats_included']),
+        'check_poster'      => isset($_POST['check_poster']),
     );
 
     // Merge default value with user configuration
@@ -87,15 +89,15 @@
                 $query .= 'id='.$sync_options['cat_id'];
         $cat_ids = array_from_query($query, 'id');
         $query="
-            SELECT `id`, `file`, `path`
+            SELECT `id`, `file`, `path`, `representative_ext`
             FROM ".IMAGES_TABLE." INNER JOIN ".IMAGE_CATEGORY_TABLE." ON id=image_id
             WHERE ". SQL_VIDEOS ." ". $OVERWRITE ."
             AND category_id IN (".implode(',', $cat_ids).")
             GROUP BY id";
     }
     else
     {
-        $query = "SELECT `id`, `file`, `path`
+        $query = "SELECT `id`, `file`, `path`, `representative_ext`
             FROM ".IMAGES_TABLE."
             WHERE ". SQL_VIDEOS ." ". $OVERWRITE .";";
     }

admin/admin_sync.tpl

@@ -156,6 +156,10 @@ Refer to the <a href="https://github.com/xbgmsharp/piwigo-videojs/wiki" target="
 	<a class="showInfo" title="<img src='{$VIDEOJS_PATH}admin/example-frame.jpg'>">i</a>
 	<br/><small>{'SYNC_POSTEROVERLAY_DESC'|@translate}</small>
       </li>
+      <li>
+	<label><input type="checkbox" name="check_poster" value="1" {if $check_poster}checked="checked"{/if}/> {'SYNC_CHECK_POSTER'|@translate}</label>
+	<br/><small>{'SYNC_CHECK_POSTER_DESC'|@translate}</small>
+      </li>
     </ul>
   </fieldset>
 

include/function_sync2.php

@@ -50,7 +50,7 @@
 
 //print_r($sync_options);
 //print_r($sync_binaries);
-if (!$sync_options['metadata'] and !$sync_options['poster'] and !$sync_options['thumb'])
+if (!$sync_options['metadata'] and !$sync_options['poster'] and !$sync_options['check_poster'] and !$sync_options['thumb'])
 {
     $errors[] = "You ask me to do nothing, are you sure?";
 }
@@ -125,7 +125,7 @@
 			//print_r($video_metadata);
 			$exif = array_merge($exif, $video_metadata);
 		}
-		if (!isset($exif['playtime_seconds']))
+		if (!isset($exif['playtime_seconds']) and ($sync_options['poster'] or $sync_options['thumb']))
 		{
 			$warnings[] = "Unable to gather 'playtime_seconds' metadata, you may need to parse metadata first.";
 		}
@@ -202,7 +202,7 @@
 					/* Delete any previous square or thumbnail or small images, avoid duplication on different output format */
 					/* They are now out of date, thumbnail are autogenerate by Piwigo on request */
 					$idata = PWG_DERIVATIVE_DIR . dirname($row['path']) . '/pwg_representative/';
-					$extensions = array('-th.jpg', '-sq.jpg', '-th.png', '-sq.png', '-sm.png', '-sm.png');
+					$extensions = array('-th.jpg', '-sq.jpg', '-th.png', '-sq.png', '-sm.jpg', '-sm.png');
 					foreach ($extensions as $extension)
 					{
 						$ifile = $idata.$file_wo_ext['filename'].$extension;
@@ -224,6 +224,79 @@
             }
         } /* End poster */
 
+        /* Check if there is a poster in the 'pwg_representative' folder and update the DB accordingly */
+        if ($sync_options['check_poster'])
+        {
+            $file_wo_ext = pathinfo($row['path']);
+            if (!isset($file_wo_ext['filename']) or (isset($file_wo_ext['filename']) and strlen($file_wo_ext['filename']) == 0))
+            {
+                $errors[] = "Unable to read filename ".$row['path'];
+                continue;
+            }
+
+            $representative_dir = dirname($row['path']) . '/pwg_representative/';
+            $representative_exists = false;
+            $query = ""; /* default query, do nothing */
+
+            /* check if the representative extension in the DB is correct */
+            if (array_key_exists('representative_ext',$row) and !is_null($row['representative_ext']))
+            {
+                $representative_ext = $row['representative_ext'];
+                $representative = $representative_dir.$file_wo_ext['filename'].'.'.$representative_ext;
+                if (is_file($representative))
+                {
+                    $representative_exists = true;
+                    /* report it */
+                    $sync_arr['poster'] = $representative;
+                    $infos[] = $filename. ' poster: '.$representative;
+                }
+                else
+                {
+                    /* representative does not exist */
+                    $query = "UPDATE ".IMAGES_TABLE." SET representative_ext = NULL WHERE id = ".$row['id'].";";
+
+                    /* Delete any previous square or thumbnail or small images, avoid duplication on different output format */
+					/* They are now out of date, thumbnail are autogenerate by Piwigo on request */
+					$idata = PWG_DERIVATIVE_DIR . dirname($row['path']) . '/pwg_representative/';
+					$extensions = array('-th.'.$representative_ext, '-sq.'.$representative_ext, '-sm.'.$representative_ext);
+					foreach ($extensions as $extension)
+					{
+						$ifile = $idata.$file_wo_ext['filename'].$extension;
+						if(is_file($ifile))
+						{
+							unlink($ifile);
+						}
+					}
+                }
+            }
+
+            if (!$representative_exists)
+            {
+                /* check if there is a representative with one of the following extensions */
+                $representative_extensions = array('jpg','JPG','jpeg','JPEG','png','PNG','gif','GIF');
+                foreach ($representative_extensions as $extension)
+                {
+                    $representative = $representative_dir.$file_wo_ext['filename'].'.'.$extension;
+                    if(is_file($representative))
+                    {
+                        /* representative exists */
+                        $query = "UPDATE ".IMAGES_TABLE." SET representative_ext = '".$extension."' WHERE id = ".$row['id'].";";
+                        /* report it */
+                        $sync_arr['poster'] = $representative;
+                        $infos[] = $filename. ' poster: '.$representative;
+                        break;
+                    }
+                }
+            }
+
+            if (!empty($query) and !$sync_options['simulate'])
+            {
+                /* execute query */
+                pwg_query($query);
+            }
+
+        } /* End check poster  */
+
         /* Create multiple thumbnails */
         if ($sync_options['thumb'])
         {

language/ca_ES/plugin.lang.php

@@ -59,6 +59,8 @@
 $lang['SYNC_POSTEROVERLAY_DESC'] = 'Aplica una superposició a la creació de cartells.';
 $lang['SYNC_POSTEROVERWRITE'] = 'Sobreescriu els cartells existents';
 $lang['SYNC_POSTEROVERWRITE_DESC'] = 'Sobreescriu les miniatures existents amb les noves. Si ho desmarqueu, només s\'haurà d\'executar per a un vídeo nou afegit.';
+$lang['SYNC_CHECK_POSTER'] = 'Utilitzeu el pòster existent a la carpeta \'pwg_representative\'';
+$lang['SYNC_CHECK_POSTER_DESC'] = 'Comproveu si hi ha un pòster amb les extensions .jpg, .jpeg, .png o .gif a la carpeta \'pwg_representative\'.';
 $lang['AUTOPLAY'] = 'Reprodueix automàticament';
 $lang['CONTROLS'] = 'Controls';
 $lang['CUSTOMCSS'] = 'CSS personalitzat';

language/cs_CZ/plugin.lang.php

@@ -40,6 +40,8 @@
 $lang['SYNC_POSTEROVERWRITE'] = 'Přepsat existující náhledy';
 $lang['SYNC_POSTEROVERWRITE_DESC'] = 'Přepsat existující náhledy novými. Pokud je nezatrženo, náhledy by měly být vytvořeny pouze pro nově přidaná videa.';
 $lang['SYNC_POSTER_DESC'] = 'Vytvořit náhled videa v určeném čase.';
+$lang['SYNC_CHECK_POSTER'] = 'Použít existující plakát ve složce \'pwg_representative\'';
+$lang['SYNC_CHECK_POSTER_DESC'] = 'Zkontrolujte, zda je ve složce \'pwg_representative\' plakát s příponou .jpg, .jpeg, .png nebo .gif.';
 $lang['SYNC_THUMBSIZE_DESC'] = 'Velikost v pixelech, doporučuje se vybrat malé rozměry, výchozí nastavení by mělo vyhovovat, Youtube používá 190x68';
 $lang['VOLUME'] = 'Hlasitost';
 $lang['VOLUME_DESC'] = 'Ovladač hlasitosti nastavuje hlasitost, 0 je vypnuto, 1 plně zapnuto, 0,5 je poloviční hlasitost.';

language/da_DK/plugin.lang.php

@@ -59,6 +59,8 @@
 $lang['SYNC_THUMBSIZE'] = 'Størrelse på miniaturebillede';
 $lang['SYNC_THUMBSIZE_DESC'] = 'Størrelse i pixels, hold det småt, standarden er fin. Youtube anvender 190*68.';
 $lang['SYNC_WARNINGS'] = 'Advarsler';
+$lang['SYNC_CHECK_POSTER'] = 'Brug eksisterende plakat i \'pwg_representative\' mappe';
+$lang['SYNC_CHECK_POSTER_DESC'] = 'Kontroller, om der er en plakat med filtypen .jpg, .jpeg, .png eller .gif i mappen \'pwg_representative\'.';
 $lang['VOLUME'] = 'Lydstyrke';
 $lang['VOLUME_DESC'] = 'Lydstyrkevalgmuligheden opsætter lydstyrkeniveauet. 0 betyder slået fra (tavs/mute). 1.0 er maksimal lydstyrke, mens 0.5 er halvvejen.';
 $lang['HEIGHT'] = 'Maksimal højde';

language/de_DE/plugin.lang.php

@@ -61,6 +61,8 @@
 $lang['SYNC_POSTER_DESC'] = 'Erstelle ein Poster des Videos an der angegebenen Position.';
 $lang['SYNC_OUTPUT_DESC'] = 'Wähle das Ausgabeformat für das Poster und das Vorschaubild.';
 $lang['SYNC_POSTER'] = 'Poster erstellen bei Sekunde';
+$lang['SYNC_CHECK_POSTER'] = 'Verwende ein existierendes Poster im Ordner \'pwg_representative\'';
+$lang['SYNC_CHECK_POSTER_DESC'] = 'Überprüfe, ob es im Ordner \'pwg_representative\' ein Poster mit der Erweiterung .jpg, .jpeg, .png oder .gif gibt.';
 $lang['HEIGHT'] = 'Maximale Höhe';
 $lang['LANGUAGE'] = 'Sprache';
 $lang['HEIGHT_DESC'] = 'Das Attribut maximale Höhe legt die maximale Anzeigegrösse des Videos fest. Falls die Video-Breite höher ist, als die maximale Höhe, wird das Video entsprechend auf die maximale Höhe verkleinert.';

language/el_GR/plugin.lang.php

@@ -61,6 +61,8 @@
 $lang['SYNC_OUTPUT'] = 'Μορφή Εξόδου';
 $lang['SYNC_ERRORS'] = 'Σφάλματα';
 $lang['SYNC_INFOS'] = 'Λεπτομερείς πληροφορίες';
+$lang['SYNC_CHECK_POSTER'] = 'Χρησιμοποιήστε την υπάρχουσα αφίσα στο φάκελο \'pwg_representative\'';
+$lang['SYNC_CHECK_POSTER_DESC'] = 'Ελέγξτε αν υπάρχει μια αφίσα με την επέκταση .jpg, .jpeg, .png ή .gif στο φάκελο \'pwg_representative\'.';
 $lang['LANGUAGE_DESC'] = 'Επιλέξτε τη γλώσσα αναπαραγωγής.';
 $lang['LANGUAGE'] = 'Γλώσσα';
 $lang['HEIGHT_DESC'] = 'Το χαρακτηριστικό μέγιστο ύψος καθορίζει το μέγιστο ύψος της οθόνης του βίντεο. Αν το ύψος του βίντεο είναι μεγαλύτερο από το μέγιστο ύψος,το μέγεθος του βίντεο θα συρρικνωθεί στο μέγιστο ύψος.';

language/en_UK/plugin.lang.php

@@ -54,5 +54,6 @@
 $lang['SYNC_THUMBSEC_DESC'] = 'Create a thumbnail every x seconds.';
 $lang['SYNC_THUMBSIZE'] = 'Size of the thumbnail';
 $lang['SYNC_THUMBSIZE_DESC'] = 'Size in pixel, keep it small, default is fine, Youtube use 190x68.';
-
+$lang['SYNC_CHECK_POSTER'] = 'Use existing poster in \'pwg_representative\' folder';
+$lang['SYNC_CHECK_POSTER_DESC'] = 'Check if there is a poster with the extension .jpg, .jpeg, .png or .gif in the \'pwg_representative\' folder.';
 ?>

language/es_ES/plugin.lang.php

@@ -59,6 +59,8 @@
 $lang['SYNC_THUMBSIZE'] = 'Dimensión de la miniatura';
 $lang['SYNC_THUMBSIZE_DESC'] = 'Tamaño en píxeles, que sea pequeña, por defecto está muy bien, el uso en Youtube 190x68 .';
 $lang['SYNC_WARNINGS'] = 'Advertencia';
+$lang['SYNC_CHECK_POSTER'] = 'Utilice el póster existente en la carpeta \'pwg_representative\'';
+$lang['SYNC_CHECK_POSTER_DESC'] = 'Compruebe si hay un póster con la extensión .jpg, .jpeg, .png o .gif en la carpeta \'pwg_representative\'.';
 $lang['VOLUME'] = 'Volumen';
 $lang['VOLUME_DESC'] = 'La opción de volumen ajusta el nivel de volumen. 0 es silenciado, 1,0 es el máximo, 0,5 es la mitad.';
 $lang['LANGUAGE'] = 'Idioma';

language/et_EE/plugin.lang.php

@@ -61,4 +61,6 @@
 $lang['SYNC_INFOS'] = 'Üksikasjalik informatsioon';
 $lang['SYNC_METADATA_DESC'] = 'Asendab andmebaasi informatsiooni video metaandmetega';
 $lang['SYNC_OUTPUT'] = 'Väljundi formaat';
-$lang['SYNC_OUTPUT_DESC'] = 'Vali väljundi formaat postri ja pisipildi jaoks';
+$lang['SYNC_OUTPUT_DESC'] = 'Vali väljundi formaat postri ja pisipildi jaoks';
+$lang['SYNC_CHECK_POSTER'] = 'Utilice el póster existente en la carpeta \'pwg_representative\'';
+$lang['SYNC_CHECK_POSTER_DESC'] = 'Kontrollige, kas kaustas \'pwg_representative\' on plakat laiendiga .jpg, .jpeg, .png või .gif.';

language/fr_FR/plugin.lang.php

@@ -44,6 +44,8 @@
 $lang['SYNC_POSTEROVERWRITE'] = 'Remplace les affiches existantes';
 $lang['SYNC_POSTEROVERWRITE_DESC'] = 'Remplace les affiches existantes par les nouvelles. Si décoché cela sera actif uniquement pour les prochaines vidéos ajoutées. ';
 $lang['SYNC_POSTER_DESC'] = 'Crée une affiche pour la vidéo à la position spécifiée. ';
+$lang['SYNC_CHECK_POSTER'] = 'Utiliser l\'affiche existante dans le dossier \'pwg_representative\'';
+$lang['SYNC_CHECK_POSTER_DESC'] = 'Vérifiez s\'il y a une affiche avec l\'extension .jpg, .jpeg, .png ou .gif dans le dossier \'pwg_representative\'.';
 $lang['HEIGHT_DESC'] = 'L\'attribut hauteur max désigne la hauteur maximum affichée pour la vidéo. Si la hauteur de la vidéo dépasse cette taille, elle sera réduit à cette limite.';
 $lang['HEIGHT'] = 'Hauteur max';
 $lang['LANGUAGE'] = 'Langue';

language/hu_HU/plugin.lang.php

@@ -55,6 +55,8 @@
 $lang['SYNC_THUMBSEC'] = 'Készítsen bélyegképet minden másodperceben. ';
 $lang['SYNC_THUMBSEC_DESC'] = 'Készítsen bélyegképet minden x másodpercben. ';
 $lang['SYNC_POSTER_DESC'] = 'Készítsen plakátot a videóból egy meghatározott helyről. ';
+$lang['SYNC_CHECK_POSTER'] = 'Használja a meglévő posztert a \'pwg_representative\' mappában';
+$lang['SYNC_CHECK_POSTER_DESC'] = 'Ellenőrizze, hogy van-e egy .jpg, .jpeg, .png vagy .gif kiterjesztésű poszter a \'pwg_representative\' mappában.';
 $lang['LANGUAGE_DESC'] = 'Válassza ki a lejátszó nyelvét';
 $lang['LANGUAGE'] = 'Nyelv';
 $lang['HTML5'] = 'HTML5 videó cimke beállítások';

language/it_IT/plugin.lang.php

@@ -61,6 +61,8 @@
 $lang['SYNC_OUTPUT_DESC'] = 'Selezionare il formato di output per il manifesto e la miniatura.';
 $lang['SYNC_POSTER_DESC'] = 'Crea un poster dal video nella posizione specificata';
 $lang['SYNC_POSTER'] = 'Creare un poster in seconda posizione';
+$lang['SYNC_CHECK_POSTER'] = 'Usa poster esistente in \'pwg_representative\' folder';
+$lang['SYNC_CHECK_POSTER_DESC'] = 'Controlla se c\'è un poster con l\'estensione .jpg, .jpeg, .png o .gif nella cartella \'pwg_representative\'.';
 $lang['HEIGHT_DESC'] = 'L\'attributo altezza max imposta l\'altezza massima di visualizzazione del video. Se l\'altezza del video è più grande di altezza massima, essa sarà rimpicciolita alla massima altezza.';
 $lang['LANGUAGE_DESC'] = 'Seleziona la lingua giocatore.';
 $lang['LANGUAGE'] = 'Lingua';

language/lv_LV/plugin.lang.php

@@ -61,6 +61,8 @@
 $lang['SYNC_OUTPUT'] = 'Izejošais formāts';
 $lang['SYNC_INFOS'] = 'Detalizēta informācija';
 $lang['SYNC_ERRORS'] = 'Kļūdas';
+$lang['SYNC_CHECK_POSTER'] = 'Izmantojiet esošo plakātu mapē \'pwg_representative\'';
+$lang['SYNC_CHECK_POSTER_DESC'] = 'Pārbaudiet, vai mapē \'pwg_representative\' ir plakāts ar paplašinājumu .jpg, .jpeg, .png vai .gif.';
 $lang['HEIGHT_DESC'] = 'Max augstuma atribūts nosaka maksimālo displeja augstumu priekš video. Ja video augstums ir lielāks nekā maksimālais augstums, tas reducē video izmēru uz maksimālo displeja augstumu.';
 $lang['LANGUAGE_DESC'] = 'Spēlētāja valodas izvēle';
 $lang['LANGUAGE'] = 'Valoda';

language/nb_NO/plugin.lang.php

@@ -61,6 +61,8 @@
 $lang['SYNC_THUMBSEC_DESC'] = 'Lag et miniatyrbilde hvert x antall sekunder';
 $lang['SYNC_THUMBSEC'] = 'Lag et miniatyrbilde hvert sekund';
 $lang['SYNC_POSTER_DESC'] = 'Lag en plakat fra videoen og angi posisjon.';
+$lang['SYNC_CHECK_POSTER'] = 'Bruk eksisterende plakat i \'pwg_representative\' mappe';
+$lang['SYNC_CHECK_POSTER_DESC'] = 'Sjekk om det er en plakat med filtypen .jpg, .jpeg, .png eller .gif i mappen \'pwg_representative\'.';
 $lang['HEIGHT_DESC'] = 'Maks høyde valget angir maksimal visningshøyden på videoen. Hvis videohøyden er større enn maks høyde, vil den nedskalere videostørrelsen til maks høyde.';
 $lang['HEIGHT'] = 'Maks høyde';
 $lang['LANGUAGE'] = 'Språk';