Commit Graph
30 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 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 a70cbed1d0 Import comments. This was a lot easier than I thought it would be 2009-05-11 20:16:54 +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
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 ce137d7bdc Change wording to avoid breaking File_Structure_Test 2009-05-10 18:52:08 +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 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 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 934bc1e1f1 Add debug log strings with the G2 stack trace when there's a failure in a g2 call. 2009-05-07 00:46:35 +00:00
Bharat Mediratta e83b980d3d Don't fail when trying to import site admin group. Resolves ticket #249 2009-05-06 04:08:45 +00:00
Bharat Mediratta 2846e0df8b Return an array from available_tasks() when unconfigured.
Fixes ticket #247.
2009-05-05 03:56:42 +00:00
Bharat Mediratta e70be4c0c2 Cache the entry in our in-memory map when we map a g2 item to a g3
item in the database.  This fixes the problem that the import fails
the first time around because the various groups are mapped in the db
but aren't available in the request.
2009-05-02 21:52:46 +00:00
Bharat Mediratta 1173b21f95 Fix bug in the item_before_delete() event handler 2009-04-23 04:53:19 +00:00
Bharat Mediratta 38b5c02cfc Remember to import album highlights 2009-04-23 02:46:53 +00:00
Bharat Mediratta 98d085e55f Minor cleanups:
* Delete g2_map records when the corresponding item is removed.
* Improve text on g2 import settings page
* Minor comment fixes.
2009-04-22 19:49:27 +00:00
Bharat Mediratta 201e8cdf70 Highlight: we can now import photos and movies.
Notes:
* Don't store the g2->g3 map in the task; it gets too large and
  overflows the context column.
* Import album sort orders
* Try to treat duplication in the summary and description fields
  sensibly.
* Move the g2 import config page under the Settings menu
* Clean up the settings page slightly and send users to the
  maintenance page to do the actual import (not an optimal UI, but it
  works).
2009-04-21 04:21:34 +00:00
Bharat Mediratta a8d60021ea import album owners and be a little smarter about summary/description duplication 2009-04-19 00:58:56 +00:00
Bharat Mediratta e7ba49b69c Properly import groups and put users into groups. Mark admin users
appropriately.
2009-04-18 23:10:57 +00:00
Bharat Mediratta a3e8818449 Track what we've already imported in the G2_Map_Model and keep it
around in the task so that on subsequent import runs we don't try to
reimport stuff we've already pulled in.  This also gives us a mapping
so that we will be able to translate old G2 urls into the hot new G3
urls.
2009-04-18 04:27:04 +00:00
Bharat Mediratta ff5afeb714 Import albums. Just the basics; misses permissions and a lot of
metadata, and doesn't import photos yet.
2009-04-17 09:05:12 +00:00
Bharat Mediratta a7f345476f Very early round of Gallery 2 import code. It can import users (with
the wrong password) and import groups, with a basic UI.  Needs a ton
more work.
2009-04-15 07:23:22 +00:00