aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/submit
Commit message (Collapse)AuthorAgeFilesLines
* user.get('moo') -> user.mooSebastian Spaeth2013-01-221-1/+1
| | | | | | | User fields are always existent, so there is no need to .get() them, just use them directly. Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
* Merge remote-tracking branch 'refs/remotes/spaetz/521_license_preference' ↵Christopher Allan Webber2013-01-221-1/+2
|\ | | | | | | into mergetest
| * Add a license preference fieldMark Holmquist2013-01-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | This feature is absolutely necessary. Now a user can simply define their default license and quickly go through a form, as opposed to stopping to click on the select and choosing the same option over and over again. Also added DB migration for the field, so that's working now, too. Rebased by Sebastian and made the default value to be unicode. Reviewed-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
* | Don't pass request into run_process_mediaSebastian Spaeth2013-01-152-5/+12
| | | | | | | | | | | | | | | | | | People(tm) want to start run_process_media from the CLI and might not have a request object handy. So pass in the feed_url into run_process_media rather than the request object and allow the feed url to be empty (resulting in no PuSH notification at all then). Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
* | Make PuSHing the Pubhubsubbub server an async task (#436, #585)Sebastian Spaeth2013-01-152-41/+8
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notifying the PuSH servers had 3 problems.  1) it was done immediately after sending of the processing task to celery. So if celery was run in a separate process we would notify the PuSH servers before the new media was processed/ visible. (#436) 2) Notification code was called in submit/views.py, so submitting via the API never resulted in notifications. (#585) 3) If Notifying the PuSH server failed, we would never retry. The solution was to make the PuSH notification an asynchronous subtask. This way: 1) it will only be called once async processing has finished, 2) it is in the main processing code path, so even API calls will result in notifications, and 3) We retry 3 times in case of failure before giving up. If the server is in a separate process, we will wait 3x 2 minutes before retrying the notification. The only downside is that the celery server needs to have access to the internet to ping the PuSH server. If that is a problem, we need to make the task belong to a special group of celery servers that has access to the internet. As a side effect, I believe I removed the limitation that prevented us from upgrading celery. Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
* prepare_queue_task: Take app not request.Elrond2012-12-262-5/+8
| | | | | | | | | First rename prepare_entry to prepare_queue_task, because this is really more like what this thing does. Thanks to Velmont for noting that we do not need a request in here, but an "app" is good enough. Which means, that this stuff can be called from tool scripts too.
* Processing: Factor out prepare_entry.Elrond2012-12-262-25/+31
| | | | | prepare_entry handles the task_id setup and generating a queue filename and file. it returns the queue file.
* Factor out the actual calling of the processing.Elrond2012-12-262-21/+26
| | | | | | Calling the processing task and handling the exceptions is easy, but has a bunch of caveats, so factor it out into an easy callable function.
* upload refactor: push url handlingElrond2012-12-262-26/+52
| | | | | | Start to refactor our upload handling in main submit and the api. Start factoring out the handling of PuSH url handling.
* Remove mongo style .id = ObjectId()Elrond2012-12-241-4/+0
| | | | | On SQL we can't generate the primary key on our own. So just remove this stuff.
* Mongo removal: Remove the validate=True arg to obj.save()Elrond2012-12-241-2/+2
| | | | | all callers were forced to use validate=True anyway. So remove this useless stuff.
* Move things from routing.py to tools/routing.pyElrond2012-12-231-1/+1
| | | | | | | This stops a cyclic import. Move add_route, mount and endpoint_to_controller into tools/routing.py and change all callers.
* Move DBModel._id -> DBModel.idSebastian Spaeth2012-12-211-5/+5
| | | | | | | | | | | | | | | | | | | | | | | We were refering to model._id in most of the code base as this is what Mongo uses. However, each use of _id required a) fixup of queries: e.g. what we did in our find() and find_one() functions moving all '_id' to 'id'. It also required using AliasFields to make the ._id attribute available. This all means lots of superfluous fixing and transitioning in a SQL world. It will also not work in the long run. Much newer code already refers to the objects by model.id (e.g. in the oauth plugin), which will break with Mongo. So let's be honest, rip out the _id mongoism and live with .id as the one canonical way to address objects. This commit modifies all users and providers of model._id to use model.id instead. This patch works with or without Mongo removed first, but will break Mongo usage (even more than before) I have not bothered to fixup db.mongo.* and db.sql.convert (which converts from Mongo to SQL) Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
* Added rudimentary route "mounting" w/ werkzeug routes; fixed auth routesChristopher Allan Webber2012-10-141-1/+1
| | | | | | auth routes fixes: - mounted the auth routes at /auth/ - removed crufty old verification email route
* Switched most stuff over from RoutesJoar Wandborg2012-10-141-7/+4
| | | | | | | | | | Removed the Routes routing functionality and replaced it with werkzeug.routes. Most views are functional. Known issues: - Translation integration with the request object is not yet figured out. This breaks 404 pages.
* Replaced all request.POST with request.form, ...Joar Wandborg2012-09-291-8/+8
| | | | | - Fixed error handling in OAuth plugin - Changed request.POST file fields to request.files
* Switch from webob.Request to werkzeug.wrappers.RequestJoar Wandborg2012-09-291-9/+9
|
* Added basic collection functionalityAaron Williamson2012-09-183-1/+58
|
* Fix docstring typo.Brett Smith2012-07-081-1/+1
|
* Merge remote-tracking branch 'joar/audio+sniffing'Joar Wandborg2012-03-271-7/+12
|\ | | | | | | | | | | | | | | Conflicts: mediagoblin/media_types/image/processing.py mediagoblin/media_types/video/__init__.py mediagoblin/media_types/video/processing.py mediagoblin/tests/test_submission.py
| * Changed media processing delegation to a 'sniffing' methodJoar Wandborg2012-02-151-3/+6
| | | | | | | | | | | | - Added sniff handlers to all media plugins All of them except audio returning False for ANYTHING at the moment.
* | remove unused `mg.submit.security' moduleJakob Kramer2012-03-232-27/+1
| |
* | Move celery task into own task.pyElrond2012-03-211-1/+2
| | | | | | | | | | | | Move the actual celery task from processing/__init__.py into its own .../task.py. That way it can be imported as needed.
* | Allow .id instead of ._id for the Mongo backendElrond2012-02-251-1/+1
| | | | | | | | | | | | | | | | | | | | To allow easier migration to the SQLAlchemy style .id give the User and MediaEntry mongo classes an alias attribute of .id that maps to ['_id']. Use it in the upload process, because this was one of the last positions with a ['_id'] instead of ._id (due to a bug in mongokit).
* | Use task_id in generating the queue file pathElrond2012-02-211-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | The task_id is created anyway as a UUID. So it is very unique per definition. The only thing needed for the queue file path is a unique part. Before the objectid of the MediaEntry was used instead. But in the sql world the objectid is only available after an "insert" on the db. And creating the queue_file_path afterwards would require an "update" on the db. We can save that. ... for now.
* | Drop pre-rendered html: MediaEntry.description_htmlElrond2012-02-181-3/+1
|/ | | | | | | | | | | After a bit of discussion, we decided to drop the pre-rendered html from the database and render it on the fly. In another step, we will use some proper caching method to cache this stuff. This commit affects the MediaEntry.description_html part.
* It's 2012 all up in hereChristopher Allan Webber2012-02-025-5/+5
|
* Nearly complete support for TagsElrond2012-01-281-1/+1
| | | | | | | | | | | These changes allow all of the rest of the code to use tags in sql as they were used on mongo. It's not efficient at all, as changing tags usually means to remove all old tags and adding all new. The only problem here is: Old slugs for tags are not removed, because they're shared across all MediaTags and dropping orphans is not always easy.
* License "all rights reserved" default should be None/NULL, not empty stringChristopher Allan Webber2012-01-211-1/+1
|
* Fix unit tests with new license supportElrond2012-01-212-3/+2
| | | | | Make the license field in the forms optional and let them properly be defaulted to "".
* Minor formatting and syntax fix.Aaron Williamson2012-01-182-1/+2
|
* Merge branch 'mediagoblin-upstream' into feature544_basic_license_dataAaron Williamson2012-01-181-0/+28
|\
| * Cleaned the codeMichele Azzolari2012-01-171-2/+4
| |
| * We handle exceptions if PuSH failsMichele Azzolari2012-01-171-4/+14
| |
| * As per spec, we permit to have more then 1 hubMichele Azzolari2012-01-121-5/+7
| |
| * As suggested by Elrond, we use only one settingMichele Azzolari2012-01-121-1/+1
| |
| * Added PuSH capabilityMichele Azzolari2012-01-111-0/+14
| |
* | Merged changes with upstreamAaron Williamson2012-01-174-85/+107
|\|
| * Add Markdown for submit page, edit page, profile edit page; thus fixing ↵Jef van Schendel2012-01-041-1/+4
| | | | | | | | ticket #690
| * Dot-Notation for MediaEntry.queued_media_fileElrond2012-01-041-1/+1
| |
| * Fixed submission error handling and broken testsJoar Wandborg2011-12-311-3/+9
| | | | | | | | | | | | - Fixed broken test_auth test - Fixed error handling on submission, it now raises the exception if it is not explicitly relevant to file submission.
| * ASCII media type support & fix a bug in file submission error handlingJoar Wandborg2011-12-311-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added ASCII media processing * Added ASCII media display * Added ASCII media type Rebased from Joar Wandborg's ascii art branch (squashed to remove the commits borrowing code of dubious license) Fixed a bug in file submission error handling: - Moved file-extension condition out of loop (what did it do there?) - Updated file submission tests - Changed error handling in file submission, should now report more than absolutely necessary.
| * Fix #715: On media submit page, "Separate" is misspelledJef van Schendel2011-12-301-1/+1
| |
| * Dot-Notation for MediaEntry.media_typeElrond2011-12-051-1/+1
| |
| * Dot-Notation for MediaEntry.description(_html)Elrond2011-12-051-3/+3
| |
| * Dot-Notation for MediaEntry.titleElrond2011-12-051-1/+1
| |
| * Dot-Notation for MediaEntry.uploaderElrond2011-12-051-1/+1
| |
| * Dot-Notation for Users.usernameElrond2011-12-051-1/+1
| |
| * Merge remote branch ↵Elrond2011-11-271-1/+1
| |\ | | | | | | | | | | | | | | | | | | 'remotes/manolinux/683_text_separate_tags_by_commas_and_spaces' * remotes/manolinux/683_text_separate_tags_by_commas_and_spaces: Fix the text "Seperate tags by commas and spaces" since spaces are not used to seperate anymore.
| | * Fix the text "Seperate tags by commas and spaces" since spaces are not used ↵Manuel Urbano Santos2011-11-271-1/+1
| | | | | | | | | | | | to seperate anymore.