Commit Graph

2110 Commits

Author SHA1 Message Date
Bharat Mediratta
7c6276adb9 Deal with the user-entered g2 embed.php path a little more sanely so that if the user enters the path to G2 itself, we find the embed.php path from there. 2009-05-12 21:48:29 +00:00
Bharat Mediratta
b1ea27a1b9 Beautify the status text 2009-05-12 21:41:45 +00:00
Bharat Mediratta
df3a1e730e Skip the copy if the watermark module is enabled *and* there's a watermark. 2009-05-12 05:56:27 +00:00
Bharat Mediratta
fdb17d75ce Import keywords as tags.
Refactor the general flow of g2_import_task::import() to simplify it
and make it more sensible.  It had gotten a little overgrown.  It's
still a little overgrown, but I don't see an easy way to simplify it
from here.
2009-05-12 05:48:15 +00:00
Bharat Mediratta
c397cc73be Don't divide by zero if there are no photos in the Gallery. 2009-05-12 04:22:05 +00:00
Bharat Mediratta
8ae6a7a144 Import tags. 2009-05-12 04:04:26 +00:00
Bharat Mediratta
61ad68f1e6 Deal gracefully with the case that the Gallery 2 instance didn't have
any resizes (or thumbnails).

Fix a case where we were over-weighting the max dimension for square
resizes and thumbs.
2009-05-12 02:12:39 +00:00
Bharat Mediratta
5dbe1e59d8 Add has_thumb() public API method 2009-05-11 20:17:03 +00:00
Bharat Mediratta
a70cbed1d0 Import comments. This was a lot easier than I thought it would be 2009-05-11 20:16:54 +00:00
Bharat Mediratta
de812e1e82 Refactor to support pagination and simplify the code.
- Simplify the public controller methods
- Fix a bug where missing thumbnails would cause a divide by zero error
- actually pay attention to the page # for pagination and limit the query accordingly.
2009-05-11 20:15:24 +00:00
Bharat Mediratta
a2c188ac37 Update exif lib to upstream r3901 which resolves the following tickets:
http://www.zenphoto.org/trac/ticket/1117
  http://www.zenphoto.org/trac/ticket/1118
2009-05-11 19:19:13 +00:00
Tim Almdal
010c355ecf Fix for #226 2009-05-11 18:13:19 +00:00
Bharat Mediratta
74b8937963 Framework for importing comments -- we don't actually do the import yet 2009-05-11 17:57:34 +00:00
Bharat Mediratta
62053b2c5c Add some comments 2009-05-11 16:38:58 +00:00
Bharat Mediratta
6ec24f2f00 Don't attempt to interact with comments if the Gallery2 comment module is not installed.
Resolves ticket #276
2009-05-11 16:27:52 +00:00
Tim Almdal
11477cbc3e Correct the reference to $item->id 2009-05-11 14:32:18 +00:00
Tim Almdal
784b3aa34a Save and Restore the $_POST variable in tests that manipulate it so
other tests don't fail unexpectedly
2009-05-11 14:31:07 +00:00
Bharat Mediratta
8b33371e99 Index photos as they're added 2009-05-11 05:18:23 +00:00
Bharat Mediratta
891930ec2b Don't accept negative capture dates from EXIF, they're probably just crap data. 2009-05-11 04:22:50 +00:00
Bharat Mediratta
977d0da9f3 Refactor the exif module to denormalize the stored data. This way we
have a single exif_record for each item instead of 1 per key.  It's
about 5x faster to scan photos this way.
2009-05-11 03:53:44 +00:00
Bharat Mediratta
b706cb69ac Reinstate abortCount code, originally added to exifer in G2:
http://gallery.svn.sourceforge.net/viewvc/gallery?view=rev&revision=13422

it was commented out in the ZenPhoto version.  Filed upstream ticket
about this:
  http://www.zenphoto.org/trac/ticket/1118
