mediagoblin.git
11 years agoUpdated VideoThumbnailerMarkII, removed old
Joar Wandborg [Sun, 24 Mar 2013 17:49:05 +0000 (18:49 +0100)]
Updated VideoThumbnailerMarkII, removed old

Removed the old VideoThumbnailer since it's not used anymore.

VideoThumbnailerMarkII:
Changed the state switching in on_thumbnail_message to only set the
state to "processing thumbnail" if the seek was succesful.

I'm not sure what I'm doing here, but I know at least some of it is
good, and as a whole, it seems to work, so far :)

11 years agoAdding documentation on what the $need_arg code in runtests.sh does
Christopher Allan Webber [Sun, 24 Mar 2013 14:51:35 +0000 (09:51 -0500)]
Adding documentation on what the $need_arg code in runtests.sh does

11 years agoMove description of software stack below description of "What's where"
Christopher Allan Webber [Thu, 21 Mar 2013 15:08:09 +0000 (10:08 -0500)]
Move description of software stack below description of "What's where"

11 years agopiwigo start at pwg.images.addChunk.
Elrond [Thu, 21 Mar 2013 08:16:05 +0000 (09:16 +0100)]
piwigo start at pwg.images.addChunk.

This function receives part of an upload. Does most
parameter validation, but does not safe the data anywhere
for now.

Also fake pwg.images.exist

11 years agopiwigo: Add session.getStatus, improve categories.getList
Elrond [Thu, 21 Mar 2013 08:07:59 +0000 (09:07 +0100)]
piwigo: Add session.getStatus, improve categories.getList

- pwg.session.getStatus returns the current user as
  "fake_user".  When we have a session, we'll return
  something better.

- pwg.categories.getList add a name and the parent id for
  its one and only "collection".

- Improve logging a bit.

11 years agopiwigo: Sent a fake cookie.
Elrond [Thu, 21 Mar 2013 08:01:48 +0000 (09:01 +0100)]
piwigo: Sent a fake cookie.

shotwell needs a pwg_id cookie to continue.
And really, it's the only cookie it supports, so in the
long run, we need to send a proper session cookie as
pwg_id.

11 years agoAdd warning README.rst and fix pep8.
Elrond [Tue, 19 Mar 2013 14:29:01 +0000 (15:29 +0100)]
Add warning README.rst and fix pep8.

11 years agopiwigo: Move tool functions into tools.py
Elrond [Tue, 19 Mar 2013 11:07:23 +0000 (12:07 +0100)]
piwigo: Move tool functions into tools.py

11 years agoStart at pwg.categories.getList and improve xml output.
Elrond [Tue, 19 Mar 2013 10:45:22 +0000 (11:45 +0100)]
Start at pwg.categories.getList and improve xml output.

- The xml formatting is now in the main function.
- Add PwgNamedArray to have named lists in xml output.
- Remove gmg.test method

11 years agopiwigo: start xml response encoding, more (fake) methods.
Elrond [Tue, 19 Mar 2013 09:18:29 +0000 (10:18 +0100)]
piwigo: start xml response encoding, more (fake) methods.

11 years agoStarting a piwigo api plugin.
Elrond [Wed, 13 Mar 2013 13:51:00 +0000 (14:51 +0100)]
Starting a piwigo api plugin.

This one just puts up the basic endpoint, some
infrastructure and a fake login method.

Lots more needed.

11 years agoImprove release notes formatting.
Elrond [Tue, 19 Mar 2013 17:52:14 +0000 (18:52 +0100)]
Improve release notes formatting.

The geolocation ini sample needed more indenting and
got a nice "code-block:: ini".

11 years agoPoint to the Hacking HOWTO
Christopher Allan Webber [Mon, 18 Mar 2013 13:50:29 +0000 (08:50 -0500)]
Point to the Hacking HOWTO

11 years agoBetter description of the structure of the application
Christopher Allan Webber [Sun, 17 Mar 2013 19:16:19 +0000 (14:16 -0500)]
Better description of the structure of the application

