64 Commits

Author SHA1 Message Date
Aaron Williamson
99a270e952 Merged changes with upstream 2012-01-17 00:59:21 -05:00
Aaron Williamson
25b48323a8 First crack at basic license support. 2012-01-17 00:33:55 -05:00
Elrond
8545cfc97d Dot-Notation for MediaEntry.queued_media_file 2012-01-04 11:57:39 +01:00
Joar Wandborg
4601c30c2e Fixed submission error handling and broken tests
- Fixed broken test_auth test
- Fixed error handling on submission, it now raises the exception
  if it is not explicitly relevant to file submission.
2011-12-31 22:57:08 +01:00
Joar Wandborg
a246ccca69 ASCII media type support & fix a bug in file submission error handling
* 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.
2011-12-31 10:32:52 -06:00
Elrond
f4ee839939 Dot-Notation for MediaEntry.media_type 2011-12-05 21:08:58 +01:00
Elrond
1d93996604 Dot-Notation for MediaEntry.description(_html) 2011-12-05 21:08:58 +01:00
Elrond
ec82fbd85c Dot-Notation for MediaEntry.title 2011-12-05 21:08:58 +01:00
Elrond
1ceb4fc868 Dot-Notation for MediaEntry.uploader 2011-12-05 21:08:58 +01:00
Elrond
5a4e3ff1e2 Dot-Notation for Users.username 2011-12-05 21:08:57 +01:00
Joar Wandborg
0bce749b21 Fixes after merging video into master - part 2
- Added handling of InvalidFileType to submit.views
- Updated test_celery_setup and test_submission tests to reflect the changes to the
  media procesing infrastructure
2011-11-21 23:38:31 +01:00
Joar Wandborg
8e5f974684 Fixes after merging video branch into master
- Removed debug output from init/celery
- Moved process_media/__init__ to processing.py
- Centralized the processing.ProcessMedia task class
  - Updated media managers to reference the processing function
    instead of the ProcessMedia instance
  - Updated new-style image processing to previous, newer old-style
    image processing
- Updated video transcoding
  - Changed method in progress output, sometimes
    message.structure['percent'] raises KeyError
2011-11-21 23:18:40 +01:00
Joar Wandborg
b9e1fa280e Merge branch 'video_gstreamer-only'
Conflicts:
	mediagoblin/db/migrations.py
	mediagoblin/submit/views.py
2011-11-21 21:51:30 +01:00
Elrond
3618a9ac51 Dot-Notation: x._id = ObjectId() doesn't seem to work properly
For whatever reason, this does not work as expected:
	entry._id = ObjectId()
Need to go this way:
	entry['_id'] = ObjectId()
2011-11-15 11:32:13 +01:00
Elrond
eabe6b678a Dot-Notation for "_id"
Note: Migrations can't use "Dot Notation"!

Migrations run on pymongo, not mongokit.
So they can't use the "Dot Notation".
This isn't really a big issue, as migrations are anyway
quite mongo specific.
2011-11-15 11:32:13 +01:00
Christopher Allan Webber
ee91c2b88d Merge remote-tracking branch 'remotes/nyergler/pep8-ification'
Conflicts:
	mediagoblin/db/migrations.py
	mediagoblin/db/models.py
	mediagoblin/user_pages/views.py
	mediagoblin/util.py
2011-11-13 20:23:26 -06:00
Nathan Yergler
285ffeddf3 has_key is deprecated, converting uses to use "in" operator. 2011-10-01 15:10:41 -07:00
Nathan Yergler
243c3843bd Whitespace and formatting cleanup.
* Removed trailing whitespace
* Line length < 80 where possible
* Honor conventions on number of blank lines
* Honor conventions about spaces around :, =
2011-10-01 15:10:02 -07:00
Aaron Williamson
152a3bfaa3 Finished splitting util.py into separate files. 2011-10-01 18:05:44 -04:00
Aaron Williamson
ae3bc7fabf Moved common, translation, template, and url code out of util.py and into tools/[file].py 2011-10-01 09:31:42 -04:00
Joar Wandborg
93bdab9daa Multimedia support - Commiting from a not yet finished state - Details below
* DONE Initially testing with arista
** DONE Video display templates
*** TODO Multi-browser support
** TODO Video thumbnails
** TODO Link to original video
** TODO Video cropping

Also contains a lot of "debug" print's
2011-09-23 02:35:57 +02:00
Will Kahn-Greene
12a100e4d8 508. Updates copyright/license information 2011-09-01 20:50:19 -04:00
Christopher Allan Webber
7dc3a66f92 Merge remote branch 'remotes/jwandborg/f403_ability_to_delete'
Conflicts:
	mediagoblin/edit/views.py
	mediagoblin/templates/mediagoblin/user_pages/media.html
	mediagoblin/user_pages/routing.py
2011-08-28 22:05:54 -05:00
Christopher Allan Webber
894fa564e7 Merge branch 'master' into jwandborg-f482_media_attachments
Conflicts:
	mediagoblin/config_spec.ini
	mediagoblin/edit/forms.py
	mediagoblin/edit/views.py
	mediagoblin/submit/views.py
	mediagoblin/templates/mediagoblin/user_pages/media.html
