Commit Graph

47 Commits

Author SHA1 Message Date
Bharat Mediratta
53284ec5b8 Add support for Gallery 2.2.2 style bootstrap syntax. 2009-06-23 18:39:00 -07:00
Bharat Mediratta
8383ea9827 Keywords in G2 are free form. So we don't know what our user used as a separator. Try to
be smart about it.  If we see a comma or a semicolon, expect the keywords to be separated
by that delimeter.  Otherwise, use space as the delimiter.

Fixes ticket #446
2009-06-20 16:55:09 -07:00
Bharat Mediratta
b999b35d24 Swap the order of two lines to make the debug output have the right data. 2009-06-19 10:30:59 -07:00
Bharat Mediratta
cdb02c10a4 Make an attempt to catch all situations where loading an item from G2
returns an error, and log them appropriately.  This should fix a slew
of import failures from corrupt G2 installs.
2009-06-18 12:24:33 -07:00
Bharat Mediratta
b8c68ce2f9 Don't try to require GalleryCommentHelper.class if the module is not
active, since the code may not even be present.  This assumes that if
the G2 comment module *is* active that the code is present, but that's
part of the assumption that the G2 we're importing from is healthy.

Fixes ticket #409
2009-06-15 19:59:46 -07:00
Bharat Mediratta
dc3ed06cd7 Trap gallery2 errors when we try to load an invalid user id and abort loading that user. 2009-06-14 12:43:06 -07:00
Bharat Mediratta
e076433383 Support imports from multisite G2 installs. 2009-06-12 18:08:14 -07:00
Bharat Mediratta
6749a835e7 Work around different initialization code in earlier versions of Gallery 2. 2009-06-12 12:00:09 -07:00
Bharat Mediratta
ae2fb806c7 Trap exceptions from movie::create() and mark those movies as corrupt. 2009-06-11 12:48:36 -07:00
Bharat Mediratta
c7aafef852 Improve error handling support for corrupt images and report them
appropriately in g2_import.
2009-06-07 17:48:42 -07:00
Bharat Mediratta
1a095fffe5 Prepend all code files we copy from Gallery2 and put into var with our
code preamble for security.

Update File_Structure_Test::code_files_start_with_preamble_test to
check all the php files in var, too.
2009-05-28 02:19:53 -07:00
Bharat Mediratta
6fdc84f5de Get rid of entire gallery2 session id param from the urls that we use to alert
users about images that failed to import.
2009-05-28 01:45:39 -07:00
Bharat Mediratta
3870892018 Commit an egregious hack to work around the fact that both Gallery 2
and Gallery 3 have a class named Gallery.  Clone a subset of the
Gallery 2 files and munge them so that we can rename the Galery 2
version to G2_Gallery.

Also, update the disclaimer in Admin > Settings > Gallery 2 Import.
2009-05-27 22:57:38 -07:00
Bharat Mediratta
88a3d43ba9 Update all references to the core application to now point to the
gallery module.  This type of mass update is prone to some small bugs.
2009-05-27 16:17:29 -07:00
Bharat Mediratta
7aed923908 Restructure the module lifecycle.
Install: <module>_installer::install() is called, any necessary tables
are created.

Activate: <module>_installer::activate() is called.  Module
controllers are routable, helpers are accessible, etc.  The module is
in use.

Deactivate: <module>_installer::deactivate() is called.  Module code
is not accessible or routable.  Module is *not* in use, but its tables
are still around.

Uninstall: <module>_installer::uninstall() is called.  Module is
completely removed from the database.

Admin > Modules will install and activate modules, but will only
deactivate (will NOT uninstall modules).
2009-05-26 05:28:59 +00:00
Bharat Mediratta
dc3df4d6ac Don't import non-viewable image types (eg: psd). Swap in a broken
image instead so that we at least have a target for comments.

Fixes ticket #294
2009-05-20 04:25:10 +00:00
Bharat Mediratta
170e9d6462 Import album highlights. Fixes ticket #221. 2009-05-19 07:31:21 +00:00
Bharat Mediratta
ad347c0456 If there's a missing source image during import, swap in our "broken
image" placeholder and keep on trucking.  Oh, and notify the admin.

Fixes ticket #287
2009-05-19 03:54:33 +00:00
Bharat Mediratta
5495037a3d Gee it's May already. Update copyright to 2009. 2009-05-13 20:04:58 +00:00
Bharat Mediratta
93ca8e991d Gracefully handle duplicate groups. Fixes ticket #280 2009-05-12 22:34:59 +00:00
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
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
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
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