11 years agoClarification on some original design decisions things.
Christopher Allan Webber [Sun, 17 Mar 2013 18:53:45 +0000 (13:53 -0500)]
Clarification on some original design decisions things.

11 years agoA more realistic "con" explaination in the docstring of exif_fix_image_orientation
Christopher Allan Webber [Fri, 15 Mar 2013 14:19:22 +0000 (09:19 -0500)]
A more realistic "con" explaination in the docstring of exif_fix_image_orientation

Thanks to dnet for catching this.

This commit sponsored by Chester Zeller.  Thanks!

11 years agoRemove .pyc files from tarball when running maketarball.sh
Christopher Allan Webber [Wed, 13 Mar 2013 02:36:05 +0000 (21:36 -0500)]
Remove .pyc files from tarball when running maketarball.sh

11 years agoChanging "evil" submission test-script to be a bash script.
Christopher Allan Webber [Wed, 13 Mar 2013 02:35:15 +0000 (21:35 -0500)]
Changing "evil" submission test-script to be a bash script.

11 years agoStart a storage section.
Elrond [Sun, 10 Mar 2013 21:33:28 +0000 (22:33 +0100)]
Start a storage section.

With the workbench stuff in it.

11 years agoOnly create api docs for mediagoblin/
Elrond [Fri, 25 Jan 2013 21:43:33 +0000 (22:43 +0100)]
Only create api docs for mediagoblin/

11 years agoNow in 0.4.0 dev mode!
Christopher Allan Webber [Tue, 12 Mar 2013 17:11:55 +0000 (12:11 -0500)]
Now in 0.4.0 dev mode!

11 years ago"will now" -> "will not" tyop caught by AVRS... fixed, thanks!
Christopher Allan Webber [Tue, 12 Mar 2013 16:49:39 +0000 (11:49 -0500)]
"will now" -> "will not" tyop caught by AVRS... fixed, thanks!

11 years agoNew version: 0.3.3 !
Christopher Allan Webber [Mon, 11 Mar 2013 22:26:22 +0000 (17:26 -0500)]
New version: 0.3.3 !

11 years agoCommitting extracted and compiled translations
Christopher Allan Webber [Mon, 11 Mar 2013 22:22:09 +0000 (17:22 -0500)]
Committing extracted and compiled translations

11 years agoCommitting present MediaGoblin translations before pushing extracted messages
Christopher Allan Webber [Mon, 11 Mar 2013 22:21:53 +0000 (17:21 -0500)]
Committing present MediaGoblin translations before pushing extracted messages

11 years agoFixing dates when uploaded in a video to a mediagoblin instance.
Christopher Allan Webber [Mon, 11 Mar 2013 21:54:41 +0000 (16:54 -0500)]
Fixing dates when uploaded in a video to a mediagoblin instance.

There were some "serializing to json strings" issues.  They should be
fixed now... much more careful whitelist and cleaning of the video
"tags" metadata out of gstreamer.

This commit sponsored by Aimee Sullivan.  Thanks!

11 years agoYou can also DELETE accounts now
Christopher Allan Webber [Mon, 11 Mar 2013 20:18:24 +0000 (15:18 -0500)]
You can also DELETE accounts now

11 years agoMinor release note changes, as suggested by Elrond.
Christopher Allan Webber [Mon, 11 Mar 2013 18:35:59 +0000 (13:35 -0500)]
Minor release note changes, as suggested by Elrond.

This commit sponsored by Martin Ansdell-Smith.  Thanks!

11 years ago0.3.3 release notes
Christopher Allan Webber [Mon, 11 Mar 2013 17:34:02 +0000 (12:34 -0500)]
0.3.3 release notes

11 years agoUpdating AUTHORS with many more people who deserve to be attributed!
Christopher Allan Webber [Sun, 10 Mar 2013 14:56:49 +0000 (09:56 -0500)]
Updating AUTHORS with many more people who deserve to be attributed!

11 years agoAdded thingiview.js symlink, fixes webgl view
Joar Wandborg [Sun, 10 Mar 2013 22:08:53 +0000 (23:08 +0100)]
Added thingiview.js symlink, fixes webgl view