2011-08-22 21:48:45 -05:00
Joar Wandborg
3a8c3a3855 Feature #482 - Media attachments -
*   Moved attachment uploading to separate view
*   Support for multiple attachments!
2011-08-22 18:06:28 +02:00
Mark Holmquist
08750772ea + 'confirm' section for confirmation dialogues
+ implemented delete functionality
* fixed several instances of 'must be an instance of unicode, not str'
2011-08-22 02:57:40 -07:00
Christopher Allan Webber
6788b4123e Capture and properly handle errors.
Handled in several places:

 - In the run() of the ProcessMedia itself for
   handled (BaseProcessingFail derived) errors (best to do these not
   in on_failure because the errors are highlighted in celeryd in a
   way that looks inappropriate for when the errors are well handled)
 - In ProcessMedia.on_failure() for all other errors
 - In the submit view where all exceptions are caught, media is marked
   at having failed, then the error is re-raised.  (The reason for
   this is that users running in "lazy" mode will get errors
   propagated by celery and so on_failure won't run for them.)
2011-08-13 12:21:06 -05:00
Christopher Allan Webber
4a477e246d Proper handling of processor failures, working as hoped!
BaseProcessingFail based exceptions recorded and marked appropriately
in the database.  Other exceptions also caught and marked (or rather
not marked) appropriately in the database as well.
2011-08-13 10:59:34 -05:00
Christopher Allan Webber
07934b442f Moving things around a bit/commenting in the submit view to make the workflow clearer 2011-08-11 11:30:26 -05:00
Christopher Allan Webber
1b57c29082 Merge branch 'master' into processing 2011-08-10 21:04:55 -05:00
Christopher Allan Webber
f64e525090 Generate the ObjectId() manually instead of via .save() 2011-08-10 21:03:16 -05:00
Christopher Allan Webber
d990a37998 We should save the entry *after* we add the queued_task_id. 2011-08-10 20:26:22 -05:00
Christopher Allan Webber
852d5bb238 Merge branch 'master' into processing 2011-08-10 19:53:37 -05:00
Christopher Allan Webber
4b1adc132c Marked relevant strings in python views/forms for translation via ugettext 2011-08-08 22:53:39 -05:00
Joar Wandborg
2c4374938f Feature #482 - Media attachments 2011-08-05 22:08:29 +02:00
Christopher Allan Webber
3cdf366acf Merge branch 'remotes/gullydwarf-cfdv/f360_tagging' (early part) into mergetags
Conflicts:
	mediagoblin/config_spec.ini
	mediagoblin/edit/views.py
	mediagoblin/util.py
2011-07-30 13:09:01 -05:00
Caleb Forbes Davis V
0712a06dc6 changes tags to a list of dicts in the db, adding tag slugs
- adds a function to convert the tag list of dicts to a text string
  properly delimited for loading into forms
- tag string conversion function updated to generate list of dicts
- updates all mentions of the conversion of the string to the tags db
  object
- adds a tags template utility and updates the media template accordingly
2011-07-27 14:51:57 -05:00
Caleb Forbes Davis V
97e4498c10 on submission, use inline error messaging instead of message queue
- the function that converts the user's tag string into a list of
  tags now accepts a string, but the media submit view was still
  submitting the request object, like we were going to add any
  errors to the session. Now the submit view passes the tag string
2011-07-26 00:00:50 -05:00
Christopher Allan Webber
6b9ee0ca13 Store the task id of a processing action in the database. 2011-07-24 23:12:46 -05:00
Caleb Forbes Davis V
cc7ff3c505 enforces maximum tag length with (in)appropriate messaging 2011-07-13 00:03:49 -05:00
Caleb Forbes Davis V
6f2e4585cc uses standard functions instead of form filters and fixes taglist default
- seems simpler to use the same tag field processing procedures on media
  submit and edit, so now processing with a regular function instead of
  a form filter. Filters run on form load and post by default.
- moved tags to sidebar
- taglist defaults to [] instead of None
- adds case sensitivity toggle
2011-07-12 22:43:26 -05:00
Rasmus Larsson
eedc5428fd Removed route, view and template file for "Submit Success" page 2011-07-09 02:47:06 +02:00
Caleb Forbes Davis V
04a9515064 F360(tagging) - adds tag fields for submission, edit and display 2011-07-08 01:59:44 -05:00
Joar Wandborg
4dc7444119 Feature #409 - Submitting an image should redirect you back to user's
page w/ a message

*   Successful submission redirects to the logged in user's page
    (your own, presumably).
*   "Woohoo! Submitted!" is launched into the tube of session messages
    to appear on next pageload. If you're not aborting in the window
    of 210ms it takes for the client to respond to the 302 and load
    the logged in user's/your page that is, YMMV.
2011-07-03 07:50:35 +02:00
Christopher Allan Webber
4bf8e8888c Adds util.cleaned_markdown_conversion() and uses it in the submission process
This simplifies the markdown processing & html cleaning of descritions
and etc by providing a wrapper function that we can use in multiple
locations.
2011-06-19 20:41:40 -05:00
Joar Wandborg
44e51d3464 Made changes according to http://bugs.foocorp.net/issues/363#note-5 2011-06-15 23:07:54 +02:00
Joar Wandborg
44e2da2fe6 Added Markdown rendering for media_entry 2011-06-12 03:24:31 +02:00
Christopher Allan Webber
2190ecde8d Merge remote branch 'remotes/gandaro/324-bad-media-types' 2011-06-06 07:51:17 -05:00
Christopher Allan Webber
9038c9f9ac I have a strong preference for aligning all parameters in a function call. 2011-06-05 15:41:08 -05:00
Elrond
9150244afa Create redirect shortcut and use it around
This is just replacing exc.HTTPFound(location=request.urlgen(...))
by redirect(request, ...). No magic.
2011-06-05 16:16:03 +02:00