From 348187365320d5da15842df22d300e255c6dd33f Mon Sep 17 00:00:00 2001 From: profiteroles Date: Sun, 29 Sep 2019 07:07:05 -0700 Subject: [PATCH] 0.4.1 --- CHANGELOG.md | 1 + README.md | 3 ++- Rollup.app.zip | Bin 3963228 -> 3963509 bytes Rollup.php | 10 +++++++--- functions.php | 14 ++++++++++++++ 5 files changed, 24 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c028d41..28a4f32 100644 --- a/CHANGELOG.md +++ b/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 \ No newline at end of file diff --git a/README.md b/README.md index 6225984..7db7c9b 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,8 @@ **%DTO** Timestamp (with fallback to file modification date) **%DUR** Video Duration (formatted) **%SW** Software (formatted) -**%MODEL** Digital Camera Model +**%MODEL** Digital Camera Model +**%LENS** Lens (formatted) **%PLACE** Formatted location (from GPS coordinates) ## Screenshots diff --git a/Rollup.app.zip b/Rollup.app.zip index d57ef4b6778ec42d359374c414a51cb245bb16e2..4bafd3f4ee2f41358c986259ffd7cc2a9e0cb909 100644 GIT binary patch delta 13274 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 ZSU)siI=nyPFKWj_v3#WRTNp55{}0EX&ujny diff --git a/Rollup.php b/Rollup.php index 7356d3b..c53669a 100755 --- a/Rollup.php +++ b/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'])) { @@ -160,7 +162,9 @@ foreach ($files as $file) { } } } - + + if ($p['debug_lens']) { echo "\n".@$e['LensModel']."\n".@$e['FocalLength']."\n"; } + echo updateProgress($i,count($files)); $i++; diff --git a/functions.php b/functions.php index 28ea43a..ffb016a 100755 --- a/functions.php +++ b/functions.php @@ -1,5 +1,19 @@ 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'];