11 years ago655: Fix collection fetching for media_collect()
Elrond [Sun, 10 Mar 2013 19:56:48 +0000 (20:56 +0100)]
655: Fix collection fetching for media_collect()

The problem is:

    Collection.query.filter_by(id=X, ...)

1. X = form.collection.data
   This works nicely for the completely empty form (X = None).
   It does not work for a selected collection, because X
   will be the collection, not its id.

2. X = request.form.get('collection') (old code).
   This one works mostly, except for the completely empty
   form on postgres, because in this case X = u"__None" and
   postgres does not like comparing an integer column with
   a string.

Fix:
    collection = form.collection.data
    if collection and collection.creator != request.user.id:
        collection = None

11 years agotyop fix in docs, lazyserer.sh->lazyserver.sh
Christopher Allan Webber [Sat, 9 Mar 2013 18:18:36 +0000 (12:18 -0600)]
tyop fix in docs, lazyserer.sh->lazyserver.sh

This commit sponsored by S J Bennett.  Thanks!

11 years agoChange the _original_ design decisions.
Elrond [Sat, 9 Mar 2013 13:51:01 +0000 (14:51 +0100)]
Change the _original_ design decisions.

- Rename the chapter to "Original *".
- Fix links.

11 years agoRevive old "Design Decisions".
Elrond [Sat, 9 Mar 2013 13:02:01 +0000 (14:02 +0100)]
Revive old "Design Decisions".

This brings back the exact version that was removed in
65e7ce634cfecc87ed6f390f9ccf91be513d2eea.

11 years agoProviding warning to users about instability of OAuth/API
Christopher Allan Webber [Fri, 8 Mar 2013 20:38:55 +0000 (14:38 -0600)]
Providing warning to users about instability of OAuth/API

11 years agoMaking a fix so that video codec name switched from "vp8 video" to "vp8"
Christopher Allan Webber [Wed, 6 Mar 2013 18:05:40 +0000 (12:05 -0600)]
Making a fix so that video codec name switched from "vp8 video" to "vp8"

"vp8 video" is what vp8 is marked as in gstreamer's metadata.
However, the browser expects it just as the name "vp8".  So fixing
that.

This commit sponsored by Tyng-Ruey Chuang.  Thank you!

11 years agoCommitting extracted and compiled translations
Christopher Allan Webber [Tue, 5 Mar 2013 00:05:54 +0000 (18:05 -0600)]
Committing extracted and compiled translations

11 years agoMerge branch 'master' into 419_cherrypick_large_uploads
Christopher Allan Webber [Mon, 4 Mar 2013 21:47:05 +0000 (15:47 -0600)]
Merge branch 'master' into 419_cherrypick_large_uploads

11 years agoRemoving an unnecessary video write
Christopher Allan Webber [Mon, 4 Mar 2013 17:53:04 +0000 (11:53 -0600)]
Removing an unnecessary video write

In the case of if we're skipping transcoding, we don't need to copy
this file at all!

This commit sponsored by Frank Zambrini III.  Thanks!

11 years agoMerge branch 'joar-skip_transcoding'
Christopher Allan Webber [Mon, 4 Mar 2013 17:45:27 +0000 (11:45 -0600)]
Merge branch 'joar-skip_transcoding'

11 years agoElrond points out that we should use form.collection.data
Christopher Allan Webber [Mon, 4 Mar 2013 17:45:14 +0000 (11:45 -0600)]
Elrond points out that we should use form.collection.data

That's true; I'm not sure what it's fixing, but he thinks it's fixing
something.  Anyway, it's correct :)

This commit sponsored by Philippe Gauthier.  Thanks!

11 years agoGive a more useful error if a table already exists and so we can't create it during...
Christopher Allan Webber [Mon, 4 Mar 2013 16:57:21 +0000 (10:57 -0600)]
Give a more useful error if a table already exists and so we can't create it during migrations

This commit sponsored by Andrzej Prochyra.  Thanks!

