From c3434fc10cdb7fc8dad57545532c76e893f3c3d3 Mon Sep 17 00:00:00 2001 From: Chad Parry Date: Sat, 23 Apr 2011 22:52:43 -0600 Subject: [PATCH 01/10] Update a deprecated method and poor preg syntax so that the Keep Original module will work. --- 3.0/modules/keeporiginal/helpers/keeporiginal_event.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3.0/modules/keeporiginal/helpers/keeporiginal_event.php b/3.0/modules/keeporiginal/helpers/keeporiginal_event.php index 8febcb35..a5c29d3f 100644 --- a/3.0/modules/keeporiginal/helpers/keeporiginal_event.php +++ b/3.0/modules/keeporiginal/helpers/keeporiginal_event.php @@ -26,7 +26,7 @@ class keeporiginal_event_Core { // Figure out where the original copy should be stashed at. $temp_path = str_replace(VARPATH . "albums/", "", $input_file); $original_image = VARPATH . "original/" . $temp_path; - $individual_dirs = split("[/\]", "original/" . $temp_path); + $individual_dirs = preg_split("|[/\\\\]|", "original/" . $temp_path); // If any original file does not already exist, then create a folder structure // similar to that found in VARPATH/albums/ and copy the photo over before // rotating it. From f7bf9b3c89ef001b9db1d8c0e5ebe08223d721d9 Mon Sep 17 00:00:00 2001 From: Chad Parry Date: Sat, 23 Apr 2011 23:12:35 -0600 Subject: [PATCH 02/10] Extend the Keep Original module so that it is triggered by updated data files. --- 3.0/modules/keeporiginal/helpers/keeporiginal_event.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/3.0/modules/keeporiginal/helpers/keeporiginal_event.php b/3.0/modules/keeporiginal/helpers/keeporiginal_event.php index a5c29d3f..b026aee1 100644 --- a/3.0/modules/keeporiginal/helpers/keeporiginal_event.php +++ b/3.0/modules/keeporiginal/helpers/keeporiginal_event.php @@ -20,7 +20,10 @@ class keeporiginal_event_Core { static function graphics_rotate($input_file, $output_file, $options) { // Make a copy of the original fullsized image before rotating it. + self::preserve($input_file); + } + static function preserve($input_file) { // If $input_file is located in VARPATH/albums/ then assume its a fullsize photo. if (strncmp($input_file, VARPATH . "albums/", strlen(VARPATH . "albums/")) == 0) { // Figure out where the original copy should be stashed at. @@ -71,6 +74,9 @@ class keeporiginal_event_Core { // VARPATH/original/ as well. if ($old->is_photo() || $old->is_album()) { + if (isset($new->data_file)) { + self::preserve($old->file_path()); + } if ($old->file_path() != $new->file_path()) { $old_original = VARPATH . "original/" . str_replace(VARPATH . "albums/", "", $old->file_path()); $new_original = VARPATH . "original/" . str_replace(VARPATH . "albums/", "", $new->file_path()); From ea0fd6e1feec3513fff7e228c7e6e83f8ec73d24 Mon Sep 17 00:00:00 2001 From: Chad Parry Date: Sun, 24 Apr 2011 08:10:22 -0600 Subject: [PATCH 03/10] Use the new get_data_file() helper instead of reaching inside the item. --- 3.0/modules/keeporiginal/helpers/keeporiginal_event.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/3.0/modules/keeporiginal/helpers/keeporiginal_event.php b/3.0/modules/keeporiginal/helpers/keeporiginal_event.php index b026aee1..982eb808 100644 --- a/3.0/modules/keeporiginal/helpers/keeporiginal_event.php +++ b/3.0/modules/keeporiginal/helpers/keeporiginal_event.php @@ -74,8 +74,9 @@ class keeporiginal_event_Core { // VARPATH/original/ as well. if ($old->is_photo() || $old->is_album()) { - if (isset($new->data_file)) { - self::preserve($old->file_path()); + $data_file = $new->get_data_file(); + if (isset($data_file)) { + self::preserve($old->file_path()); } if ($old->file_path() != $new->file_path()) { $old_original = VARPATH . "original/" . str_replace(VARPATH . "albums/", "", $old->file_path()); From 4a604d1d4cb47898c22c92b6264bd24f8052d032 Mon Sep 17 00:00:00 2001 From: Chad Parry Date: Sun, 24 Apr 2011 08:22:32 -0600 Subject: [PATCH 04/10] Mark an internal helper method as private. --- 3.0/modules/keeporiginal/helpers/keeporiginal_event.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/3.0/modules/keeporiginal/helpers/keeporiginal_event.php b/3.0/modules/keeporiginal/helpers/keeporiginal_event.php index 982eb808..5652bee6 100644 --- a/3.0/modules/keeporiginal/helpers/keeporiginal_event.php +++ b/3.0/modules/keeporiginal/helpers/keeporiginal_event.php @@ -20,10 +20,10 @@ class keeporiginal_event_Core { static function graphics_rotate($input_file, $output_file, $options) { // Make a copy of the original fullsized image before rotating it. - self::preserve($input_file); + self::_preserve($input_file); } - static function preserve($input_file) { + static function _preserve($input_file) { // If $input_file is located in VARPATH/albums/ then assume its a fullsize photo. if (strncmp($input_file, VARPATH . "albums/", strlen(VARPATH . "albums/")) == 0) { // Figure out where the original copy should be stashed at. @@ -76,7 +76,7 @@ class keeporiginal_event_Core { if ($old->is_photo() || $old->is_album()) { $data_file = $new->get_data_file(); if (isset($data_file)) { - self::preserve($old->file_path()); + self::_preserve($old->file_path()); } if ($old->file_path() != $new->file_path()) { $old_original = VARPATH . "original/" . str_replace(VARPATH . "albums/", "", $old->file_path()); From 24426ac6ee959e83550168f693a5c5d79d1261e2 Mon Sep 17 00:00:00 2001 From: Chad Parry Date: Sun, 24 Apr 2011 08:53:42 -0600 Subject: [PATCH 05/10] Add a TODO to point out that the original's extension shouldn't be changed. --- 3.0/modules/keeporiginal/helpers/keeporiginal_event.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/3.0/modules/keeporiginal/helpers/keeporiginal_event.php b/3.0/modules/keeporiginal/helpers/keeporiginal_event.php index 5652bee6..513cb606 100644 --- a/3.0/modules/keeporiginal/helpers/keeporiginal_event.php +++ b/3.0/modules/keeporiginal/helpers/keeporiginal_event.php @@ -112,6 +112,7 @@ class keeporiginal_event_Core { } // Move the file to its new location. + // TODO: If the files have different extensions, then the old extension should be preserved. @rename($old_original, $new_original); } } @@ -135,4 +136,4 @@ class keeporiginal_event_Core { } } } -} \ No newline at end of file +} From 8bd3f87286f846f305e96263b6fba8590d4304ea Mon Sep 17 00:00:00 2001 From: Chad Parry Date: Wed, 27 Apr 2011 20:50:59 -0600 Subject: [PATCH 06/10] Remove a newline at the end of the file that I accidentally introduced. --- 3.0/modules/keeporiginal/helpers/keeporiginal_event.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3.0/modules/keeporiginal/helpers/keeporiginal_event.php b/3.0/modules/keeporiginal/helpers/keeporiginal_event.php index 513cb606..8ea7b808 100644 --- a/3.0/modules/keeporiginal/helpers/keeporiginal_event.php +++ b/3.0/modules/keeporiginal/helpers/keeporiginal_event.php @@ -136,4 +136,4 @@ class keeporiginal_event_Core { } } } -} +} \ No newline at end of file From 77b4baa3f54ff18398c24dd0cf1135519c247d1f Mon Sep 17 00:00:00 2001 From: Chad Parry Date: Sat, 30 Apr 2011 18:11:39 -0600 Subject: [PATCH 07/10] The data_file field is public, so we don't need to use an accessor method. --- 3.0/modules/keeporiginal/helpers/keeporiginal_event.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/3.0/modules/keeporiginal/helpers/keeporiginal_event.php b/3.0/modules/keeporiginal/helpers/keeporiginal_event.php index 8ea7b808..dcae2b83 100644 --- a/3.0/modules/keeporiginal/helpers/keeporiginal_event.php +++ b/3.0/modules/keeporiginal/helpers/keeporiginal_event.php @@ -74,7 +74,7 @@ class keeporiginal_event_Core { // VARPATH/original/ as well. if ($old->is_photo() || $old->is_album()) { - $data_file = $new->get_data_file(); + $data_file = $new->data_file; if (isset($data_file)) { self::_preserve($old->file_path()); } @@ -136,4 +136,4 @@ class keeporiginal_event_Core { } } } -} \ No newline at end of file +} From 9fc26a288e5c602a42f649e798a511486eeb06ed Mon Sep 17 00:00:00 2001 From: Chad Parry Date: Thu, 28 Jul 2011 00:20:23 -0600 Subject: [PATCH 08/10] Remove a newline at the end of the file that I accidentally introduced again! --- 3.0/modules/keeporiginal/helpers/keeporiginal_event.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3.0/modules/keeporiginal/helpers/keeporiginal_event.php b/3.0/modules/keeporiginal/helpers/keeporiginal_event.php index dcae2b83..56a26bcb 100644 --- a/3.0/modules/keeporiginal/helpers/keeporiginal_event.php +++ b/3.0/modules/keeporiginal/helpers/keeporiginal_event.php @@ -136,4 +136,4 @@ class keeporiginal_event_Core { } } } -} +} \ No newline at end of file From 285f2862346f4ae8761e788fff50854da636c4eb Mon Sep 17 00:00:00 2001 From: Chad Parry Date: Thu, 28 Jul 2011 00:41:23 -0600 Subject: [PATCH 09/10] Avoid "self::" because Kohana can't override it. --- 3.0/modules/keeporiginal/helpers/keeporiginal_event.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/3.0/modules/keeporiginal/helpers/keeporiginal_event.php b/3.0/modules/keeporiginal/helpers/keeporiginal_event.php index 56a26bcb..aa7a0f0a 100644 --- a/3.0/modules/keeporiginal/helpers/keeporiginal_event.php +++ b/3.0/modules/keeporiginal/helpers/keeporiginal_event.php @@ -20,7 +20,7 @@ class keeporiginal_event_Core { static function graphics_rotate($input_file, $output_file, $options) { // Make a copy of the original fullsized image before rotating it. - self::_preserve($input_file); + keeporiginal_event_Core::_preserve($input_file); } static function _preserve($input_file) { @@ -76,7 +76,7 @@ class keeporiginal_event_Core { if ($old->is_photo() || $old->is_album()) { $data_file = $new->data_file; if (isset($data_file)) { - self::_preserve($old->file_path()); + keeporiginal_event_Core::_preserve($old->file_path()); } if ($old->file_path() != $new->file_path()) { $old_original = VARPATH . "original/" . str_replace(VARPATH . "albums/", "", $old->file_path()); @@ -136,4 +136,4 @@ class keeporiginal_event_Core { } } } -} \ No newline at end of file +} From 522f85e071a5d76493dd11bd43a3e62aea29469f Mon Sep 17 00:00:00 2001 From: Chad Parry Date: Thu, 28 Jul 2011 00:51:00 -0600 Subject: [PATCH 10/10] Remove a trailing newline again! --- 3.0/modules/keeporiginal/helpers/keeporiginal_event.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3.0/modules/keeporiginal/helpers/keeporiginal_event.php b/3.0/modules/keeporiginal/helpers/keeporiginal_event.php index aa7a0f0a..f9356571 100644 --- a/3.0/modules/keeporiginal/helpers/keeporiginal_event.php +++ b/3.0/modules/keeporiginal/helpers/keeporiginal_event.php @@ -136,4 +136,4 @@ class keeporiginal_event_Core { } } } -} +} \ No newline at end of file