2009-05-11 02:37:12 +00:00
Bharat Mediratta
6dbd8aa002 Don't use ORM to delete old exif_keys.. it's too inefficient 2009-05-11 02:35:43 +00:00
Bharat Mediratta
8c776ffa6f Add a cache in intel2Moto(). Because of the duplicate nature of the
calls to this function, this is a 1-2x order of magnitude performance
improvement.
2009-05-11 01:36:36 +00:00
Bharat Mediratta
bc9bf5aa61 Avoid using ORM_MPTT::parents() in relative_path() so that we're not
calling ORM just to get paths.  This is a 10x performance increase.
2009-05-11 00:19:50 +00:00
Bharat Mediratta
e947e771d3 remove_rule() should mark thumbs/resizes dirty also. Resolves ticket #269, thanks jstricker! 2009-05-10 21:57:09 +00:00
Bharat Mediratta
fbcb01caca Only run copy_matching_thumbnails_and_resizes() when we're doing an import, else it interferes with thumbnail/resize generation during regular imports 2009-05-10 21:46:58 +00:00
Bharat Mediratta
b8d3478b95 Beautify the error message. 2009-05-10 21:32:27 +00:00
Bharat Mediratta
c14194ab2d Warn users if they have suhosin.session.encrypt enabled that it'll break the uploader 2009-05-10 20:54:15 +00:00
Bharat Mediratta
99da170def Document why we skip the parent state for the root album. 2009-05-10 20:16:18 +00:00
Bharat Mediratta
31f0839f9b Don't provide full-size link if the user can't see the full size
image.  There's no security hole here, it's just a bad user
experience.
2009-05-10 20:02:40 +00:00
Bharat Mediratta
afa4a8acca After ajax login, just reload the current page. 2009-05-10 19:57:58 +00:00
Bharat Mediratta
8ba9480819 Disable default sorting for performance. (thanks Romain LE DISEZ) 2009-05-10 19:00:28 +00:00
Bharat Mediratta
57ef43afdb Change TINYINT(2) to SMALLINT for compliance (thanks Romain LE DISEZ) 2009-05-10 18:56:49 +00:00
Bharat Mediratta
ce137d7bdc Change wording to avoid breaking File_Structure_Test 2009-05-10 18:52:08 +00:00
Bharat Mediratta
cc0fcc8961 Use a clearer query syntax for deleting extra search and exif records (thanks Romain LE DISEZ) 2009-05-10 18:44:03 +00:00
Bharat Mediratta
e6d3d42c22 Make the code that copies g2 derivatives more robust if the g2 data file doesn't exist. 2009-05-10 04:04:33 +00:00
Bharat Mediratta
0872cce1ea Fix a bug where when we copied over the g2 thumb or resize, we weren't
saving its dimensions to the item.

Also, import originationTimestamp as captured field.
2009-05-10 01:11:16 +00:00
Bharat Mediratta
99b7cdeee1 Fix a copy/paste typo. 2009-05-10 00:13:39 +00:00
Tim Almdal
3969145a36 Move the thumb_proportion method into Theme_View and set it by default
if the page type is album.
Leave a todo if we ever set up a theme default API
2009-05-09 22:22:30 +00:00
Tim Almdal
e2d03c63fb Remove quotes and correct typo 2009-05-09 21:59:32 +00:00
Bharat Mediratta
a43c57bf61 Sigh.. fix it the *right* way. 2009-05-09 21:13:59 +00:00
Bharat Mediratta
8c611fdc1b Oops, add in a missing ] (thanks kb7sei!) 2009-05-09 21:11:55 +00:00
Bharat Mediratta
6b00aa70e0 Don't try to put g2_stats and g2_size into the view if g2 is not initialized. 2009-05-09 20:18:24 +00:00
Bharat Mediratta
1bfbae15f6 Usability and performance improvements
Significantly speed up the process by copying Gallery2 thumbnails and
resizes wherever possible instead of regenerating them.  This requires
us to figure out the dimensions of the original G2 derivative and make
sure that it matches in some reasonable way.

To allow users to take advantage of this, calculate the optimal thumb
and resize size to set in G3 to match what was used in G2.  While
we're at it, give the user some idea of how much data is available in
G2 to import.
2009-05-09 19:03:00 +00:00
Bharat Mediratta
db465072f5 Fix indentation. 2009-05-09 17:45:33 +00:00
Chad Kieffer
a05451ef34 Apply status message display effect to admin theme. Use double rather than single quotes in JS. 2009-05-09 17:17:17 +00:00
Bharat Mediratta
99ca6133b0 Force the 'GD Version' key to exist 2009-05-09 16:37:03 +00:00
Chad Kieffer
853c00cde0 Highlight status messages on load, fade them out after a few seconds. Make success green brighter. 2009-05-09 07:10:36 +00:00
Tim Almdal
48ee3d5fe8 Fix for ticket #217 2009-05-09 06:11:17 +00:00
Tim Almdal
9dccbe0d36 Fix for ticket #255
2nd iteration
2009-05-09 05:42:06 +00:00