11 years agoThree fixes to collection adding view, one of them a serious security bug
Christopher Allan Webber [Mon, 4 Mar 2013 16:12:48 +0000 (10:12 -0600)]
Three fixes to collection adding view, one of them a serious security bug

 - Don't let people who aren't the authors of a collection from adding
   things to it (handled by forcing the user check in the query)
 - request url in case invalid collection selected fixed
 - collection_item.author doesn't yet exist; removing the selection
   (we might want multiple people to be able to edit a collection in
   the future but that future does not yet exist; as Elrond said,
   remove this "false hope")

Thanks to Elrond to pointing out these issues.

And thanks to David Kindler for sponsoring this commit!

11 years agoself.media_data->self.media_manager in the docstring. Thanks for catching, Elrond.
Christopher Allan Webber [Sun, 3 Mar 2013 22:28:16 +0000 (16:28 -0600)]
self.media_data->self.media_manager in the docstring.  Thanks for catching, Elrond.

This commit sponsored by Sebastian Hugentobler.  Thank you!

11 years agoNo reason really to pass in fetch_order anyway...
Christopher Allan Webber [Sun, 3 Mar 2013 21:40:49 +0000 (15:40 -0600)]
No reason really to pass in fetch_order anyway...

I think this is legacy code from get_display_media being a utility, or
something.  Removed!  (Thanks for pointing this out, Elrond!)

This commit sponsored by Tristan Chambers.  Thank you!

