aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | 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.
* | | | | | Disable query logging for now, so we get nicer logsElrond2012-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As the queries are quite verbose, disable them for now. Reenabling them should be done in the central logging config, which is another story for celery and bin/gmg.
* | | | | | 500 error because of subscripting instead of using attributesJakob Kramer2012-03-181-2/+2
| | | | | |
* | | | | | Committing extracted and compiled translationsChristopher Allan Webber2012-03-1842-2243/+1653
| | | | | |
* | | | | | Committing present MediaGoblin translations before pushing extracted messagesChristopher Allan Webber2012-03-181-0/+645
| | | | | |
* | | | | | Fixing manual tyop: MediaGoblin, not MediaGobiin (thanks gandaro!)Christopher Allan Webber2012-03-181-1/+1
| |_|_|_|/ |/| | | |
* | | | | Removing print statements from convert_gps_media_data migrationChristopher Allan Webber2012-03-181-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Kind of useful to see but... I don't think they're needed, and I'm not super comfortable with print statements being in migrations. Seems semi bloated!
* | | | | Let convert_mongo_to_sql add Migration RecordsElrond2012-03-171-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mongosql tool is really dumping directly into the sql database and is trying not to use too much logic that might change later. So this means, it needs to create the migration records on its own! So add a bunch of records with version=0.
* | | | | Merge remote-tracking branch 'brett/bug264-delete-comments-with-media'Christopher Allan Webber2012-03-172-0/+19
|\ \ \ \ \
| * | | | | When media is deleted, delete associated comments too.Brett Smith2012-03-172-0/+19
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | The actual code is just a simple for loop; there might be a better implementation but this is a fine start. I also extended test_delete to check this too.
* | | | | Merge branch 'master' of gitorious.org:mediagoblin/mediagoblinChristopher Allan Webber2012-03-176-11/+12
|\ \ \ \ \
| * | | | | Remove sidedata class from html pagesJef van Schendel2012-03-175-5/+5
| | | | | |
| * | | | | Small styling change for sidebar dataJef van Schendel2012-03-171-6/+7
| | | | | |
* | | | | | mongo->sql conversion script now runs mongo migrations first, just in caseChristopher Allan Webber2012-03-172-2/+11
|/ / / / /
* | | | | Also ignore the /share/ directoryChristopher Allan Webber2012-03-171-0/+1
| | | | |
* | | | | Make mediagoblin SQL models all use a consistent table naming schemeChristopher Allan Webber2012-03-174-17/+17
| | | | |
* | | | | Mongosql imports made celery get set up before we wanted it via ./bin/gmg ↵Christopher Allan Webber2012-03-171-2/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | commands Just moved the import into the actual function. That resolved the issue!
* | | | More/better translation.Elrond2012-03-173-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | - Try to preserve some translations (somehow). - Mark "Tagged with" again for translation. - Do not translate the empty string
* | | | Small formatting changes to footer text.Jef van Schendel2012-03-161-5/+1
| | | |
* | | | Create function to search media by slug.Elrond2012-03-164-6/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Searching media by slug is easy on mongo. But doing the joins in sqlalchemy is not as nice. So created a function for doing it. Well, and create the same function for mongo, so that it also works.
* | | | Fix for mongo.Elrond2012-03-161-1/+4
| | | | | | | | | | | | | | | | | | | | pymongo does not rewind a cursor after leaving a for loop. So let us do it by hand. Well.
* | | | More efficient first element fetching and Dot-Notation.Elrond2012-03-161-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | _get_tag_name_from_entries: 1) Replace: if q.count(): elem = q[0] by: for element in q: ... break this doesn't do two db queries but only one. 2) And another dose of Dot-Notation as usual.
* | | | Fix _get_tag_name_from_entries().Elrond2012-03-161-1/+1
| | | | | | | | | | | | | | | | Replace == by =.
* | | | Fix uploading of images (sql: media_data, exif).Elrond2012-03-151-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When uploading a new image the processing code wants to set the media_data['exif'] part. As exif is not yet in sql, there is no way to make this work now. So the workaround is to check for "no row exists yet" and just ignore exif.
* | | | Fix media display for no media_data row in sql.Elrond2012-03-152-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there is no media_data row for the current media (for whatever reason, there might be good ones), let MediaEntry.media_data not raise an exception but just return None. The exif display part now handles this by checking whether .media_data.exif is defined (None has no attribute exif, so it's undefined, all fine).
* | | | Implemented the MediaEntry .media_data type fields for SQLChristopher Allan Webber2012-03-141-4/+32
| | | |
* | | | Removing an unnecessary line of whitespace AND crediting Hugo Boyer for the ↵Christopher Allan Webber2012-03-141-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | ipython code! Thanks Hugo Boyer! I forgot to credit you in my last commit.
* | | | Merge branch 'master' of gitorious.org:mediagoblin/mediagoblinChristopher Allan Webber2012-03-145-12/+62
|\ \ \ \
| * | | | Add gps_altitude and gps_direction to image media_data.Elrond2012-03-141-0/+2
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-21 12:48:48 +0000