0.4.1

CHANGELOG.md

@@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
 
 ## [0.4.1]
 - Better delimiter support
+- %LENS tag
 
 ## [0.4.0]
 - Initial repo version

README.md

@@ -20,6 +20,7 @@
 **%DUR** Video Duration (formatted)  
 **%SW** Software (formatted)  
 **%MODEL** Digital Camera Model
+**%LENS** Lens (formatted)   
 **%PLACE** Formatted location (from GPS coordinates)  
 
 ## Screenshots

Rollup.php

@@ -25,9 +25,10 @@ $p['vfiletypes'] = array("mov","mp4","m4v");
 $p['screenshot_dims'] = array(320,640,750,828,1125,1242);
 $p['delimiters'] = array(" ","_","-","+");
 
-// Enable this option to verify newnames against those made with a prior version of rollup
+// Debug options
 
-$p['debug_verify_names'] = 0;
+$p['debug_verify_names'] = 0; // Verify newnames against those made with a prior version of rollup
+$p['debug_lens'] = 0;  // Output raw lens data to verify formatting
 
 // No files dragged
 
@@ -119,6 +120,7 @@ foreach ($files as $file) {
 		$z['%DUR'] = formatDuration($e);
 		$z['%SW'] = formatSoftware($e,$p);
 		$z['%MODEL'] = formatModel($e);
+		$z['%LENS'] = formatLens($e);
 		$z['%PLACE'] = formatPlace($e,$p);
 	
 		if (in_array($ext,$p['pfiletypes'])) {
@@ -161,6 +163,8 @@ foreach ($files as $file) {
 				}
 			}
 		
+		if ($p['debug_lens']) { echo "\n".@$e['LensModel']."\n".@$e['FocalLength']."\n"; }
+		
 		echo updateProgress($i,count($files));
 		$i++;
 

functions.php

@@ -1,5 +1,19 @@
 <?php
 
+function formatLens($e) {
+	if (!@$e['FocalLength'] || !@$e['FocalLength'] == "0.0 mm") { return ""; }
+	$fl = str_replace(" mm","",$e['FocalLength']);
+	if ($fl < 10) {
+		// this is a micro lens, perform fl conversion
+		$fl = $fl*9;
+		}
+	$string = "Wide";
+	if ($fl > 25) { $string = "Normal"; }
+	if ($fl > 50) { $string = "Tele"; }
+	if (strpos(@$e['LensModel']," front ") != false) { $string = "Front"; }
+	return $string;
+	}
+	
 function formatDateTime($e) {
 	if (@$e['DateTimeOriginal']) {
 		$dto = $e['DateTimeOriginal'];