11 years agoMake copying to/from storage systems memory efficient (#419)
Sebastian Spaeth [Wed, 19 Dec 2012 10:06:51 +0000 (11:06 +0100)]
Make copying to/from storage systems memory efficient (#419)

The copy_locally and copy_local_to_storage (very inconsistent terms BTW)
were simply slurping in everything in RAM and writing it out at once.
(the copy_locally was actually memory efficient if the remote system was local)

Use shutil.copyfileobj which does chunked reads/writes on file objects.
The default buffer size is 16kb, and as each chunk means a separate HTTP
request for e.g. cloudfiles, we use a chunksize of 4MB here (which has
just been arbitrarily set by me without tests).

This should help with the failure to upload large files issue #419.

11 years agoAnother elrond suggestion: only init orig_metadata if there's anything in the dict.
Christopher Allan Webber [Sun, 3 Mar 2013 20:29:30 +0000 (14:29 -0600)]
Another elrond suggestion: only init orig_metadata if there's anything in the dict.

This commit sponsored by Joshua Rosen.  Thank you!

11 years agoPer Elrond's suggestions moving DEFAULT_WEBM_TYPE to media manager
Christopher Allan Webber [Sun, 3 Mar 2013 20:27:36 +0000 (14:27 -0600)]
Per Elrond's suggestions moving DEFAULT_WEBM_TYPE to media manager

The reason for this is to avoid defining this twice as we were
previously (once in the template, once in video/models.py)

This commit sponsored by Roland McIntosh.  Thank you!

11 years agoExtrapolate type= based on the video metadata that we have, if we can.
Christopher Allan Webber [Sun, 3 Mar 2013 17:41:40 +0000 (11:41 -0600)]
Extrapolate type= based on the video metadata that we have, if we can.

It's kind of awkward because it relies on there being a entry.media_data,
but that's not guaranteed... (see http://issues.mediagoblin.org/ticket/650)
so we use a dopey fallback in the template in that case (kind of
annoying info duplication).

This commit sponsored by Piotr Wieczorek.  Thank you!

11 years agoMild cosmetic cleanups to video.html and adding missing </li> elements.
Christopher Allan Webber [Sun, 3 Mar 2013 17:08:14 +0000 (11:08 -0600)]
Mild cosmetic cleanups to video.html and adding missing </li> elements.

This commit sponsored by Jukka Hellen.  Thanks!

11 years ago{% set %} the display_type and display_path and use that elsewhere
Christopher Allan Webber [Sun, 3 Mar 2013 17:03:30 +0000 (11:03 -0600)]
{% set %} the display_type and display_path and use that elsewhere

This will make some stuff a bit cleaner that's coming up...

This commit sponsored by J B Nicholson-Owens.  Thanks!

11 years agopdb.set_trace() in mediagoblin code is Not Allowed(TM), removing from audio code
Christopher Allan Webber [Sun, 3 Mar 2013 16:38:06 +0000 (10:38 -0600)]
pdb.set_trace() in mediagoblin code is Not Allowed(TM), removing from audio code

Of course, the version that appears here is not really dangerous
because it's for the "call the file individually" form of debugging,
but it isn't allowed anyway.

This commit sponsored by Michael Faryniarz.  Thanks!

11 years agoNow store metadata info from processing into the media type.
Christopher Allan Webber [Sun, 3 Mar 2013 16:36:37 +0000 (10:36 -0600)]
Now store metadata info from processing into the media type.

This comes in several parts:
 - Store the metadata from gstreamer during processing
 - Add a new JSONEncoded field to the VideoData table
 - And, of course, add a migration for that field!

This commit sponsored by Julius Tuomisto.  Thank you, Julius!

11 years agoRemoved debugging exception
Joar Wandborg [Sun, 3 Mar 2013 07:48:12 +0000 (08:48 +0100)]
Removed debugging exception

.. that accidentally got included due to not testing the video media
type in the unit tests.

11 years agoUpdated raven plugin
Joar Wandborg [Sun, 3 Mar 2013 01:32:03 +0000 (02:32 +0100)]
Updated raven plugin

- Added wrap_wsgi, celery_setup, celery_logging_setup hooks
- Updated raven plugin docs
- Updated production considerations docs
- Added raven logging setup

11 years agoHuge amount of work to (mostly) allow .ogg (and maybe other) formats to skip transcode
Christopher Allan Webber [Sun, 3 Mar 2013 01:06:31 +0000 (19:06 -0600)]
Huge amount of work to (mostly) allow .ogg (and maybe other) formats to skip transcode

 - Update get_display_media in several ways:
   - now uses the media type's own declaration of the order of things
   - returns both the media_size and the media_path, as per the docstring
   - implicitly uses self.media_files as opposed to forcing you to pass it in
 - update videos to use get_display_media
 - update images to declare media_fetch_order in the media manager (videos also)
 - update stl to use media.media_files['original'] instead of weird
   use of get_display_media
 - update sidebar to only conditionally show webm_640

TODO still: identify video type information *during* processing, show
that in the <video><source /></video> element.

This commit sponsored by Nathan Yergler.  Thanks, nyergler!

11 years agoplugin/raven: Fix paster's celery config issue
Joar Wandborg [Sat, 23 Feb 2013 23:23:05 +0000 (00:23 +0100)]
plugin/raven: Fix paster's celery config issue

Check for CELERY_CONFIG_MODULE before we import raven.contrib.celery. It
seems that the import otherwise sets up the celery client before we get
to pass it our mediagoblin-specific settings.

11 years agoAdded raven plugin docs to docs
Joar Wandborg [Fri, 22 Feb 2013 23:06:52 +0000 (00:06 +0100)]
Added raven plugin docs to docs

11 years agoRemoved stray )
Joar Wandborg [Fri, 22 Feb 2013 23:02:39 +0000 (00:02 +0100)]
Removed stray )

11 years agoRemoved PLUGIN_DIR from raven
Joar Wandborg [Fri, 22 Feb 2013 22:47:55 +0000 (23:47 +0100)]
Removed PLUGIN_DIR from raven

11 years agoDon't look for the oauth config in raven plugin
Joar Wandborg [Fri, 22 Feb 2013 22:46:36 +0000 (23:46 +0100)]
Don't look for the oauth config in raven plugin

11 years agoRefactored raven plugin
Joar Wandborg [Fri, 22 Feb 2013 22:44:17 +0000 (23:44 +0100)]
Refactored raven plugin

11 years agoAdded raven plugin
Joar Wandborg [Fri, 22 Feb 2013 22:42:29 +0000 (23:42 +0100)]
Added raven plugin

11 years agoAdded .send method to cloudfiles storage object
Joar Wandborg [Sat, 2 Mar 2013 23:11:34 +0000 (00:11 +0100)]
Added .send method to cloudfiles storage object

