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.
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').
Joar Wandborg [Sat, 2 Mar 2013 22:17:50 +0000 (23:17 +0100)]
Do not encode the next kwarg twice
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.
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!
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
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.
Elrond [Sun, 24 Feb 2013 17:30:26 +0000 (18:30 +0100)]
Fixup _("...") % (...) in media_collect.
Get some messages translated.
Bad: _("..." % (...))
Good: _("...") % (...)
Christopher Allan Webber [Wed, 27 Feb 2013 20:08:38 +0000 (14:08 -0600)]
MediaGoblin not really anything to do with FooCorp anymore.
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!
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!
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.
Joar Wandborg [Tue, 26 Feb 2013 22:57:20 +0000 (23:57 +0100)]
Allow media managers without sniff_handler
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.
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!
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!
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!
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!
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!
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!
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!
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!
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! :)
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!
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!
pythonsnake [Sun, 10 Feb 2013 13:07:09 +0000 (14:07 +0100)]
Fix bug 461
Jef van Schendel [Sun, 24 Feb 2013 20:09:16 +0000 (21:09 +0100)]
Improved dropdown styling, part deux
Jef van Schendel [Sun, 24 Feb 2013 19:54:10 +0000 (20:54 +0100)]
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
Jef van Schendel [Sun, 24 Feb 2013 19:53:34 +0000 (20:53 +0100)]
Improved dropdown styling
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!
Christopher Allan Webber [Sun, 24 Feb 2013 19:52:13 +0000 (13:52 -0600)]
Merge remote-tracking branch 'refs/remotes/pythonsnake/581_config'
Christopher Allan Webber [Sun, 24 Feb 2013 19:06:53 +0000 (13:06 -0600)]
Merge remote-tracking branch 'refs/remotes/pythonsnake/629_autoplay'
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!
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!
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.
Elrond [Sun, 24 Feb 2013 15:08:55 +0000 (16:08 +0100)]
Use media.id for collecting media too.
Also remove some useless whitespace while at it.
Elrond [Sun, 24 Feb 2013 10:30:17 +0000 (11:30 +0100)]
Use the media id for attachmemt editing.
And remove some stray white space from the output.
Christopher Allan Webber [Sat, 23 Feb 2013 16:47:51 +0000 (10:47 -0600)]
Committing extracted and compiled translations
Christopher Allan Webber [Sat, 23 Feb 2013 16:46:56 +0000 (10:46 -0600)]
Committing present MediaGoblin translations before pushing extracted messages
Joar Wandborg [Fri, 22 Feb 2013 21:36:00 +0000 (22:36 +0100)]
Fix stray comma in listings.views.atom_feed
Joar Wandborg [Fri, 22 Feb 2013 21:20:06 +0000 (22:20 +0100)]
Added some empty templates
- Make it possible for site owners to hook into base.html without
tainting the repository.
András Veres-Szentkirályi [Thu, 21 Feb 2013 10:32:01 +0000 (11:32 +0100)]
simplified get_useful
András Veres-Szentkirályi [Thu, 21 Feb 2013 10:31:25 +0000 (11:31 +0100)]
use dict.iteritems() instead of dict.items()
András Veres-Szentkirályi [Thu, 21 Feb 2013 10:31:08 +0000 (11:31 +0100)]
use list expression instead of 3-deep for
András Veres-Szentkirályi [Thu, 21 Feb 2013 10:30:23 +0000 (11:30 +0100)]
simplified clean_exif
András Veres-Szentkirályi [Thu, 21 Feb 2013 10:29:24 +0000 (11:29 +0100)]
close file properly and remove unneeded variable
András Veres-Szentkirályi [Thu, 21 Feb 2013 10:28:55 +0000 (11:28 +0100)]
typofix in comment
András Veres-Szentkirályi [Thu, 21 Feb 2013 10:15:14 +0000 (11:15 +0100)]
use key in dict instead of key in dict.keys()
András Veres-Szentkirályi [Thu, 21 Feb 2013 09:58:30 +0000 (10:58 +0100)]
removed unused import cgi.FieldStorage
András Veres-Szentkirályi [Thu, 21 Feb 2013 09:51:13 +0000 (10:51 +0100)]
removed unused import re
András Veres-Szentkirályi [Thu, 21 Feb 2013 09:48:52 +0000 (10:48 +0100)]
removed unnecessary collection lookup
András Veres-Szentkirályi [Thu, 21 Feb 2013 09:48:18 +0000 (10:48 +0100)]
removed unused import NotFound
Christopher Allan Webber [Fri, 22 Feb 2013 21:04:06 +0000 (15:04 -0600)]
Changing name for atom feed view to be more generic than tags.
This commit sponsored by Ben Hutchings. Thanks, Ben!
Sebastian Spaeth [Tue, 13 Nov 2012 10:35:28 +0000 (11:35 +0100)]
Integrate all atom feed in template
Embed the atom feed link in the root template (most recent media
page) for easier discovery. Delete the (listings/all.html) template
as contributed in commit
195e79098b5 as it was unused and the feed
is essentially showing the most recent media anyway.
Sebastian Spaeth [Tue, 27 Mar 2012 20:58:58 +0000 (15:58 -0500)]
Adding an Atom RSS feed for all media on the server
Go to /atom/ in your browser to see it.
Elrond [Fri, 22 Feb 2013 13:19:19 +0000 (14:19 +0100)]
Create wtforms_util.render_label(_p) and use it around.
- This makes many places more readable.
- Gives us translation in two places.
- Allows easier changing of labels in a central place.
Elrond [Mon, 4 Feb 2013 20:25:01 +0000 (21:25 +0100)]
Use wtforms_util.render_field_div more in media_collect.html
If we have to render fields individually, we still can use
wtforms_util.render_field_div for each field. Makes things
much smaller and readable.
Christopher Allan Webber [Thu, 21 Feb 2013 23:58:27 +0000 (17:58 -0600)]
Merge remote-tracking branch 'aleksej/632_config_spec_comment_typo'
Christopher Allan Webber [Thu, 21 Feb 2013 22:29:16 +0000 (16:29 -0600)]
Remove "translation legos" and linkify the tag to more generic tag listing
By "translation legos" I mean having multiple strings to be translated
appended together. This isn't a good idea because you can't assume
that syntax will work together in the same way in another language, so
you may be making things hard or impossible for translators.
Between this and the last commit, this means that tags now link to
user tagged media specifically, and if people want a more general tag
listing, they can click on the tag link to get to a more general
listing. I feel this is a good and intuitive route to handling this.
This sponsored commit brought to you by Debarshi Ray! Thank you!
Christopher Allan Webber [Thu, 21 Feb 2013 22:19:43 +0000 (16:19 -0600)]
Making the tags on media pages point to the user's tag listing specifically.
This commit sponsored by Torsten Meissner. Thanks, Torsten!
Christopher Allan Webber [Thu, 21 Feb 2013 22:13:56 +0000 (16:13 -0600)]
Fixing user gallery tags filter to be on slug rather than name.
This commit sponsored by Kat Walsh. Thanks, Kat!
Christopher Allan Webber [Thu, 21 Feb 2013 21:55:26 +0000 (15:55 -0600)]
Merge remote-tracking branch 'refs/remotes/spaetz/WIP/user_tag_gallery'
Runar Petursson [Fri, 15 Feb 2013 02:17:24 +0000 (10:17 +0800)]
plugins/api: fix for cross origin requests
The response headers were never getting set because of a bug in the
7c552c0
commit. This expands the loop into a more readable form and results in the
headers getting set.
Elrond [Tue, 19 Feb 2013 16:14:13 +0000 (17:14 +0100)]
Fix some small bits in base.html.
1. Add a trailing slash to the mediagoblin.org URL.
(The string changed anyway, so translations are not
affected more than already.)
2. Order was wrong for those two at the end (old version):
{% endblock mediagoblin_body %}
</div>
3. Fix some little indenting issues.
4. Remove some useless space from the output.
Elrond [Tue, 19 Feb 2013 12:34:13 +0000 (13:34 +0100)]
Merge remote-tracking branch 'pythonsnake/537_version'
* pythonsnake/537_version:
Added "version" before the version
Fix bug 537
Elrond [Mon, 18 Feb 2013 13:46:28 +0000 (14:46 +0100)]
Fix deleting media with attachments.
If one deletes a media with attachments, there have been
various problems:
1) If the file in the storage did not exist any more (maybe
because due to a previous deletion attempt?), the error
propagation failed, because the wrong thing was
gathered.
2) The attachment database entries were not deleted.
Using cascade for this, for now.
Also add a simple unit test, that tests both by having a
broken attachment on a media.
Joar Wandborg [Mon, 18 Feb 2013 13:41:34 +0000 (14:41 +0100)]
Fix errors in collection views
When a collection does not exist, render the 404 page.
Joar Wandborg [Wed, 13 Feb 2013 22:12:55 +0000 (23:12 +0100)]
Change from email format in tag URI to domain format
Also fixed a bug (thanks pyflakes)
Joar Wandborg [Sat, 2 Feb 2013 22:25:04 +0000 (23:25 +0100)]
Address concerns in Issue #543
- Fixed PEP-008 issues.
- Removed .user-{user} from the tag URI and put it before the domain,
such as {user}@{host} instead.
- Use year from collection.created instead of current year.
pythonsnake [Wed, 13 Feb 2013 15:56:24 +0000 (16:56 +0100)]
Mention mediagoblin/config_spec.ini
Elrond [Tue, 12 Feb 2013 23:02:56 +0000 (00:02 +0100)]
Add markdown notice to collection description.
Use wtforms_util.render_field_div on the collection
description, so that the markdown notice in the wtform is
actually rendered to html.
pythonsnake [Mon, 11 Feb 2013 15:57:33 +0000 (16:57 +0100)]
Added "version" before the version
Christopher Allan Webber [Sun, 10 Feb 2013 19:49:35 +0000 (13:49 -0600)]
Fixing MANIFEST.in: graft expects one directory per line
Christopher Allan Webber [Sun, 10 Feb 2013 19:47:44 +0000 (13:47 -0600)]
Updating MANIFEST.in for more files... trying to make this work on pypi :)
Joar Wandborg [Sun, 10 Feb 2013 19:19:13 +0000 (20:19 +0100)]
Tuned logging and added comments to 511 fix
pythonsnake [Sun, 10 Feb 2013 10:43:18 +0000 (11:43 +0100)]
Fixed issue #511.
pythonsnake [Sun, 10 Feb 2013 14:08:15 +0000 (15:08 +0100)]
Fix bug 629
pythonsnake [Sun, 10 Feb 2013 11:01:24 +0000 (12:01 +0100)]
Fix bug 537
Aleksej [Sun, 10 Feb 2013 10:13:46 +0000 (14:13 +0400)]
correct typo in a comment in config_spec.ini
Christopher Allan Webber [Sat, 9 Feb 2013 21:33:06 +0000 (15:33 -0600)]
Merge remote-tracking branch 'refs/remotes/elrond/sql/media_data'
Elrond [Sat, 9 Feb 2013 10:34:57 +0000 (11:34 +0100)]
Add type="text/javascript" for <script>.
Our jquery <script> tag did not have a proper type
attribute.
Jef van Schendel [Fri, 8 Feb 2013 22:30:32 +0000 (23:30 +0100)]
Add translation tags; remove unnecessary title attribute from link
Jef van Schendel [Fri, 8 Feb 2013 22:28:13 +0000 (23:28 +0100)]
Remove unused translation variable
Jef van Schendel [Fri, 8 Feb 2013 21:54:16 +0000 (22:54 +0100)]
Fix "Add to collection" button: remove icon, add text, add to collections.html
Jef van Schendel [Fri, 8 Feb 2013 21:08:17 +0000 (22:08 +0100)]
Remove the collection counter because it's not needed
Elrond [Sat, 26 Jan 2013 14:28:24 +0000 (15:28 +0100)]
Kill monkeypatching of ProcessingState.
And change the process_foo() API to accept a
processingstate now.
image and video are tested, the others are UNTESTED.
Elrond [Sat, 26 Jan 2013 14:08:12 +0000 (15:08 +0100)]
Also refactor "copy original into public storage".
This makes the processing code easier to read/write and
alos will help the reprocessing once we get to it.
Thanks to Joar Wandborg for testing!
Elrond [Sat, 26 Jan 2013 13:54:17 +0000 (14:54 +0100)]
Use ProcessingState for video.
Rewrite video to use the new ProcessingState.
Thanks to Joar Wandborg for testing!
Elrond [Thu, 24 Jan 2013 09:23:38 +0000 (10:23 +0100)]
ProcessingState: Document monkey patching.
Elrond [Wed, 23 Jan 2013 18:44:28 +0000 (19:44 +0100)]
Implement ProcessingState class and use for images
The idea is to have a class that has the knowledge of the
currently being processed media and also has tools for
that.
The long term idea is to make reprocessing easier by for
example hiding the way the original comes into the
processing code.
Joar Wandborg [Thu, 7 Feb 2013 21:35:42 +0000 (22:35 +0100)]
Use logging.config.fileConfig()
Instead of the monster I had built before.
Elrond [Wed, 6 Feb 2013 23:31:37 +0000 (00:31 +0100)]
Use system wide EXIF package, if available.
Created and tested by Simon Fondrie-Teitler.
Thanks!
Christopher Allan Webber [Tue, 5 Feb 2013 21:13:44 +0000 (15:13 -0600)]
Committing extracted and compiled translations
Christopher Allan Webber [Tue, 5 Feb 2013 21:12:27 +0000 (15:12 -0600)]
Committing present MediaGoblin translations before pushing extracted messages
Elrond [Tue, 5 Feb 2013 15:50:35 +0000 (16:50 +0100)]
Rename {{title}} to {{media_title}}.
Rename a variable in a translated string to make it easier
for translators to know what they're dealing with.
And add a <title/> block.
Elrond [Tue, 5 Feb 2013 15:25:19 +0000 (16:25 +0100)]
Mark "Collection" for translation in media_collect.
Elrond [Mon, 4 Feb 2013 20:26:09 +0000 (21:26 +0100)]
Merge remote-tracking branch 'aleksej/quotes_and_a_for_addcoll'
* aleksej/quotes_and_a_for_addcoll:
Small changes to "Add <media> to collection" string
Aleksej [Mon, 4 Feb 2013 20:07:47 +0000 (00:07 +0400)]
Small changes to "Add <media> to collection" string
Add quotation marks and "a" ("a" was proposed by Elrond).
Elrond [Mon, 4 Feb 2013 16:11:01 +0000 (17:11 +0100)]
Issue 621: Extract strings from hooked templates.
templates using the new hook system were not extracted
properly. One needs to add the new extension to the
extraction process as well.
Elrond [Mon, 4 Feb 2013 13:17:00 +0000 (14:17 +0100)]
Search for translation in all templates.
We missed to search for translatable strings in our plugins
and other things that might have templates.
The search is now for **/templates/**.html. That should
catch a lot more.