aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/bretts/bug261-resized-filenames'Christopher Allan Webber2012-03-266-256/+238
|\
| * Merge remote branch 'origin/master' into bug261-resized-filenamesBrett Smith2012-03-2684-2516/+2739
| |\ | | | | | | | | | | | | | | | This merge involved moving the new FilenameBuilder class to processing/__init__.py, and putting the comment deletion tests back into test_submission.py using the refactored functions.
| * | Rename to FilenameBuilder, with a main method named fill.Brett Smith2012-03-264-26/+28
| | | | | | | | | | | | | | | I think these names better convey what's actually going on. I updated the documentation a bit while I was at it.
| * | Refactor video processing to use FilenameMunger.Brett Smith2012-03-251-8/+4
| | |
| * | Use FilenameMunger.Brett Smith2012-03-251-28/+17
| | |
| * | Add documentation to the FilenameMunger class.Brett Smith2012-03-251-1/+16
| | |
| * | Add FilenameMunger class to processing, with tests.Brett Smith2012-03-252-0/+36
| | | | | | | | | | | | | | | Munging filenames is something all media type processors want to be able to do, so I'm refactoring it out into a nice bite-sized class.
| * | Add tests for image processing. Check filenames and image sizes.Brett Smith2012-03-202-0/+24
| | | | | | | | | | | | | | | | | | | | | This test helps verify that bug #261 is actually fixed. In order to test that all the processed images are smaller, I needed to add an image that's bigger than processing.MEDIUM_SIZE, hence bigblue.png.
| * | Make a function to generate test image filenames.Brett Smith2012-03-201-11/+9
| | |
| * | Prefer nose assert_* methods to the assert built-in.Brett Smith2012-03-201-7/+10
| | |
| * | Refactor false image tests.Brett Smith2012-03-201-28/+13
| | |
| * | Refactor normal upload tests.Brett Smith2012-03-201-27/+17
| | | | | | | | | | | | | | | This is nice because it means we do *all* the normal sanity tests for *all* the normal uploads. check_url() can be used in other tests too.
| * | Refactor MediaEntry fetches/checks into check_media().Brett Smith2012-03-201-14/+13
| | |
| * | Refactor data posts into one do_post function.Brett Smith2012-03-201-112/+52
| | | | | | | | | | | | | | | | | | All the data posts in these tests had a lot of common code. Putting all that into a function makes it easier to write more tests (which I'll be doing in a bit) and see what's really being tested.
| * | small readability improvements in resize_imageBrett Smith2012-03-181-3/+3
| | |
| * | Refactor image resize code, with better filenames (#261)Brett Smith2012-03-171-41/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code to make thumbnail- and medium-sized images in processing.py is pretty similar, so I rolled that out into a separate function that we call with different arguments as appropriate. The new function should work identically to the old code, except it saves images with filenames based on the original filename, like `foobar.medium.jpg` instead of just `medium.jpg`. This fixes bug #261.
* | | Add comment in JavaScript file about duplicating the password fieldJef van Schendel2012-03-261-0/+1
| |/ |/|
* | Merge branch 'master' of gitorious.org:mediagoblin/mediagoblinJef van Schendel2012-03-253-2/+33
|\ \
| * \ Merge remote-tracking branch 'gandaro/forgot-password-autofillin'Elrond2012-03-253-2/+33
| |\ \ | | | | | | | | | | | | | | | | | | | | * gandaro/forgot-password-autofillin: set username default server-side Fill username automatically in (Forget Password)
| | * | set username default server-sideJakob Kramer2012-03-253-8/+2
| | | |
| | * | Fill username automatically in (Forget Password)Jakob Kramer2012-03-243-1/+38
| | | | | | | | | | | | | | | | | | | | Fill the username automatically in the "Forget Password" form if the user already entered his username on the login page
* | | | Header style changeJef van Schendel2012-03-252-43/+36
|/ / /
* | | Drop debug from migration.Elrond2012-03-251-2/+0
| | |
* | | Cleanup mongo->sql converter.Elrond2012-03-251-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | 1. No need to drop media_data['exif'], we only have and want media_data['exif_all']. 2. Use media['_id'] instead of media._id (better not use dot-notation on mongo objects in such a low level tool).
* | | Do not fill media_data['exif'] any more.Elrond2012-03-251-7/+0
| | |
* | | Migration fixup: Drop empty exif_all.Elrond2012-03-251-1/+7
| | | | | | | | | | | | | | | If the exif info is totally empty, do not add it at all to the media_data dict in mongo.
* | | Create migration to move exif data around in media_data.Elrond2012-03-251-0/+25
| | | | | | | | | | | | | | | | | | Move media_data['exif']['clean'] to media_data['exif_all'] drop media_data['exif']['useful'] drop media_data['exif']
* | | Use exif_display_iter in the template.Elrond2012-03-251-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | As the newly created entries have media_data.exif_all use the exif_display_iter method to calculate the exif entries for displaying on the fly. After the mongo migration all the old entries will also have exif_all and will work again.
* | | Start to fill media_data.exif_all in addition.Elrond2012-03-251-3/+6
|/ / | | | | | | | | | | | | | | In addition to filling the normal slot media_data['exif'], now also fill media_data.exif_all. This is the new slot used by SQL. For a few moments this will create duplicated entries in the mongo db. But this shouldn't hurt.
* | Merge remote-tracking branch 'remotes/gandaro/wipealldata-from-db_name'Christopher Allan Webber2012-03-241-2/+6
|\ \
| * | Wipe the configured database, not the default oneJakob Kramer2012-03-241-2/+6
| | |
* | | Allow arrow keys in input fields and textareasJakob Kramer2012-03-242-2/+10
|/ / | | | | | | | | If you pressed an arrow key in a textarea before, the next/previous media was opened.
* | remove unused `mg.submit.security' moduleJakob Kramer2012-03-232-27/+1
| |
* | Fix cyclic import issue.Elrond2012-03-231-1/+2
| | | | | | | | | | | | | | | | Oh well: tools.exif -> processing -> db.util -> db.models -> db.mixin -> tools.exif So import tools.exif locally in exif_display_iter()
* | Create MediaEntry.exif_display_iter()Elrond2012-03-231-0/+10
| | | | | | | | | | | | | | | | MediaEntry.media_data.exif_all will contain all the "clean" EXIF data. MediaEntry.exif_display_iter() is an iterator that fetches the most interesting entries for display from that data.
* | image_mediadata: Add exif_all columnElrond2012-03-231-0/+2
| |
* | Add copyright header to image/models.pyElrond2012-03-231-0/+17
| |
* | correct wrong version numberJakob Kramer2012-03-231-1/+1
| | | | | | | | (`-dev' instead of `.dev')
* | New media_data row needs to know its MediaEntry's id.Elrond2012-03-221-1/+2
| | | | | | | | | | | | | | When creating a new media_data row, the new row needs to know the MediaEntry it is associated with. I have no idea, why this worked before at all. Maybe some implicit tricks by sqlalchemy?
* | Add index=True for some columns.Elrond2012-03-211-6/+7
| | | | | | | | | | These are the columns that seem to make the most sense to have an index on them.
* | Finally load all models.Elrond2012-03-211-2/+1
| | | | | | | | | | Load all models for the media_types. This was stopped by a celery problem. But that is now fixed.
* | Panel: Find "unprocessed" not "processing" entries.Elrond2012-03-211-1/+1
| | | | | | | | | | | | Our entries in the queue are marked as "unprocessed" and not as "processing" as the panel code wanted it to be. So search for the correct string.
* | And fix the in-celeryd import.Elrond2012-03-212-2/+2
| | | | | | | | So that celeryd also loads the task.
* | Move celery task into own task.pyElrond2012-03-213-58/+81
| | | | | | | | | | | | Move the actual celery task from processing/__init__.py into its own .../task.py. That way it can be imported as needed.
* | Turn processing.py into a submodule.Elrond2012-03-211-0/+0
| | | | | | | | | | | | | | | | | | | | | | processing.py -> processing/__init__.py This is in preparation for splitting processing a bit. The main reason for the split is celery setup: celery needs to be setup before even importing and importing and subclassing some of its parts. So it's better to move the critical parts into their own submodule and import it as late as needed.
* | Merge remote-tracking branch 'refs/remotes/brett/bug270-lazycelery-script'Christopher Allan Webber2012-03-203-64/+84
|\ \
| * | Refactor lazyserver.sh to lazystarter.sh and provide lazycelery.sh (#270)Brett Smith2012-03-173-64/+84
| |/ | | | | | | | | | | | | | | | | | | Bug #270 asks for a lazycelery.sh script much like lazyserver.sh. Rather than duplicate the code, I consolidated them into a single script, lazystarter.sh. The script reconfigures itself a bit, and runs a particular server, based on the name that's used to call it, but no matter what it uses the same code to offer help and find configuration files and server launchers. Hopefully this will make it easy to add other features/fix bugs as needed in the future, and have them stay in sync.
* | More standard media_data model for ascii.Elrond2012-03-201-3/+3
| | | | | | | | | | ascii doesn't use media_data at all. So it needs the most basic media_data model. Fix it to take the current form.
* | Create load_models().Elrond2012-03-204-3/+24
| | | | | | | | | | | | | | | | | | | | | | | | So all models are ready when connecting to the db and so our "db" object has all models listed on it, create a function to load all models from the media_types, etc. Call it in setup_database() Problem: This gives celery warnings, because celery is imported before being setup properly. No idea how to fix this now. So media-type loading is excluded from load_models for now.
* | Import "Base" from base instead of models.Elrond2012-03-205-7/+6
| | | | | | | | | | Import the "Base" class for models from db.sql.base instead of db.sql.models.