.. wrapper. Also added some logging - A .warn() for the legacy .write()
method and a .debug() for the new copy_local_to_storage()

11 years agoMake Cloudfiles copy memory efficient too (#419)
Sebastian Spaeth [Wed, 19 Dec 2012 14:59:44 +0000 (15:59 +0100)]
Make Cloudfiles copy memory efficient too (#419)

It seems that (our implementation of) cloudfiles.write() takes
all existing data and appends write(data) to it, sending the
full monty over the wire everytime. This would of course
absolutely kill chunked writes with some O(1^n) performance
and bandwidth usage. So, override this method and use the
Cloudfile's "send" interface instead.

Also make the Cloudfile file wrapper an iterator that allows us to
simply do "for data in cloudfile:" which will stream the data in a
memory-efficient way.

DO NOTE THAT THIS PATCH IS COMPLETELY UNTESTED DUE TO LACK OF SETUP
PLEASE REVIEW AND VERIFY.

11 years agoFixed hidden fields in oauth client authorization
Joar Wandborg [Sat, 2 Mar 2013 22:40:24 +0000 (23:40 +0100)]
Fixed hidden fields in oauth client authorization

Removed the translation marking and passed in empty strings to avoid
WTForms automagically creating the labels from the field names (i.e.
client_id => 'Client Id').

11 years agoDo not encode the next kwarg twice
Joar Wandborg [Sat, 2 Mar 2013 22:17:50 +0000 (23:17 +0100)]
Do not encode the next kwarg twice

11 years agoTurn "License preference" into a normal field.
Elrond [Sat, 2 Mar 2013 15:02:51 +0000 (16:02 +0100)]
Turn "License preference" into a normal field.

instead of rendering it by hand, use the normal field
rendering tools.

Old:
[choose box] License preference
New:
License preference
[choose box]
This will be your default license on upload forms.

11 years agoIf we're not transcoding, copy this file directly over to ['original']
Christopher Allan Webber [Fri, 1 Mar 2013 23:28:07 +0000 (17:28 -0600)]
If we're not transcoding, copy this file directly over to ['original']

There's no reason to copy it over to 'webm_640' in such a case,
clearly.

Added logic so we don't do it twice either.

Haven't tested this yet though ;)

This commit sponsored by Algot Runeman.  Thank you!

11 years agoMerge branch 'master' into joar-skip_transcoding
Christopher Allan Webber [Fri, 1 Mar 2013 22:29:22 +0000 (16:29 -0600)]
Merge branch 'master' into joar-skip_transcoding

Conflicts:
mediagoblin/config_spec.ini

11 years agoFix some media page redirects in media_collect.
Elrond [Fri, 1 Mar 2013 13:45:20 +0000 (14:45 +0100)]
Fix some media page redirects in media_collect.

Use .slug_or_id instead of only .id.

11 years agoFixup _("...") % (...) in media_collect.
Elrond [Sun, 24 Feb 2013 17:30:26 +0000 (18:30 +0100)]
Fixup _("...") % (...) in media_collect.

Get some messages translated.

Bad:  _("..." % (...))
Good: _("...") % (...)

11 years agoMediaGoblin not really anything to do with FooCorp anymore.
Christopher Allan Webber [Wed, 27 Feb 2013 20:08:38 +0000 (14:08 -0600)]
MediaGoblin not really anything to do with FooCorp anymore.

11 years agoFixing translations stuff for command line tools and such.
Christopher Allan Webber [Wed, 27 Feb 2013 19:25:42 +0000 (13:25 -0600)]
Fixing translations stuff for command line tools and such.

We had switched mg_globals to have the default translations set to
None so that it would be set up by the mediagoblin app later.
However, this would mean that things like scripts would try to call
gettext and error out.

Thanks to Tumulte for catching this.

This commit sponsored by Aurimas Fišeras.  Thank you!

11 years agoSimplifying the test for whether or not a user and slug combo exists.
Christopher Allan Webber [Wed, 27 Feb 2013 15:56:56 +0000 (09:56 -0600)]
Simplifying the test for whether or not a user and slug combo exists.

Thanks to tchernobog for catching this (it was breaking on postgres)
and Elrond for the suggestion on how to fix it.

This commit sponsored by Caleb Cooper.  Thanks Caleb!

11 years agoRemoving html5shiv for not complying with its own licenses and racism
Christopher Allan Webber [Tue, 26 Feb 2013 23:49:53 +0000 (17:49 -0600)]
Removing html5shiv for not complying with its own licenses and racism

Issues of racism seem to have been resolved and removed from upstream,
but make having this as a dependency somewhat uncomfortable:
  https://github.com/aFarkas/html5shiv/issues/91

Regardless, at the time of writing the project doesn't comply with its
own license... it states to be dual licensed under MIT and GPLv2 but
distributes neither of these licenses with its source.

11 years agoAllow media managers without sniff_handler
Joar Wandborg [Tue, 26 Feb 2013 22:57:20 +0000 (23:57 +0100)]
Allow media managers without sniff_handler

11 years agoCopying the license from the jquery repository rather than the generic MIT one.
Christopher Allan Webber [Tue, 26 Feb 2013 23:17:27 +0000 (17:17 -0600)]
Copying the license from the jquery repository rather than the generic MIT one.

Damned MIT and BSD licenses encouraging modification by every project
makes compliance annoying.

11 years agoSimplifying the "id:" url detection, per Elrond's suggestion.
Christopher Allan Webber [Tue, 26 Feb 2013 20:04:26 +0000 (14:04 -0600)]
Simplifying the "id:" url detection, per Elrond's suggestion.

As pointed out, we didn't need that nested if.

This commit sponsored by Paul Kuriakose.  Thank you!

11 years agoReplacing several request.matchdict['media'] -> media_slug ... shorter!
Christopher Allan Webber [Tue, 26 Feb 2013 19:54:19 +0000 (13:54 -0600)]
Replacing several request.matchdict['media'] -> media_slug ... shorter!

Thanks for pointing this out, Elrond ;)

This commit sponsored by Gerardo Joven Valdivia.  Thank you!

11 years agoMedia URLs with ids in them are now like /u/cwebber/m/id:4112/ rather than /u/cwebber...
Christopher Allan Webber [Tue, 26 Feb 2013 19:38:11 +0000 (13:38 -0600)]
Media URLs with ids in them are now like /u/cwebber/m/id:4112/ rather than /u/cwebber/m/4112/

This avoids some potential name collision issues.

This commit sponsored by Asokan Pichai.  Thank you!

11 years agoStylistic cleanups to some urlgen calls.
Christopher Allan Webber [Tue, 26 Feb 2013 19:08:23 +0000 (13:08 -0600)]
Stylistic cleanups to some urlgen calls.

This commit sponsored by Stephane Berube.  Thank you!

11 years agoSmall PEP-8 compliance fix.
Christopher Allan Webber [Tue, 26 Feb 2013 16:33:51 +0000 (10:33 -0600)]
Small PEP-8 compliance fix.

This commit sponsored by Mats Sjöberg.  Thanks!

11 years agoImport sqlalchemy's and_ and use it in our select statement
Christopher Allan Webber [Tue, 26 Feb 2013 16:15:26 +0000 (10:15 -0600)]
Import sqlalchemy's and_ and use it in our select statement

This commit sponsored by Hans-Jörg Dollansky.  Thank you!

11 years agoAnd of course, we need to actually commit at the end of a migration.
Christopher Allan Webber [Tue, 26 Feb 2013 15:58:25 +0000 (09:58 -0600)]
And of course, we need to actually commit at the end of a migration.

This commit sponsored by Tamas Kemenczy.  Thanks, Tamas!

11 years agoDope'ily missed .count() on the query where we're counting
Christopher Allan Webber [Mon, 25 Feb 2013 22:35:05 +0000 (16:35 -0600)]
Dope'ily missed .count() on the query where we're counting

Thanks for catching, Elrond.

This commit sponsored by Graham King.  Thank you!

11 years agoSupplying migrations for a bold new era of mediagoblin entry slugs
Christopher Allan Webber [Mon, 25 Feb 2013 22:16:21 +0000 (16:16 -0600)]
Supplying migrations for a bold new era of mediagoblin entry slugs

Okay, that's a totally confusing statement, but the docstring of this
migration summarizes it well:

  Entries without slugs now display differently in the url like:
    /u/cwebber/m/id=251/

  ... because of this, we should back-convert:
   - entries without slugs should be converted to use the id, if possible, to
     make old urls still work
   - slugs with = (or also : which is now also not allowed) to have those
     stripped out (small possibility of breakage here sadly)

This commit sponsored by John Sullivan.  Thanks johnsu01! :)

11 years agoYou can now set the PASTE_CONFIG environment variable to control logging setup
Christopher Allan Webber [Mon, 25 Feb 2013 18:15:12 +0000 (12:15 -0600)]
You can now set the PASTE_CONFIG environment variable to control logging setup

So this should work:

  PASTE_CONFIG=/path/to/paste_foo.ini ./lazycelery.sh

Thanks to Laurent Fournier for sponsoring this commit!

11 years agoRemoving stray character from pythonsnake's doc change and filling comment
Christopher Allan Webber [Sun, 24 Feb 2013 22:37:39 +0000 (16:37 -0600)]
Removing stray character from pythonsnake's doc change and filling comment

This commit sponsored by Johannes Knabbe.  Thank you!

11 years agoFix bug 461
pythonsnake [Sun, 10 Feb 2013 13:07:09 +0000 (14:07 +0100)]
Fix bug 461

11 years agoImproved dropdown styling, part deux
Jef van Schendel [Sun, 24 Feb 2013 20:09:16 +0000 (21:09 +0100)]
Improved dropdown styling, part deux

11 years agoMerge branch 'master' of gitorious.org:mediagoblin/mediagoblin
Jef van Schendel [Sun, 24 Feb 2013 19:54:10 +0000 (20:54 +0100)]
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin

11 years agoImproved dropdown styling
Jef van Schendel [Sun, 24 Feb 2013 19:53:34 +0000 (20:53 +0100)]
Improved dropdown styling

11 years agoChanging the order so that config_spec.ini is mentioned after mediagoblin_local.ini
Christopher Allan Webber [Sun, 24 Feb 2013 19:53:15 +0000 (13:53 -0600)]
Changing the order so that config_spec.ini is mentioned after mediagoblin_local.ini

This commit sponsored by Matteo Settenvini.  Thanks!

11 years agoMerge remote-tracking branch 'refs/remotes/pythonsnake/581_config'
Christopher Allan Webber [Sun, 24 Feb 2013 19:52:13 +0000 (13:52 -0600)]
Merge remote-tracking branch 'refs/remotes/pythonsnake/581_config'

11 years agoMerge remote-tracking branch 'refs/remotes/pythonsnake/629_autoplay'
Christopher Allan Webber [Sun, 24 Feb 2013 19:06:53 +0000 (13:06 -0600)]
Merge remote-tracking branch 'refs/remotes/pythonsnake/629_autoplay'

11 years agoRenaming "extrahead" template hooks to "head".
Christopher Allan Webber [Sun, 24 Feb 2013 18:42:17 +0000 (12:42 -0600)]
Renaming "extrahead" template hooks to "head".

As Elrond points out, the "extra" is implied by it being a hook!

This commit sponsored by Andrew Fustini.  Thanks, Drew!

11 years agoextra_head template hook. This will allow plugins to add extra js/css more easily.
Christopher Allan Webber [Sun, 24 Feb 2013 18:33:39 +0000 (12:33 -0600)]
extra_head template hook.  This will allow plugins to add extra js/css more easily.

This commit sponsored by Moritz Berberich.  Thank you!

11 years agoAdd owner to list of collections.
Elrond [Sun, 24 Feb 2013 15:09:45 +0000 (16:09 +0100)]
Add owner to list of collections.

When listing the collections, that a media is contained in,
also show the owner of the collection.

Also simplify the whole looping a lot.