From: Boris Bobrov Date: Tue, 10 Jul 2018 16:29:30 +0000 (+0200) Subject: Merge remote-tracking branch 'gsoc2016/Subtitle-1' X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=e08de70757b6f973bc2955f1b3292d383a19b21d;hp=7ab18019782b285a5bf9fc79227e0d0d4896398a;p=mediagoblin.git Merge remote-tracking branch 'gsoc2016/Subtitle-1' --- diff --git a/.gitignore b/.gitignore index c4a1497f..4eb61d66 100644 --- a/.gitignore +++ b/.gitignore @@ -50,6 +50,7 @@ *~ *.swp *.mo +*.patch # The legacy of buildout .installed.cfg diff --git a/.gitmodules b/.gitmodules index 562ad4e4..d9171995 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,12 @@ [submodule "pdf.js"] path = pdf.js - url = git://github.com/mozilla/pdf.js.git + url = https://github.com/mozilla/pdf.js.git [submodule "extlib/pdf.js"] path = extlib/pdf.js - url = git://github.com/mozilla/pdf.js.git + url = https://github.com/mozilla/pdf.js.git [submodule "extlib/skeleton"] path = extlib/skeleton - url = git://github.com/dhg/Skeleton.git + url = https://github.com/dhg/Skeleton.git [submodule "extlib/sandyseventiesspeedboat"] path = extlib/sandyseventiesspeedboat url = https://github.com/jpope777/sandyseventiesspeedboat-mg.git diff --git a/AUTHORS b/AUTHORS index f7ee02db..1808fa4a 100644 --- a/AUTHORS +++ b/AUTHORS @@ -13,6 +13,7 @@ Thank you! * Alejandro Villanueva * Aleksandar Micovic * Aleksej Serdjukov +* Alexandre Franke * Alon Levy * Alex Camelio * Amirouche Boubekki @@ -31,10 +32,12 @@ Thank you! * Corey Farwell * Chris Moylan * Christopher Allan Webber +* chrysn * Dan Callahan * David Thompson * Daniel Krol * Daniel Neel +* Matthew Deal * Deb Nicholson * Devan Goodwin * Derek Moore @@ -56,10 +59,13 @@ Thank you! * Jiyda Mint Moussa * Jim Campbell * Joar Wandborg +* Jonathan Sandoval * Jorge Araya Navarro * Josephine Bartholoma +* Josh Crompton * Karen Rustad * Kenneth Dombrowski +* Kesara Rathnayake * Kushal Kumaran * Kuno Woudt * Laura Arjona @@ -76,6 +82,7 @@ Thank you! * Matt Lee * Matt Molyneaux * Meg Ford +* mi * Michele Azzolari * Mike Linksvayer * Natalie Foust-Pilcher @@ -85,8 +92,10 @@ Thank you! * Pablo J. Urbano Santos * Praveen Kumar * Rasmus Larsson +* Robert Smith * Rodney Ewing * Rodrigo Rodrigues da Silva +* Romain Porte * Runar Petursson * Sacha De'Angeli * Sam Clegg @@ -98,11 +107,13 @@ Thank you! * Shawn Khan * Simon Fondrie-Teitler * Stefano Zacchiroli +* Stéphane Péchard * thallian * Tiberiu C. Turbureanu * Tom Fay * Tran Thanh Bao * Tryggvi Björgvinsson +* Vijeth Aradhya * Will Kahn-Greene * 宋文武 diff --git a/MANIFEST.in b/MANIFEST.in index 675c8081..dd2fd23a 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -3,8 +3,17 @@ recursive-include mediagoblin *.js *.css *.png *.svg *.ico recursive-include mediagoblin *.ini recursive-include mediagoblin *.html *.txt recursive-include docs *.rst *.html +recursive-include mediagoblin/db/migrations/versions *.py +recursive-include mediagoblin/media_types/ascii/migrations *.py +recursive-include mediagoblin/media_types/audio/migrations *.py +recursive-include mediagoblin/media_types/blog/migrations *.py +recursive-include mediagoblin/media_types/image/migrations *.py +recursive-include mediagoblin/media_types/pdf/migrations *.py +recursive-include mediagoblin/media_types/stl/migrations *.py +recursive-include mediagoblin/media_types/video/migrations *.py include mediagoblin.example.ini mediagoblin/config_spec.ini paste.ini include mediagoblin/config_spec.ini +include mediagoblin/db/migrations/alembic.ini graft extlib graft licenses graft devtools diff --git a/bower.json b/bower.json index 5f7fff5d..993921bd 100644 --- a/bower.json +++ b/bower.json @@ -14,7 +14,6 @@ "dependencies": { "jquery": "~2.1.3", "video.js": "~4.11.4", - "leaflet": "~0.7.3", - "tinymce": "~4.1.7" + "leaflet": "~0.7.3" } } diff --git a/docs/source/api/authentication.rst b/docs/source/api/authentication.rst index 1d52d300..2db4a7bd 100644 --- a/docs/source/api/authentication.rst +++ b/docs/source/api/authentication.rst @@ -144,7 +144,7 @@ Only set client_id for update. Only set client_secret for update. This should only be given when you update. -Logo URL is not a valid URL +Logo URL is not a valid URL This is when the URL specified did not meet the validation. contacts must be a string of space-separated email addresses. @@ -171,7 +171,7 @@ We are not using OAuth2 as we want to stay completely compatible with pump.io. Endpoints --------- -These are the endpoints you need to use for the oauth requests: +These are the endpoints you need to use for the OAuth requests: `/oauth/request_token` is for getting the request token. diff --git a/docs/source/api/objects.rst b/docs/source/api/objects.rst index 4c199616..854febe1 100644 --- a/docs/source/api/objects.rst +++ b/docs/source/api/objects.rst @@ -19,7 +19,7 @@ Objects Using any the APIs mentioned in this document you will required :doc:`authentication`. There are many ways to interact with objects, some of -which aren't supported yet by mediagoblin such as liking or sharing objects +which aren't supported yet by MediaGoblin such as liking or sharing objects however you can interact with them by updating them, deleting them and commenting on them. @@ -49,16 +49,16 @@ timestamps or any other data the server creates. My activity comment is:: This should be posted to the users feed (outbox) which you can find out about :doc:`activities`. You will get back the full activity containing all of -attributes including ID, urls, etc. +attributes including ID, URLs, etc. Posting Media ~~~~~~~~~~~~~ Posting media is a special case from posting all other objects. This is because you need to submit more than just the JSON image representation, you need to -actually subject the image itself. There is also strange behavour around media +actually subject the image itself. There is also strange behavior around media postings where if you want to give the media you're posting a title or -description you need to peform an update too. A full media posting in order of +description you need to perform an update too. A full media posting in order of steps to do is as follows: 1) Uploads the data to the server @@ -74,7 +74,7 @@ To upload media you should use the URL `/api/user//uploads`. A POST request should be made to the media upload URL submitting at least two headers: -* `Content-Type` - This being a valid mimetype for the media. +* `Content-Type` - This being a valid MIME type for the media. * `Content-Length` - size in bytes of the media. The media data should be submitted as POST data to the image upload URL. @@ -196,8 +196,8 @@ You should get the full delete activity in response. .. warning:: While deletion works, currently because of the way deletion is implemented - deletion either via the API or the webUI causes any activities to be broken - and will be skipped and unaccessible. A migration to remove the broken + deletion either via the API or the web UI causes any activities to be broken + and will be skipped and inaccessible. A migration to remove the broken activities will come in a future release when soft-deletion has been implemented. diff --git a/docs/source/devel/codebase.rst b/docs/source/devel/codebase.rst index 122a3297..068c1873 100644 --- a/docs/source/devel/codebase.rst +++ b/docs/source/devel/codebase.rst @@ -44,7 +44,7 @@ development. What's where ============ -After you've run checked out mediagoblin and followed the virtualenv +After you've run checked out MediaGoblin and followed the virtualenv instantiation instructions, you're faced with the following directory tree:: @@ -86,8 +86,8 @@ As you can see, all the code for GNU MediaGoblin is in the Here are some interesting files and what they do: -:routing.py: maps url paths to views -:views.py: views handle http requests +:routing.py: maps URL paths to views +:views.py: views handle HTTP requests :forms.py: wtforms stuff for this submodule You'll notice that there are several sub-directories: tests, @@ -97,7 +97,7 @@ templates, auth, submit, ... ``templates`` holds all the templates for the output. -``auth`` and ``submit`` are modules that enacpsulate authentication +``auth`` and ``submit`` are modules that encapsulate authentication and media item submission. If you look in these directories, you'll see they have their own ``routing.py``, ``view.py``, and forms.py in addition to some other code. @@ -123,15 +123,15 @@ Software Stack for unit tests * `virtualenv `_: for setting up an - isolated environment to keep mediagoblin and related packages + isolated environment to keep MediaGoblin and related packages (potentially not required if MediaGoblin is packaged for your distro) * Data storage * `SQLAlchemy `_: SQL ORM and database - interaction library for Python. Currently we support sqlite and - postgress as backends. + interaction library for Python. Currently we support SQLite and + PostgreSQL as backends. * Web application @@ -158,10 +158,10 @@ Software Stack * `Markdown (for python) `_: implementation of `Markdown `_ - text-to-html tool to make it easy for people to write richtext + text-to-html tool to make it easy for people to write rich text comments, descriptions, and etc. - * `lxml `_: nice xml and html processing for + * `lxml `_: nice XML and HTML processing for python. * Media processing libraries @@ -174,10 +174,10 @@ Software Stack future, probably audio too. * `chardet `_: (Optional, for - ascii art hosting sites only) Used to make ascii art thumbnails. + ASCII art hosting sites only) Used to make ASCII art thumbnails. * Front end - * `JQuery `_: for groovy JavaScript things + * `jQuery `_: for groovy JavaScript things diff --git a/docs/source/devel/migrations.rst b/docs/source/devel/migrations.rst index 5e0a6bee..ec0f7d29 100644 --- a/docs/source/devel/migrations.rst +++ b/docs/source/devel/migrations.rst @@ -31,7 +31,7 @@ There's a few things you need to know: - We use `Alembic `_ to run migrations. We also make heavy use of the `branching model `_ - for our plugins. Every plugin gets its own migration branc. + for our plugins. Every plugin gets its own migration branch. - We used to use `sqlalchemy-migrate `_. See `their docs `_. @@ -41,7 +41,7 @@ There's a few things you need to know: - SQLAlchemy has two parts to it, the ORM and the "core" interface. We DO NOT use the ORM when running migrations. Think about it: the ORM is set up with an expectation that the models already reflect a - certain pattern. But if a person is moving from their old patern + certain pattern. But if a person is moving from their old pattern and are running tools to *get to* the current pattern, of course their current database structure doesn't match the state of the ORM! Anyway, Alembic has its own conventions for migrations; follow those. diff --git a/docs/source/devel/originaldesigndecisions.rst b/docs/source/devel/originaldesigndecisions.rst index 2843870c..b60db776 100644 --- a/docs/source/devel/originaldesigndecisions.rst +++ b/docs/source/devel/originaldesigndecisions.rst @@ -38,7 +38,7 @@ Chris and Will on "Why GNU MediaGoblin": .. figure:: ../_static/goblin.png :alt: Cute goblin with a beret. - *Figure 1: Cute goblin with a beret. llustrated by Chris + *Figure 1: Cute goblin with a beret. Illustrated by Chris Webber* .. figure:: ../_static/snugglygoblin.png @@ -61,7 +61,7 @@ Chris and Will on "Why GNU MediaGoblin": 1. "GNU MediaGoblin" is the name we're going to use in all official capacities: web site, documentation, press releases, ... - 2. In casual conversation, it's ok to use more casual names. + 2. In casual conversation, it's OK to use more casual names. 3. If you're writing about the project, we ask that you call it GNU MediaGoblin. @@ -113,7 +113,7 @@ Why WSGI Minimalism Chris Webber on "Why WSGI Minimalism": If you notice in the technology list I list a lot of components - that are very "django-like", but not actually `Django`_ + that are very "Django-like", but not actually `Django`_ components. What can I say, I really like a lot of the ideas in Django! Which leads to the question: why not just use Django? @@ -176,7 +176,7 @@ Chris Webber on "Why MongoDB": ideal universe where everyone ran servers out of their own housing. As a memory-mapped database, MongoDB is pretty hungry, so actually I spent a lot of time debating whether the inability - to scale down as nicely as something like SQL has with sqlite + to scale down as nicely as something like SQL has with SQLite meant that it was out. But I decided in the end that I really want MongoDB, not for @@ -199,7 +199,7 @@ Chris Webber on "Why MongoDB": Being able to just dump media-specific information in a media_data - hashtable is pretty great, and even better is having a plugin + hash table is pretty great, and even better is having a plugin system where you can just let plugins have their own entire key-value space cleanly inside the document that doesn't interfere with anyone else's stuff. If we were to let plugins to deposit diff --git a/docs/source/devel/storage.rst b/docs/source/devel/storage.rst index 215f9579..46e163de 100644 --- a/docs/source/devel/storage.rst +++ b/docs/source/devel/storage.rst @@ -21,7 +21,7 @@ are: + **public_store:** After your media goes through processing it gets moved to the public store. This is also a StorageInterface - implelementation, and is for stuff that's intended to be seen by + implementation, and is for stuff that's intended to be seen by site visitors. The workbench @@ -43,11 +43,9 @@ Static assets / staticdirect ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ On top of all that, there is some static media that comes bundled with your -application. This stuff is kept in: +application. This stuff is kept in ``mediagoblin/static/``. - mediagoblin/static/ - -These files are for mediagoblin base assets. Things like the CSS files, +These files are for MediaGoblin base assets. Things like the CSS files, logos, etc. You can mount these at whatever location is appropriate to you (see the direct_remote_path option in the config file) so if your users are keeping their static assets at http://static.mgoblin.example.org/ but @@ -55,7 +53,7 @@ their actual site is at http://mgoblin.example.org/, you need to be able to get your static files in a where-it's-mounted agnostic way. There's a "staticdirector" attached to the request object. It's pretty easy to use; just look at this bit taken from the -mediagoblin/templates/mediagoblin/base.html main template: +mediagoblin/templates/mediagoblin/base.html main template:: @@ -76,9 +74,7 @@ So, the StorageInterface! So, the public and queue stores both use StorageInterface implementations ... but what does that mean? It's not too hard. -Open up: - - mediagoblin/storage.py +Open up ``mediagoblin/storage.py``. In here you'll see a couple of things. First of all, there's the StorageInterface class. What you'll see is that this is just a very simple @@ -95,12 +91,12 @@ also the default storage system used. As expected, this stores files locally on your machine. There's also a CloudFileStorage system. This provides a mapping to -[OpenStack's swift http://swift.openstack.org/] storage system (used by +[OpenStack's Swift http://swift.openstack.org/] storage system (used by RackSpace Cloud files and etc). Between these two examples you should be able to get a pretty good idea of how to write your own storage systems, for storing data across your -beowulf cluster of radioactive monkey brains, whatever. +Beowulf cluster of radioactive monkey brains, whatever. Writing code to store stuff ~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -112,10 +108,10 @@ https://docs.djangoproject.com/en/dev/ref/files/storage/]... with some differences. Basically, you access files on "file paths", which aren't exactly like -unix file paths, but are close. If you wanted to store a file on a path -like dir1/dir2/filename.jpg you'd actually write that file path like: +Unix file paths, but are close. If you wanted to store a file on a path +like dir1/dir2/filename.jpg you'd actually write that file path like:: -['dir1', 'dir2', 'filename.jpg'] + ['dir1', 'dir2', 'filename.jpg'] This way we can be *sure* that each component is actually a component of the path that's expected... we do some filename cleaning on each component. diff --git a/docs/source/index.rst b/docs/source/index.rst index a4fd2455..fbc57154 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -20,7 +20,7 @@ GNU MediaGoblin is a platform for sharing photos, video and other media in an environment that respects our freedom and independence. This is a Free Software project. It is built by contributors for all -to use and enjoy. If you're intrested in contributing, see `the wiki +to use and enjoy. If you're interested in contributing, see `the wiki `_ which has pages that talk about the ways someone can contribute. diff --git a/docs/source/pluginwriter/api.rst b/docs/source/pluginwriter/api.rst index a220eac1..03761a38 100644 --- a/docs/source/pluginwriter/api.rst +++ b/docs/source/pluginwriter/api.rst @@ -83,7 +83,7 @@ can use a shortcut to get your plugin's config section:: >>> floobie_dir = floobie_config['floobie_dir'] A tip: you have access to the `%(here)s` variable in your config, -which is the directory that the user's mediagoblin config is running +which is the directory that the user's MediaGoblin config is running out of. So for example, your plugin may need a "floobie" directory to store floobs in. You could give them a reasonable default that makes use of the default `user_dev` location, but allow users to override @@ -92,7 +92,7 @@ it, like so:: [plugin_spec] floobie_dir = string(default="%(here)s/user_dev/floobs/") -Note, this is relative to the user's mediagoblin config directory, +Note, this is relative to the user's MediaGoblin config directory, *not* your plugin directory! @@ -178,7 +178,7 @@ Adding static resources ----------------------- It's possible to add static resources for your plugin. Say your -plugin needs some special javascript and images... how to provide +plugin needs some special JavaScript and images... how to provide them? Then how to access them? MediaGoblin has a way! @@ -230,7 +230,7 @@ the MediaGoblin repository. WTForms hooks +++++++++++++ -We haven't totally settled on a way to tranform wtforms form objects, +We haven't totally settled on a way to transform wtforms form objects, but here's one way. In your view:: from mediagoblin.foo.forms import SomeForm diff --git a/docs/source/pluginwriter/authhooks.rst b/docs/source/pluginwriter/authhooks.rst index 9721d729..66d9b9da 100644 --- a/docs/source/pluginwriter/authhooks.rst +++ b/docs/source/pluginwriter/authhooks.rst @@ -44,7 +44,7 @@ This hook is called in ``mediagoblin.auth.views`` in both the ``login`` and if :ref:`basic_auth-chapter` is not enabled, the user will be redirected to the correct login and registration views for your plugin. -The code assumes that it can generate a valid url given +The code assumes that it can generate a valid URL given ``mediagoblin.plugins.{{ your_plugin_here }}.login`` and ``mediagoblin.plugins.{{ your_plugin_here }}.register``. This is only needed if you will not be using the ``login`` and ``register`` views in @@ -82,5 +82,5 @@ the ``stored_hash`` and return either ``True`` or ``False``. This hook is called in ``mediagoblin.auth.tools.check_login_simple``. It is called if a user is not found and should do something that takes the same amount -of time as your ``check_password`` function. This is to help prevent timining +of time as your ``check_password`` function. This is to help prevent timing attacks. diff --git a/docs/source/pluginwriter/database.rst b/docs/source/pluginwriter/database.rst index c0698a24..90c2cee3 100644 --- a/docs/source/pluginwriter/database.rst +++ b/docs/source/pluginwriter/database.rst @@ -24,7 +24,7 @@ Accessing Existing Data ======================= If your plugin wants to access existing data, this is quite -straight forward. Just import the appropiate models and use +straight forward. Just import the appropriate models and use the full power of SQLAlchemy. Take a look at the (upcoming) database section in the Developer's Chapter. @@ -134,13 +134,13 @@ plugin's models.py and then run:: ./bin/gmg alembic --with-plugins revision \ --head REVISION_HERE \ --autogenerate \ - -m "YOUR_PLUGIN_NAME: Change explaination here." + -m "YOUR_PLUGIN_NAME: Change explanation here." Once again, this will dump the migration into the wrong place, so move to your plugin's migrations directory. Open the file, adjust accordingly, and read carefully! Now you should also test your -migration with some real data. Be sure to test it both on sqlite -*AND* on postgresql! +migration with some real data. Be sure to test it both on SQLite +*AND* on PostgreSQL! One last *very critical* note: you must never, never modify core tables with your plugin. To do that is to put you and all your users diff --git a/docs/source/pluginwriter/hooks.rst b/docs/source/pluginwriter/hooks.rst index 4aa062e8..66fe3b4d 100644 --- a/docs/source/pluginwriter/hooks.rst +++ b/docs/source/pluginwriter/hooks.rst @@ -28,7 +28,7 @@ What hooks are available? This hook is used by ``add_media_to_collection`` in ``mediagoblin.user_pages.lib``. It gets a ``CollectionItem`` as its argument. -It's the newly created item just before getting commited. +It's the newly created item just before getting committed. So the item can be modified by the hook, if needed. Changing the session regarding this item is currently undefined behaviour, as the SQL Session might contain other diff --git a/docs/source/pluginwriter/quickstart.rst b/docs/source/pluginwriter/quickstart.rst index 6d45ea36..212c91ad 100644 --- a/docs/source/pluginwriter/quickstart.rst +++ b/docs/source/pluginwriter/quickstart.rst @@ -111,7 +111,7 @@ The code for ``__init__.py`` looks like this: :emphasize-lines: 12,23 import logging - from mediagoblin.tools.pluginapi import Plugin, get_config + from mediagoblin.tools.pluginapi import PluginManager, get_config # This creates a logger that you can use to log information to diff --git a/docs/source/pluginwriter/tests.rst b/docs/source/pluginwriter/tests.rst index fe99688f..560a8899 100644 --- a/docs/source/pluginwriter/tests.rst +++ b/docs/source/pluginwriter/tests.rst @@ -19,7 +19,7 @@ Here's a brief guide to writing unit tests for plugins. However, it isn't really ideal. It also hasn't been well tested... yes, there's some irony there :) -Some notes: we're using py.test and webtest for unit testing stuff. +Some notes: we're using py.test and WebTest for unit testing stuff. Keep that in mind. My suggestion is to mime the behavior of `mediagoblin/tests/` and put @@ -44,7 +44,7 @@ In any test module in your tests directory you can then do:: # real code goes here pass -And you'll get a mediagoblin application wrapped in webtest passed in +And you'll get a MediaGoblin application wrapped in WebTest passed in to your environment. If your plugin needs to define multiple configuration setups, you can @@ -52,8 +52,8 @@ actually set up multiple fixtures very easily for this. You can just set up multiple fixtures with different names that point to different configs and pass them in as that named argument. -To run the tests, from mediagoblin's directory (make sure that your -plugin has been added to your mediagoblin checkout's virtualenv!) do:: +To run the tests, from MediaGoblin's directory (make sure that your +plugin has been added to your MediaGoblin checkout's virtualenv!) do:: ./runtests.sh /path/to/myplugin/tests/ diff --git a/docs/source/siteadmin/commandline-upload.rst b/docs/source/siteadmin/commandline-upload.rst index 69098312..756f5fa8 100644 --- a/docs/source/siteadmin/commandline-upload.rst +++ b/docs/source/siteadmin/commandline-upload.rst @@ -37,6 +37,7 @@ Here's a longer example that makes use of more options:: ./bin/gmg addmedia aveyah awesome_spaceship.png \ --title "My awesome spaceship" \ --description "Flying my awesome spaceship, since I'm an awesome pilot" \ + --collection-slug i-m-an-awesome-pilot \ --license "http://creativecommons.org/licenses/by-sa/3.0/" \ --tags "spaceships, pilots, awesome" \ --slug "awesome-spaceship" @@ -57,7 +58,7 @@ it is a bit more complex. This is an example of what a script may look like. The important part here is that you have to create the 'metadata.csv' file.:: - media:location,dcterms:title,dcterms:creator,dcterms:type + location,dcterms:title,dcterms:creator,dcterms:type "http://www.example.net/path/to/nap.png","Goblin taking a nap",,"Image" "http://www.example.net/path/to/snore.ogg","Goblin Snoring","Me","Audio" @@ -65,14 +66,14 @@ The above is an example of a very simple metadata.csv file. The batchaddmedia script would read this and attempt to upload only two pieces of media, and would be able to automatically name them appropriately. -The csv file +The CSV file ============ The location column ------------------- The location column is the one column that is absolutely necessary for uploading your media. This gives a path to each piece of media you upload. This can either a path to a local file or a direct link to remote media (with the -link in http format). As you can see in the example above the (fake) media was +link in HTTP format). As you can see in the example above the (fake) media was stored remotely on "www.example.net". Other internal nodes @@ -83,9 +84,10 @@ provide default information for your media entry, but as you'll see below, it's just as easy to provide this information through the correct metadata columns. - **id** is used to identify the media entry to the user in case of an error in the batchaddmedia script. -- **license** is used to set a license for your piece a media for mediagoblin's use. This must be a URI. -- **title** will set the title displayed to mediagoblin users. +- **license** is used to set a license for your piece a media for MediaGoblin's use. This must be a URI. +- **title** will set the title displayed to MediaGoblin users. - **description** will set a description of your media. +- **collection-slug** will add the media to a collection, if a collection with the given slug exists. Metadata columns ---------------- @@ -106,7 +108,7 @@ information of uploaded media entries. - **dc:title** sets a title for your media entry. - **dc:description** sets a description of your media entry. -If both a metadata column and an internal node for the title are provided, mediagoblin +If both a metadata column and an internal node for the title are provided, MediaGoblin will use the internal node as the media entry's display name. This makes it so that if you want to display a piece of media with a different title than the one provided in its metadata, you can just provide different data for diff --git a/docs/source/siteadmin/configuration.rst b/docs/source/siteadmin/configuration.rst index dd0d6cd9..1b8dc9bb 100644 --- a/docs/source/siteadmin/configuration.rst +++ b/docs/source/siteadmin/configuration.rst @@ -39,12 +39,12 @@ paste.ini `_). It also sets up some middleware that you can mostly ignore, except to configure sessions... more on that later. If you are adding a different - Python server other than fastcgi / plain HTTP, you might configure + Python server other than FastCGI / plain HTTP, you might configure it here. You probably won't need to change this file very much. There's one more file that you certainly won't change unless you're -making coding contributions to mediagoblin, but which can be useful to +making coding contributions to MediaGoblin, but which can be useful to read and reference: mediagoblin/config_spec.ini @@ -54,30 +54,6 @@ mediagoblin/config_spec.ini option that we didn't tell you about. :) -Making local copies -=================== - -Let's assume you're doing the virtualenv setup described elsewhere in this -manual, and you need to make local tweaks to the config files. How do you do -that? Let's see. - -To make changes to mediagoblin.ini :: - - cp mediagoblin.ini mediagoblin_local.ini - -To make changes to paste.ini :: - - cp paste.ini paste_local.ini - -From here you should be able to make direct adjustments to the files, -and most of the commands described elsewhere in this manual will "notice" -your local config files and use those instead of the non-local version. - -.. note:: - - Note that all commands provide a way to pass in a specific config - file also, usually by a ``-cf`` flag. - Common changes ============== @@ -128,7 +104,7 @@ If you use ``lazyserver.sh`` you need to change the ``paste.ini`` file:: [app:mediagoblin] /mgoblin_media = /var/mediagoblin/user_data -If you use nginx you need to change the config:: +If you use Nginx you need to change the config:: # Instance specific media: location /mgoblin_media/ { diff --git a/docs/source/siteadmin/deploying.rst b/docs/source/siteadmin/deploying.rst index 47901da9..42fe1772 100644 --- a/docs/source/siteadmin/deploying.rst +++ b/docs/source/siteadmin/deploying.rst @@ -25,7 +25,7 @@ will take you step-by-step through setting up your own instance of MediaGoblin. Of course, when it comes to setting up web applications like MediaGoblin, there's an almost infinite way to deploy things, so for now, we'll keep it simple with some assumptions. We recommend a setup that combines MediaGoblin + -virtualenv + fastcgi + nginx on a .deb- or .rpm-based GNU/Linux distro. +virtualenv + FastCGI + Nginx on a .deb- or .rpm-based GNU/Linux distro. Other deployment options (e.g., deploying on FreeBSD, Arch Linux, using Apache, etc.) are possible, though! If you'd prefer a different deployment @@ -65,25 +65,30 @@ MediaGoblin has the following core dependencies: - `virtualenv `_ - `nodejs `_ -On a DEB-based system (e.g Debian, gNewSense, Trisquel, *buntu, and +On a DEB-based system (e.g Debian, gNewSense, Trisquel, \*buntu, and derivatives) issue the following command:: sudo apt-get install git-core python python-dev python-lxml \ python-imaging python-virtualenv npm nodejs-legacy automake \ - nginx + nginx rabbitmq-server On a RPM-based system (e.g. Fedora, RedHat, and derivatives) issue the following command:: sudo yum install python-paste-deploy python-paste-script \ git-core python python-devel python-lxml python-imaging \ - python-virtualenv npm automake nginx + python-virtualenv npm automake nginx rabbitmq-server (Note: MediaGoblin now officially supports Python 3. You may instead substitute from "python" to "python3" for most package names in the Debian instructions and this should cover dependency installation. These instructions have not yet been tested on Fedora.) +(Note: you might have to include additional repositories to a RPM- +based system, because rabbitmq-server might be not included in +official repositories. As an alternative, you can try installing +redis-server and configure it as celery broker) + Configure PostgreSQL ~~~~~~~~~~~~~~~~~~~~ @@ -94,7 +99,7 @@ Configure PostgreSQL For medium to large deployments we recommend PostgreSQL. - If you don't want/need postgres, skip this section. + If you don't want/need PostgreSQL, skip this section. These are the packages needed for Debian Jessie (stable):: @@ -105,7 +110,7 @@ These are the packages needed for an RPM-based system:: sudo yum install postgresql postgresql-server python-psycopg2 An rpm-based system also requires that you initialize and start the -PostgresSQL database with a few commands. The following commands are +PostgreSQL database with a few commands. The following commands are not needed on a Debian-based platform, however:: sudo /usr/bin/postgresql-setup initdb @@ -113,8 +118,8 @@ not needed on a Debian-based platform, however:: sudo systemctl start postgresql The installation process will create a new *system* user named ``postgres``, -which will have privilegies sufficient to manage the database. We will create a -new database user with restricted privilegies and a new database owned by our +which will have privileges sufficient to manage the database. We will create a +new database user with restricted privileges and a new database owned by our restricted database user for our MediaGoblin instance. In this example, the database user will be ``mediagoblin`` and the database @@ -200,10 +205,10 @@ Create a MediaGoblin Directory You should create a working directory for MediaGoblin. This document assumes your local git repository will be located at ``/srv/mediagoblin.example.org/mediagoblin/``. -Substitute your prefered local deployment path as needed. +Substitute your preferred local deployment path as needed. Setting up the working directory requires that we first create the directory -with elevated priviledges, and then assign ownership of the directory +with elevated privileges, and then assign ownership of the directory to the unprivileged system account. To do this, enter the following command, changing the defaults to suit your @@ -235,7 +240,7 @@ Change to the MediaGoblin directory that you just created:: Clone the MediaGoblin repository and set up the git submodules:: - $ git clone git://git.savannah.gnu.org/mediagoblin.git -b stable + $ git clone https://git.savannah.gnu.org/git/mediagoblin.git -b stable $ cd mediagoblin $ git submodule init && git submodule update @@ -245,7 +250,7 @@ Clone the MediaGoblin repository and set up the git submodules:: gitorious.org shut down, we had to move. We are presently on Savannah. You may need to update your git repository location:: - $ git remote set-url origin git://git.savannah.gnu.org/mediagoblin.git + $ git remote set-url origin https://git.savannah.gnu.org/git/mediagoblin.git Set up the hacking environment:: @@ -314,25 +319,28 @@ Edit site configuration ~~~~~~~~~~~~~~~~~~~~~~~ A few basic properties must be set before MediaGoblin will work. First -make a copy of ``mediagoblin.ini`` and ``paste.ini`` for editing so the original +make a copy of ``paste.ini`` for editing so the original config files aren't lost (you likely won't need to edit the paste configuration, but we'll make a local copy of it just in case):: - $ cp -av mediagoblin.ini mediagoblin_local.ini && cp -av paste.ini paste_local.ini + $ cp -av paste.ini paste_local.ini + +``mediagoblin.ini`` does not need to be copied, because original config is +stored in ``mediagoblin.example.ini``. -Then edit mediagoblin_local.ini: +Then edit ``mediagoblin.ini``: - Set ``email_sender_address`` to the address you wish to be used as the sender for system-generated emails - Edit ``direct_remote_path``, ``base_dir``, and ``base_url`` if your mediagoblin directory is not the root directory of your - vhost. + site. Configure MediaGoblin to use the PostgreSQL database ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -If you are using postgres, edit the ``[mediagoblin]`` section in your -``mediagoblin_local.ini`` and put in:: +If you are using PostgreSQL, edit the ``[mediagoblin]`` section in your +``mediagoblin.ini`` and put in:: sql_engine = postgresql:///mediagoblin @@ -361,7 +369,7 @@ test the deployment with the following command:: You should be able to connect to the machine on port 6543 in your browser to confirm that the service is operable. -The next series of commands will need to be run as a priviledged user. Type +The next series of commands will need to be run as a privileged user. Type exit to return to the root/sudo account.:: exit @@ -372,9 +380,9 @@ exit to return to the root/sudo account.:: FastCGI and nginx ~~~~~~~~~~~~~~~~~ -This configuration example will use nginx, however, you may +This configuration example will use Nginx, however, you may use any webserver of your choice as long as it supports the FastCGI -protocol. If you do not already have a web server, consider nginx, as +protocol. If you do not already have a web server, consider Nginx, as the configuration files may be more clear than the alternatives. @@ -397,7 +405,7 @@ following commands:: sudo systemctl enable nginx You can modify these commands and locations depending on your preferences and -the existing configuration of your nginx instance. The contents of +the existing configuration of your Nginx instance. The contents of this ``nginx.conf`` file should be modeled on the following:: server { @@ -457,7 +465,7 @@ this ``nginx.conf`` file should be modeled on the following:: fastcgi_pass 127.0.0.1:26543; include /etc/nginx/fastcgi_params; - # our understanding vs nginx's handling of script_name vs + # our understanding vs Nginx's handling of script_name vs # path_info don't match :) fastcgi_param PATH_INFO $fastcgi_script_name; fastcgi_param SCRIPT_NAME ""; @@ -481,8 +489,8 @@ test to ensure that this configuration works:: nginx -t -If you encounter any errors, review your nginx configuration files, and try to -resolve them. If you do not encounter any errors, you can start your nginx +If you encounter any errors, review your Nginx configuration files, and try to +resolve them. If you do not encounter any errors, you can start your Nginx server with one of the following commands (depending on your environment):: sudo /etc/init.d/nginx restart @@ -529,7 +537,7 @@ a) Disable registration on your instance and just make [mediagoblin] allow_registration = false -b) Enable a captcha plugin. But unfortunately, though some captcha +b) Enable a CAPTCHA plugin. But unfortunately, though some CAPTCHA plugins exist, for various reasons we do not have any general recommendations we can make at this point. diff --git a/docs/source/siteadmin/foreword.rst b/docs/source/siteadmin/foreword.rst index 4c425f8d..24282f96 100644 --- a/docs/source/siteadmin/foreword.rst +++ b/docs/source/siteadmin/foreword.rst @@ -34,13 +34,14 @@ Improving the Site Administrator's Guide There are a few ways---please pick whichever method is convenient for you! -1. Write up a bug report in the bug tracker +1. Write up a bug report in the `bug tracker`_. 2. Tell someone on IRC ``#mediagoblin`` on Freenode. -3. Write an email to the devel mailing list. +3. Write an email to the `devel mailing list`_. -Information about the bugtracker, IRC and the mailing list is all on -the `join page`_. +More information about contributing is available on the `join page`_. +.. _bug tracker: https://issues.mediagoblin.org/ +.. _devel mailing list: http://lists.mediagoblin.org/listinfo/devel .. _join page: http://mediagoblin.org/join/ Patches are the most helpful, but even feedback on what you think diff --git a/docs/source/siteadmin/media-types.rst b/docs/source/siteadmin/media-types.rst index 38770638..8f9239be 100644 --- a/docs/source/siteadmin/media-types.rst +++ b/docs/source/siteadmin/media-types.rst @@ -19,10 +19,10 @@ Media Types In the future, there will be all sorts of media types you can enable, but in the meanwhile there are six additional media types: video, audio, -raw image, ascii art, STL/3d models, PDF and Document. +raw image, ASCII art, STL/3D models, PDF and Document. First, you should probably read ":doc:`configuration`" to make sure -you know how to modify the mediagoblin config file. +you know how to modify the MediaGoblin config file. Enabling Media Types ==================== @@ -30,17 +30,14 @@ Enabling Media Types .. note:: Media types are now plugins -Media types are enabled in your mediagoblin configuration file, typically it is -created by copying ``mediagoblin.ini`` to ``mediagoblin_local.ini`` and then -applying your changes to ``mediagoblin_local.ini``. If you don't already have a -``mediagoblin_local.ini``, create one in the way described. +Media types are enabled in your MediaGoblin configuration file. Most media types have additional dependencies that you will have to install. You will find descriptions on how to satisfy the requirements of each media type on this page. To enable a media type, add the the media type under the ``[plugins]`` section -in you ``mediagoblin_local.ini``. For example, if your system supported image +in you ``mediagoblin.ini``. For example, if your system supported image and video media types, then it would look like this:: [plugins] @@ -81,8 +78,8 @@ instance the ``video`` media type configuration can be found in Video ===== -To enable video, first install gstreamer and the python-gstreamer -bindings (as well as whatever gstremaer extensions you want, +To enable video, first install GStreamer and the python-gstreamer +bindings (as well as whatever GStreamer extensions you want, good/bad/ugly). On Debianoid systems .. code-block:: bash @@ -99,7 +96,7 @@ good/bad/ugly). On Debianoid systems Add ``[[mediagoblin.media_types.video]]`` under the ``[plugins]`` section in -your ``mediagoblin_local.ini`` and restart MediaGoblin. +your ``mediagoblin.ini`` and restart MediaGoblin. Run @@ -107,7 +104,7 @@ Run ./bin/gmg dbupdate -Now you should be able to submit videos, and mediagoblin should +Now you should be able to submit videos, and MediaGoblin should transcode them. .. note:: @@ -121,8 +118,8 @@ transcode them. Audio ===== -To enable audio, install the gstreamer and python-gstreamer bindings (as well -as whatever gstreamer plugins you want, good/bad/ugly), scipy and numpy are +To enable audio, install the GStreamer and python-gstreamer bindings (as well +as whatever GStreamer plugins you want, good/bad/ugly), SciPy and NumPy are also needed for the audio spectrograms. To install these on Debianoid systems, run:: @@ -139,7 +136,7 @@ Then install ``scikits.audiolab`` for the spectrograms:: ./bin/pip install scikits.audiolab Add ``[[mediagoblin.media_types.audio]]`` under the ``[plugins]`` section in your -``mediagoblin_local.ini`` and restart MediaGoblin. +``mediagoblin.ini`` and restart MediaGoblin. Run @@ -160,7 +157,7 @@ To enable raw image you need to install pyexiv2. On Debianoid systems sudo apt-get install python-pyexiv2 Add ``[[mediagoblin.media_types.raw_image]]`` under the ``[plugins]`` -section in your ``mediagoblin_local.ini`` and restart MediaGoblin. +section in your ``mediagoblin.ini`` and restart MediaGoblin. Run @@ -168,24 +165,23 @@ Run ./bin/gmg dbupdate -Now you should be able to submit raw images, and mediagoblin should +Now you should be able to submit raw images, and MediaGoblin should extract the JPEG preview from them. -Ascii art +ASCII art ========= -To enable ascii art support, first install the +To enable ASCII art support, first install the `chardet `_ -library, which is necessary for creating thumbnails of ascii art +library, which is necessary for creating thumbnails of ASCII art .. code-block:: bash ./bin/easy_install chardet -Next, modify (and possibly copy over from ``mediagoblin.ini``) your -``mediagoblin_local.ini``. In the ``[plugins]`` section, add +Next, modify your ``mediagoblin.ini``. In the ``[plugins]`` section, add ``[[mediagoblin.media_types.ascii]]``. Run @@ -194,20 +190,20 @@ Run ./bin/gmg dbupdate -Now any .txt file you uploaded will be processed as ascii art! +Now any .txt file you uploaded will be processed as ASCII art! -STL / 3d model support +STL / 3D model support ====================== -To enable the "STL" 3d model support plugin, first make sure you have -a recentish `Blender `_ installed and available on +To enable the "STL" 3D model support plugin, first make sure you have +a recent `Blender `_ installed and available on your execution path. This feature has been tested with Blender 2.63. It may work on some earlier versions, but that is not guaranteed (and is surely not to work prior to Blender 2.5X). Add ``[[mediagoblin.media_types.stl]]`` under the ``[plugins]`` section in your -``mediagoblin_local.ini`` and restart MediaGoblin. +``mediagoblin.ini`` and restart MediaGoblin. Run @@ -223,9 +219,9 @@ PDF and Document To enable the "PDF and Document" support plugin, you need: -1. pdftocairo and pdfinfo for pdf only support. +1. pdftocairo and pdfinfo for PDF only support. -2. unoconv with headless support to support converting libreoffice supported +2. unoconv with headless support to support converting LibreOffice supported documents as well, such as doc/ppt/xls/odf/odg/odp and more. For the full list see mediagoblin/media_types/pdf/processing.py, unoconv_supported. @@ -238,7 +234,7 @@ To install this on Fedora: sudo yum install -y poppler-utils unoconv libreoffice-headless -Note: You can leave out unoconv and libreoffice-headless if you want only pdf +Note: You can leave out unoconv and libreoffice-headless if you want only PDF support. This will result in a much smaller list of dependencies. pdf.js relies on git submodules, so be sure you have fetched them: @@ -256,7 +252,7 @@ This feature has been tested on Fedora with: It may work on some earlier versions, but that is not guaranteed. Add ``[[mediagoblin.media_types.pdf]]`` under the ``[plugins]`` section in your -``mediagoblin_local.ini`` and restart MediaGoblin. +``mediagoblin.ini`` and restart MediaGoblin. Run @@ -271,7 +267,7 @@ Blog (HIGHLY EXPERIMENTAL) MediaGoblin has a blog media type, which you might notice by looking through the docs! However, it is *highly experimental*. We have not security reviewed this, and it acts in a way that is not like normal -blogs (the blogposts are themselves media types!). +blogs (the blog posts are themselves media types!). So you can play with this, but it is not necessarily recommended yet for production use! :) diff --git a/docs/source/siteadmin/plugins.rst b/docs/source/siteadmin/plugins.rst index 67c8bad1..8682b0c7 100644 --- a/docs/source/siteadmin/plugins.rst +++ b/docs/source/siteadmin/plugins.rst @@ -111,7 +111,7 @@ Check the plugin's documentation for what configuration options are available. Once you've set up your plugin, you should be sure to update the -database to accomodate the new plugins:: +database to accommodate the new plugins:: ./bin/gmg dbupdate @@ -121,7 +121,7 @@ Deactivating plugins You should be aware that once you enable a plugin, deactivating it might be a bit tricky, for migrations reasons. In the future we may -produce better tooling to accomodate this. In short, you will need to +produce better tooling to accommodate this. In short, you will need to do a bit of database surgery by: - Removing all tables and indexes installed by the plugin diff --git a/docs/source/siteadmin/production-deployments.rst b/docs/source/siteadmin/production-deployments.rst index e65ac332..3d11f022 100644 --- a/docs/source/siteadmin/production-deployments.rst +++ b/docs/source/siteadmin/production-deployments.rst @@ -24,10 +24,10 @@ Deploy with paste The MediaGoblin WSGI application instance you get with ``./lazyserver.sh`` is not ideal for a production MediaGoblin deployment. Ideally, you should be able -to use a systemd service file or an init script to launch and restart the +to use a Systemd service file or an init script to launch and restart the MediaGoblin process. -We will explore setting up MediaGoblin systemd service files and init scripts, +We will explore setting up MediaGoblin Systemd service files and init scripts, but first we need to create the directory that will store the MediaGoblin logs. @@ -45,10 +45,10 @@ proper permissions:: .. _systemd-service-files: -Use systemd service files +Use Systemd service files ------------------------- -If your operating system uses systemd, you can use systemd ``service files`` +If your operating system uses Systemd, you can use Systemd ``service files`` to manage both the Celery and Paste processes. Place the following service files in the ``/etc/systemd/system/`` directory. @@ -62,18 +62,21 @@ modify it to suit your environment's setup: # If using Fedora/CentOS/Red Hat, mkdir and chown are located in /usr/bin/mkdir and /usr/bin/chown, respectively. [Unit] - Description=Mediagoblin Celeryd + Description=MediaGoblin Celeryd [Service] User=mediagoblin Group=mediagoblin Type=simple WorkingDirectory=/srv/mediagoblin.example.org/mediagoblin + # Start mg-celeryd process as root, then switch to mediagoblin user/group + # (This is needed to run the ExecStartPre commands) + PermissionsStartOnly=true # Create directory for PID (if needed) and set ownership ExecStartPre=/bin/mkdir -p /run/mediagoblin ExecStartPre=/bin/chown -hR mediagoblin:mediagoblin /run/mediagoblin # Celery process will run as the `mediagoblin` user after start. - Environment=MEDIAGOBLIN_CONFIG=/srv/mediagoblin.example.org/mediagoblin/mediagoblin_local.ini \ + Environment=MEDIAGOBLIN_CONFIG=/srv/mediagoblin.example.org/mediagoblin/mediagoblin.ini \ CELERY_CONFIG_MODULE=mediagoblin.init.celery.from_celery ExecStart=/srv/mediagoblin.example.org/mediagoblin/bin/celery worker \ --logfile=/var/log/mediagoblin/celery.log \ @@ -153,7 +156,7 @@ processes again. Use an init script ------------------ -If your system does not use systemd, you can use the following command as the +If your system does not use Systemd, you can use the following command as the basis for an init script: .. code-block:: bash @@ -241,7 +244,7 @@ To launch Celery separately from the MediaGoblin WSGI application: CELERY_CONFIG_MODULE=mediagoblin.init.celery.from_celery ./bin/celeryd -If you use our example systemd ``service files``, Celery will be set to the +If you use our example Systemd ``service files``, Celery will be set to the "CELERY_ALWAYS_EAGER=false" value by default. This will provide your users with the best user experience, as all media processing will be done in the background. diff --git a/docs/source/siteadmin/relnotes.rst b/docs/source/siteadmin/relnotes.rst index 584fd8c3..1c15f249 100644 --- a/docs/source/siteadmin/relnotes.rst +++ b/docs/source/siteadmin/relnotes.rst @@ -27,7 +27,7 @@ carefully, or at least skim over it. running migrations! That way if something goes wrong, we can fix things! - And be sure to shut down your current mediagoblin/celery processes + And be sure to shut down your current MediaGoblin/Celery processes before upgrading! .. note:: @@ -36,7 +36,7 @@ carefully, or at least skim over it. gitorious.org shut down, we had to move. We are presently on Savannah. You may need to update your git repository location:: - git remote set-url origin git://git.savannah.gnu.org/mediagoblin.git + git remote set-url origin https://git.savannah.gnu.org/git/mediagoblin.git 0.9.0 @@ -49,7 +49,7 @@ Python 3, which is pretty cool! **Do this to upgrade** 0. If you haven't already, switch the git remote URL: - ``git remote set-url origin git://git.savannah.gnu.org/mediagoblin.git`` + ``git remote set-url origin https://git.savannah.gnu.org/git/mediagoblin.git`` 1. Update to the latest release. If checked out from git, run: ``git fetch && git checkout -q v0.9.0`` 2. Run @@ -89,7 +89,7 @@ soon as possible. **Do this to upgrade** 0. If you haven't already, switch the git remote URL: - ``git remote set-url origin git://git.savannah.gnu.org/mediagoblin.git`` + ``git remote set-url origin https://git.savannah.gnu.org/git/mediagoblin.git`` 1. Update to the latest release. If checked out from git, run: ``git fetch && git checkout -q v0.8.1`` 2. Run @@ -143,7 +143,7 @@ trouble, consider pinging the MediaGoblin list or IRC channel. **Do this to upgrade** 0. If you haven't already, switch the git remote URL: - ``git remote set-url origin git://git.savannah.gnu.org/mediagoblin.git`` + ``git remote set-url origin https://git.savannah.gnu.org/git/mediagoblin.git`` 1. If you don't have node.js installed, you'll need it for handling MediaGoblin's static web dependencies. Install this via your distribution! (In the glorious future MediaGoblin will be simply @@ -162,11 +162,11 @@ prior upgrade guides! Additionally: - Are you using audio or video media types? In that case, you'll need - to update your Gstreamer instance to 1.0. + to update your GStreamer instance to 1.0. - The Pump API needs some data passed through to the WSGI application, - so if you are using apache with mod_wsgi you should be sure to make + so if you are using Apache with mod_wsgi you should be sure to make sure to add "WSGIPassAuthorization On" to your config. (Using the - default MediaGoblin documnetation and config, things should work + default MediaGoblin documentation and config, things should work as-is.) @@ -181,12 +181,12 @@ Additionally: - Clearer documentation on permissions and installation - Switched from Transifex, which had become proprietary, to an instance of Pootle hosted for GNU -- Moved to Gstreamer 1.0! This also adds a new thumbnailer which +- Moved to GStreamer 1.0! This also adds a new thumbnailer which gives much better results in -- Removed terrible check-javascript-dependencies-into-your-application +- Removed terrible check-JavaScript-dependencies-into-your-application setup, now using Bower for dependency tracking - Put some scaffolding in place for Alembic, which will be used for - future mitration work + future migration work - Automatically create a fresh mediagoblin.ini from mediagoblin.ini.example - no more need for mediagoblin_local.ini (though it's still supported) @@ -199,7 +199,7 @@ Additionally: This is a purely bugfix release. Important changes happened since 0.7.0; if running MediaGoblin 0.7.0, an upgrade is highly recommended; see below. This release is especially useful if you have been running -postgres and have been receiving seemingly random database transaction +PostgreSQL and have been receiving seemingly random database transaction errors. **Do this to upgrade** @@ -220,9 +220,9 @@ That's it, probably! If you run into problems, don't hesitate to database transaction issues. (These should be back by 0.8.0.) + Disabled the "checking if the database is up to date at - mediagoblin startup" feature + MediaGoblin startup" feature + Disabled the garbage collection stuff by default for now - (You can set garbage_collection under the config mediagoblin + (You can set garbage_collection under the config MediaGoblin header to something other than 0 to turn it back on for now, but it's potentially risky for the moment.) @@ -231,7 +231,7 @@ That's it, probably! If you run into problems, don't hesitate to - Added support for cr2 files in raw_image media type - Added a description to setup.py - Collection and CollectionItem objects now have nicer in-python representations -- Fixed unicode error with raw image mediatype logging +- Fixed Unicode error with raw image mediatype logging - Fixed #945 "Host metadata does not confirm to spec (/.well-known/meta-data)" + Add XRD+XML formatting for /.well-known/host-meta @@ -268,7 +268,7 @@ That's it, probably! If you run into problems, don't hesitate to (which will be the foundation for MediaGoblin's federation) - New theme: Sandy 70s Speedboat! -- Metadata features! We also now have a json-ld context. +- Metadata features! We also now have a JSON-LD context. - Many improvements for archival institutions, including metadata support and featuring items on the homepage. With the (new!) @@ -283,7 +283,7 @@ That's it, probably! If you run into problems, don't hesitate to uploading many files at once. This is aimed to be useful for archival institutions and groups where there is an already existing and large set of available media that needs to be included. -- Speaking of, the call to postgres in the makefile is fixed. +- Speaking of, the call to PostgreSQL in the makefile is fixed. - We have a new, generic media-page context hook that allows for adding context depending on the type of media. - Tired of video thumbnails breaking during processing all the time? @@ -310,10 +310,10 @@ That's it, probably! If you run into problems, don't hesitate to data. It's basically the same thing as before, but packaged separately from MediaGoblin. - Many improvements to internationalization. Also (still rudimentary, - but existant!) RTL language support! + but existent!) RTL language support! **Known issues:** - - The host-meta is now json by default; in the spec it should be xml by + - The host-meta is now JSON by default; in the spec it should be XML by default. We have done this because of compatibility with the pump API. We are checking with upstream to see if there is a way to resolve this discrepancy. @@ -360,7 +360,7 @@ nickname "Lore of the Admin"! - New tools to control how much users can upload, both as a general user limit, or per file. - You can set this with the following options in your mediagoblin + You can set this with the following options in your MediaGoblin config file: `upload_limit` and `max_file_size`. Both are integers in megabytes. @@ -368,7 +368,7 @@ nickname "Lore of the Admin"! upload too, though an interface for this is not yet exposed. See the "uploaded" field on the core__users table. -- MediaGoblin now contains an authentication plugin for ldap! You +- MediaGoblin now contains an authentication plugin for LDAP! You can turn on the mediagoblin.plugins.ldap plugin to make use of this. See the documentation: :ref:`ldap-plugin` @@ -423,8 +423,8 @@ v0.5.1 is a bugfix release... the steps are the same as for 0.5.1. ===== **NOTE:** If using the API is important to you, we're in a state of -ransition towards a new API via the Pump API. As such, though the old -API still probably works, some changes have happened to the way oauth +transition towards a new API via the Pump API. As such, though the old +API still probably works, some changes have happened to the way OAuth works to make it more Pump-compatible. If you're heavily using clients using the old API, you may wish to hold off on upgrading for now. Otherwise, jump in and have fun! :) @@ -469,21 +469,21 @@ If you run into problems, don't hesitate to * Comment preview! * Users now have the ability to change their email associated with their account. -* New oauth code as we move closer to federation support. -* Experimental pyconfigure support for GNU-style configue and makefile +* New OAuth code as we move closer to federation support. +* Experimental pyconfigure support for GNU-style configure and makefile deployment. * Database foundations! You can now pre-populate the database models. * Way faster unit test run-time via in-memory database. * All mongokit stuff has been cleaned up. -* Fixes for non-ascii filenames. +* Fixes for non-ASCII filenames. * The option to stay logged in. -* Mediagoblin has been upgraded to use the latest `celery `_ +* MediaGoblin has been upgraded to use the latest `Celery `_ version. * You can now add jinja2 extensions to your config file to use in custom templates. * Fixed video permission issues. -* Mediagoblin docs are now hosted with multiple versions. -* We removed redundent tooltips from the STL media display. +* MediaGoblin docs are now hosted with multiple versions. +* We removed redundant tooltips from the STL media display. * We are now using itsdangerous for verification tokens. @@ -495,7 +495,7 @@ fix in the newly released document support which prevented the "conversion via libreoffice" feature. If you were running 0.4.0 you can upgrade to v0.4.1 via a simple -switch and restarting mediagoblin/celery with no other actions. +switch and restarting MediaGoblin/Celery with no other actions. Otherwise, follow 0.4.0 instructions. @@ -514,7 +514,7 @@ Otherwise, follow 0.4.0 instructions. Keep on reading to hear more about new plugin features. 4. If you want to take advantage of new plugins that have statically served assets, you are going to need to add the new "plugin_static" - section to your nginx config. Basically the following for nginx:: + section to your Nginx config. Basically the following for Nginx:: # Plugin static files (usually symlinked in) location /plugin_static/ { @@ -557,7 +557,7 @@ please note the following: date of an image when available (available as the "original_date_visible" variable) * Moved unit testing system from nosetests to py.test so we can better - handle issues with sqlalchemy exploding with different database + handle issues with SQLAlchemy exploding with different database configurations. Long story :) * You can now disable the ability to post comments. * Tags now can be up to length 255 characters by default. @@ -587,7 +587,7 @@ you run into problems, don't hesitate to * New dropdown menu for accessing various features. -* Significantly improved URL generation. Now mediagoblin won't give +* Significantly improved URL generation. Now MediaGoblin won't give up on making a slug if it looks like there will be a duplicate; it'll try extra hard to generate a meaningful one instead. @@ -595,13 +595,13 @@ you run into problems, don't hesitate to linking to a slug; /u/username/m/id:35/ is the kind of reference we now use to linking to entries with ids. However, old links with entries that linked to ids should work just fine with our migration. - The only urls that might break in this release are ones using colons + The only URLs that might break in this release are ones using colons or equal signs. * New template hooks for plugin authoring. * As a demonstration of new template hooks for plugin authoring, - openstreetmap support now moved to a plugin! + OpenStreetMap support now moved to a plugin! * Method to add media to collections switched from icon of paperclip to button with "add to collection" text. @@ -612,9 +612,9 @@ you run into problems, don't hesitate to waste gobs of memory. * Video transcoding now optional for videos that meet certain - criteria. By default, MediaGoblin will not transcode webm videos + criteria. By default, MediaGoblin will not transcode WebM videos that are smaller in resolution than the MediaGoblin defaults, and - MediaGoblin can also be configured to allow theora files to not be + MediaGoblin can also be configured to allow Theora files to not be transcoded as well. * Per-user license preference option; always want your uploads to be @@ -644,7 +644,7 @@ MongoDB-based MediaGoblin instance to the newer SQL-based system. **Do this to upgrade** - # directory of your mediagoblin install + # directory of your MediaGoblin install cd /srv/mediagoblin.example.org # copy source for this release @@ -664,13 +664,13 @@ MongoDB-based MediaGoblin instance to the newer SQL-based system. * **3d model support!** You can now upload STL and OBJ files and display them in - MediaGoblin. Requires a recent-ish Blender; for details see: + MediaGoblin. Requires a recent Blender; for details see: :ref:`deploying-chapter` * **trim_whitespace** We bundle the optional plugin trim_whitespace which reduces the size - of the delivered html output by reducing redundant whitespace. + of the delivered HTML output by reducing redundant whitespace. See :ref:`core-plugin-section` for plugin documentation @@ -684,7 +684,7 @@ MongoDB-based MediaGoblin instance to the newer SQL-based system. and `OMGMG `_, an example of a web application hooking up to the API. - This is a plugin, so you have to enable it in your mediagoblin + This is a plugin, so you have to enable it in your MediaGoblin config file by adding a section under [plugins] like:: [plugins] @@ -697,7 +697,7 @@ MongoDB-based MediaGoblin instance to the newer SQL-based system. For applications that use OAuth to connect to the API. - This is a plugin, so you have to enable it in your mediagoblin + This is a plugin, so you have to enable it in your MediaGoblin config file by adding a section under [plugins] like:: [plugins] @@ -717,7 +717,7 @@ MongoDB-based MediaGoblin instance to the newer SQL-based system. Geolocation is also now on by default. -* **Miscelaneous visual improvements** +* **Miscellaneous visual improvements** We've made a number of small visual improvements including newer and nicer looking thumbnails and improved checkbox placement. @@ -732,7 +732,7 @@ MongoDB-based MediaGoblin instance to the newer SQL-based system. 1. Make sure to run ``bin/gmg dbuptdate`` after upgrading. 2. If you set up your server config with an older version of - mediagoblin and the mediagoblin docs, it's possible you don't + MediaGoblin and the MediaGoblin docs, it's possible you don't have the "theme static files" alias, so double check to make sure that section is there if you are having problems. diff --git a/docs/source/siteadmin/theming.rst b/docs/source/siteadmin/theming.rst index 11ae3875..24f23235 100644 --- a/docs/source/siteadmin/theming.rst +++ b/docs/source/siteadmin/theming.rst @@ -43,7 +43,7 @@ want to install this theme! Don't worry, it's fairly painless. 3. ``tar -xzvf `` 4. Open your configuration file (probably named - ``mediagoblin_local.ini``) and set the theme name:: + ``mediagoblin.ini``) and set the theme name:: [mediagoblin] # ... @@ -73,9 +73,9 @@ want to install this theme! Don't worry, it's fairly painless. Set up your webserver to serve theme assets ------------------------------------------- -If you followed the nginx setup example in :ref:`webserver-config` you +If you followed the Nginx setup example in :ref:`webserver-config` you should already have theme asset setup. However, if you set up your -server config with an older version of mediagoblin and the mediagoblin +server config with an older version of MediaGoblin and the MediaGoblin docs, it's possible you don't have the "theme static files" alias, so double check to make sure that section is there if you are having problems. @@ -103,7 +103,7 @@ Other variables you may consider setting: `theme_web_path` When theme-specific assets are specified, this is where MediaGoblin - will set the urls. By default this is ``"/theme_static/"`` so in + will set the URLs. By default this is ``"/theme_static/"`` so in the case that your theme was trying to access its file ``"images/shiny_button.png"`` MediaGoblin would link to ``/theme_static/images/shiny_button.png``. @@ -136,7 +136,7 @@ if necessary):: | | |- im_a_hedgehog.png # hedgehog-containing image used by theme | | '- custom_logo.png # your theme's custom logo | '- css/ - | '- hedgehog.css # your site's hedgehog-specific css + | '- hedgehog.css # your site's hedgehog-specific CSS |- README.txt # Optionally, a readme file (not required) |- AGPLv3.txt # AGPL license file for your theme. (good practice) '- CC0_1.0.txt # CC0 1.0 legalcode for the assets [if appropriate!] @@ -164,7 +164,7 @@ Only a few things need to go in here:: [theme] name = Hedgehog-ification description = For hedgehog lovers ONLY - licensing = AGPLv3 or later templates; assets (images/css) waived under CC0 1.0 + licensing = AGPLv3 or later templates; assets (images/CSS) waived under CC0 1.0 The name and description fields here are to give users an idea of what your theme is about. For the moment, we don't have any listing @@ -232,7 +232,7 @@ You should include AGPLv3.txt with your theme as this is required for the assets. You can copy this from ``mediagoblin/licenses/``. In the above example, we also use CC0 to waive our copyrights to -images and css, so we also included CC0_1.0.txt +images and CSS, so we also included CC0_1.0.txt A README.txt file @@ -247,7 +247,7 @@ Simple theming by adding CSS ---------------------------- Many themes won't require anything other than the ability to override -some of MediaGoblin's core css. Thankfully, doing so is easy if you +some of MediaGoblin's core CSS. Thankfully, doing so is easy if you combine the above steps! In your theme, do the following (make sure you make the necessary @@ -260,7 +260,7 @@ Great, now open that file and add something like this at the end:: -You can name the css file whatever you like. Now make the directory +You can name the CSS file whatever you like. Now make the directory for ``assets/css/`` and add the file ``assets/css/theme.css``. You can now put custom CSS files in here and any CSS you add will diff --git a/lazystarter.sh b/lazystarter.sh index 0ed22fd8..b531b068 100755 --- a/lazystarter.sh +++ b/lazystarter.sh @@ -25,7 +25,7 @@ case "$selfname" in ini_prefix=paste ;; lazycelery.sh) - starter_cmd=celeryd + starter_cmd=celery ini_prefix=mediagoblin ;; *) @@ -87,7 +87,7 @@ case "$selfname" in lazycelery.sh) MEDIAGOBLIN_CONFIG="${ini_file}" \ CELERY_CONFIG_MODULE=mediagoblin.init.celery.from_celery \ - $starter -B "$@" + $starter worker -B "$@" ;; *) exit 1 ;; esac diff --git a/mediagoblin/api/views.py b/mediagoblin/api/views.py index 74181fde..b25300f0 100644 --- a/mediagoblin/api/views.py +++ b/mediagoblin/api/views.py @@ -115,8 +115,13 @@ def uploads_endpoint(request): ) mimetype = request.headers["Content-Type"] - filename = mimetypes.guess_all_extensions(mimetype) - filename = 'unknown' + filename[0] if filename else filename + + if "X-File-Name" in request.headers: + filename = request.headers["X-File-Name"] + else: + filename = mimetypes.guess_all_extensions(mimetype) + filename = 'unknown' + filename[0] if filename else filename + file_data = FileStorage( stream=io.BytesIO(request.data), filename=filename, diff --git a/mediagoblin/auth/tools.py b/mediagoblin/auth/tools.py index 9c16a980..ae6fadf6 100644 --- a/mediagoblin/auth/tools.py +++ b/mediagoblin/auth/tools.py @@ -34,14 +34,19 @@ from mediagoblin import auth _log = logging.getLogger(__name__) -def normalize_user_or_email_field(allow_email=True, allow_user=True): - """ - Check if we were passed a field that matches a username and/or email +def normalize_user_or_email_field(allow_email=True, allow_user=True, + is_login=False): + """Check if we were passed a field that matches a username and/or email pattern. This is useful for fields that can take either a username or email - address. Use the parameters if you want to only allow a username for - instance""" + address. Use the parameters if you want to only allow a username + for instance + + is_login : bool + If is_login is True, does not check the length of username. + + """ message = _(u'Invalid User name or email address.') nomail_msg = _(u"This field does not take email addresses.") nouser_msg = _(u"This field requires an email address.") @@ -56,7 +61,8 @@ def normalize_user_or_email_field(allow_email=True, allow_user=True): else: # lower case user names if not allow_user: raise wtforms.ValidationError(nouser_msg) - wtforms.validators.Length(min=3, max=30)(form, field) + if not is_login: + wtforms.validators.Length(min=3, max=30)(form, field) wtforms.validators.Regexp(r'^[-_\w]+$')(form, field) field.data = field.data.lower() if field.data is None: # should not happen, but be cautious anyway diff --git a/mediagoblin/auth/views.py b/mediagoblin/auth/views.py index 2f95fd81..fb8e7265 100644 --- a/mediagoblin/auth/views.py +++ b/mediagoblin/auth/views.py @@ -14,6 +14,8 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . +import logging + import six from itsdangerous import BadSignature @@ -29,6 +31,8 @@ from mediagoblin.tools.pluginapi import hook_handle from mediagoblin.auth.tools import (send_verification_email, register_user, check_login_simple) +_log = logging.getLogger(__name__) + @allow_registration @auth_enabled @@ -105,6 +109,8 @@ def login(request): return redirect(request, "index") login_failed = True + remote_addr = request.access_route[-1] or request.remote_addr + _log.warn("Failed login attempt from %r", remote_addr) return render_to_response( request, diff --git a/mediagoblin/config_spec.ini b/mediagoblin/config_spec.ini index 0a8da73e..bd3003d0 100644 --- a/mediagoblin/config_spec.ini +++ b/mediagoblin/config_spec.ini @@ -153,8 +153,7 @@ CELERY_RESULT_BACKEND = string(default="database") CELERY_RESULT_DBURI = string(default="sqlite:///%(here)s/celery.db") # default kombu stuff -BROKER_TRANSPORT = string(default="sqlalchemy") -BROKER_URL = string(default="sqlite:///%(here)s/kombu.db") +BROKER_URL = string(default="amqp://") # known booleans CELERY_RESULT_PERSISTENT = boolean() diff --git a/mediagoblin/db/migration_tools.py b/mediagoblin/db/migration_tools.py index f4273fa0..852f35ee 100644 --- a/mediagoblin/db/migration_tools.py +++ b/mediagoblin/db/migration_tools.py @@ -365,9 +365,8 @@ def build_alembic_config(global_config, cmd_options, session): configuration. Initialize the database session appropriately as well. """ - root_dir = os.path.abspath(os.path.dirname(os.path.dirname( - os.path.dirname(__file__)))) - alembic_cfg_path = os.path.join(root_dir, 'alembic.ini') + alembic_dir = os.path.join(os.path.dirname(__file__), 'migrations') + alembic_cfg_path = os.path.join(alembic_dir, 'alembic.ini') cfg = Config(alembic_cfg_path, cmd_opts=cmd_options) cfg.attributes["session"] = session diff --git a/alembic.ini b/mediagoblin/db/migrations/alembic.ini similarity index 95% rename from alembic.ini rename to mediagoblin/db/migrations/alembic.ini index 7ae94f9f..4f7fc115 100644 --- a/alembic.ini +++ b/mediagoblin/db/migrations/alembic.ini @@ -2,7 +2,7 @@ [alembic] # path to migration scripts -script_location = %(here)s/mediagoblin/db/migrations +script_location = %(here)s # template used to generate migration files # file_template = %%(rev)s_%%(slug)s diff --git a/mediagoblin/db/migrations/env.py b/mediagoblin/db/migrations/env.py index 43b7b247..a6d05cd1 100644 --- a/mediagoblin/db/migrations/env.py +++ b/mediagoblin/db/migrations/env.py @@ -48,7 +48,7 @@ def run_migrations_online(): and associate a connection with the context. """ - connection = config.attributes["session"].get_bind() + connection = config.attributes["session"].connection() context.configure( connection=connection, target_metadata=target_metadata @@ -61,4 +61,3 @@ if context.is_offline_mode(): run_migrations_offline() else: run_migrations_online() - diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py index 9bbb252b..c19fe4da 100644 --- a/mediagoblin/db/models.py +++ b/mediagoblin/db/models.py @@ -43,6 +43,7 @@ from mediagoblin.db.mixin import UserMixin, MediaEntryMixin, \ from mediagoblin.tools.files import delete_media_files from mediagoblin.tools.common import import_component from mediagoblin.tools.routing import extract_url_arguments +from mediagoblin.tools.text import convert_to_tag_list_of_dicts import six from six.moves.urllib.parse import urljoin @@ -595,6 +596,16 @@ class MediaEntry(Base, MediaEntryMixin, CommentingMixin): ## TODO # fail_error + @property + def get_uploader(self): + # for compatibility + return self.get_actor + + @property + def uploader(self): + # for compatibility + return self.actor + @property def collections(self): """ Get any collections that this MediaEntry is in """ @@ -617,9 +628,9 @@ class MediaEntry(Base, MediaEntryMixin, CommentingMixin): query = query.order_by(Comment.added.asc()) else: query = query.order_by(Comment.added.desc()) - + return query - + def url_to_prev(self, urlgen): """get the next 'newer' entry by this user""" media = MediaEntry.query.filter( @@ -769,7 +780,6 @@ class MediaEntry(Base, MediaEntryMixin, CommentingMixin): "self": { "href": public_id, }, - } } @@ -785,6 +795,12 @@ class MediaEntry(Base, MediaEntryMixin, CommentingMixin): if self.location: context["location"] = self.get_location.serialize(request) + # Always show tags, even if empty list + if self.tags: + context["tags"] = [tag['name'] for tag in self.tags] + else: + context["tags"] = [] + if show_comments: comments = [ l.comment().serialize(request) for l in self.get_comments()] @@ -832,6 +848,9 @@ class MediaEntry(Base, MediaEntryMixin, CommentingMixin): if "location" in data: License.create(data["location"], self) + if "tags" in data: + self.tags = convert_to_tag_list_of_dicts(', '.join(data["tags"])) + return True class FileKeynames(Base): @@ -966,7 +985,7 @@ class MediaTag(Base): class Comment(Base): """ Link table between a response and another object that can have replies. - + This acts as a link table between an object and the comments on it, it's done like this so that you can look up all the comments without knowing whhich comments are on an object before hand. Any object can be a comment @@ -977,7 +996,7 @@ class Comment(Base): __tablename__ = "core__comment_links" id = Column(Integer, primary_key=True) - + # The GMR to the object the comment is on. target_id = Column( Integer, @@ -1006,7 +1025,25 @@ class Comment(Base): # When it was added added = Column(DateTime, nullable=False, default=datetime.datetime.utcnow) - + + @property + def get_author(self): + # for compatibility + return self.comment().get_actor # noqa + + def __getattr__(self, attr): + if attr.startswith('_'): + # if attr starts with '_', then it's probably some internal + # sqlalchemy variable. Since __getattr__ is called when + # non-existing attributes are being accessed, we should not try to + # fetch it from self.comment() + raise AttributeError + try: + _log.debug('Old attr is being accessed: {0}'.format(attr)) + return getattr(self.comment(), attr) # noqa + except Exception as e: + _log.error(e) + raise class TextComment(Base, TextCommentMixin, CommentingMixin): """ @@ -1040,7 +1077,7 @@ class TextComment(Base, TextCommentMixin, CommentingMixin): if target is None: target = {} else: - target = target.serialize(request, show_comments=False) + target = target.serialize(request, show_comments=False) author = self.get_actor @@ -1068,7 +1105,7 @@ class TextComment(Base, TextCommentMixin, CommentingMixin): if "location" in data: Location.create(data["location"], self) - + # Handle changing the reply ID if "inReplyTo" in data: # Validate that the ID is correct @@ -1099,7 +1136,7 @@ class TextComment(Base, TextCommentMixin, CommentingMixin): link.target = media link.comment = self link.save() - + return True class Collection(Base, CollectionMixin, CommentingMixin): @@ -1298,7 +1335,7 @@ class Notification(Base): seen = Column(Boolean, default=lambda: False, index=True) user = relationship( User, - backref=backref('notifications', cascade='all, delete-orphan')) + backref=backref('notifications', cascade='all, delete-orphan')) def __repr__(self): return '<{klass} #{id}: {user}: {subject} ({seen})>'.format( @@ -1343,7 +1380,7 @@ class Report(Base): which points to the reported object. """ __tablename__ = 'core__reports' - + id = Column(Integer, primary_key=True) reporter_id = Column(Integer, ForeignKey(User.id), nullable=False) reporter = relationship( @@ -1371,7 +1408,7 @@ class Report(Base): resolved = Column(DateTime) result = Column(UnicodeText) - + object_id = Column(Integer, ForeignKey(GenericModelReference.id), nullable=True) object_helper = relationship(GenericModelReference) obj = association_proxy("object_helper", "get_object", diff --git a/mediagoblin/db/models_v0.py b/mediagoblin/db/models_v0.py deleted file mode 100644 index bdedec2e..00000000 --- a/mediagoblin/db/models_v0.py +++ /dev/null @@ -1,342 +0,0 @@ -# GNU MediaGoblin -- federated, autonomous media hosting -# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . - -""" -TODO: indexes on foreignkeys, where useful. -""" - -########################################################################### -# WHAT IS THIS FILE? -# ------------------ -# -# Upon occasion, someone runs into this file and wonders why we have -# both a models.py and a models_v0.py. -# -# The short of it is: you can ignore this file. -# -# The long version is, in two parts: -# -# - We used to use MongoDB, then we switched to SQL and SQLAlchemy. -# We needed to convert peoples' databases; the script we had would -# switch them to the first version right after Mongo, convert over -# all their tables, then run any migrations that were added after. -# -# - That script is now removed, but there is some discussion of -# writing a test that would set us at the first SQL migration and -# run everything after. If we wrote that, this file would still be -# useful. But for now, it's legacy! -# -########################################################################### - - -import datetime -import sys - -from sqlalchemy import ( - Column, Integer, Unicode, UnicodeText, DateTime, Boolean, ForeignKey, - UniqueConstraint, PrimaryKeyConstraint, SmallInteger, Float) -from sqlalchemy.ext.declarative import declarative_base -from sqlalchemy.orm import relationship, backref -from sqlalchemy.orm.collections import attribute_mapped_collection -from sqlalchemy.ext.associationproxy import association_proxy -from sqlalchemy.util import memoized_property - -from mediagoblin.db.extratypes import PathTupleWithSlashes, JSONEncoded -from mediagoblin.db.base import GMGTableBase, Session - - -Base_v0 = declarative_base(cls=GMGTableBase) - - -class User(Base_v0): - """ - TODO: We should consider moving some rarely used fields - into some sort of "shadow" table. - """ - __tablename__ = "core__users" - - id = Column(Integer, primary_key=True) - username = Column(Unicode, nullable=False, unique=True) - email = Column(Unicode, nullable=False) - created = Column(DateTime, nullable=False, default=datetime.datetime.now) - pw_hash = Column(Unicode, nullable=False) - email_verified = Column(Boolean, default=False) - status = Column(Unicode, default=u"needs_email_verification", nullable=False) - verification_key = Column(Unicode) - is_admin = Column(Boolean, default=False, nullable=False) - url = Column(Unicode) - bio = Column(UnicodeText) # ?? - fp_verification_key = Column(Unicode) - fp_token_expire = Column(DateTime) - - ## TODO - # plugin data would be in a separate model - - -class MediaEntry(Base_v0): - """ - TODO: Consider fetching the media_files using join - """ - __tablename__ = "core__media_entries" - - id = Column(Integer, primary_key=True) - uploader = Column(Integer, ForeignKey(User.id), nullable=False, index=True) - title = Column(Unicode, nullable=False) - slug = Column(Unicode) - created = Column(DateTime, nullable=False, default=datetime.datetime.now, - index=True) - description = Column(UnicodeText) # ?? - media_type = Column(Unicode, nullable=False) - state = Column(Unicode, default=u'unprocessed', nullable=False) - # or use sqlalchemy.types.Enum? - license = Column(Unicode) - - fail_error = Column(Unicode) - fail_metadata = Column(JSONEncoded) - - queued_media_file = Column(PathTupleWithSlashes) - - queued_task_id = Column(Unicode) - - __table_args__ = ( - UniqueConstraint('uploader', 'slug'), - {}) - - get_uploader = relationship(User) - - media_files_helper = relationship("MediaFile", - collection_class=attribute_mapped_collection("name"), - cascade="all, delete-orphan" - ) - - attachment_files_helper = relationship("MediaAttachmentFile", - cascade="all, delete-orphan", - order_by="MediaAttachmentFile.created" - ) - - tags_helper = relationship("MediaTag", - cascade="all, delete-orphan" - ) - - def media_data_init(self, **kwargs): - """ - Initialize or update the contents of a media entry's media_data row - """ - session = Session() - - media_data = session.query(self.media_data_table).filter_by( - media_entry=self.id).first() - - # No media data, so actually add a new one - if media_data is None: - media_data = self.media_data_table( - media_entry=self.id, - **kwargs) - session.add(media_data) - # Update old media data - else: - for field, value in kwargs.iteritems(): - setattr(media_data, field, value) - - @memoized_property - def media_data_table(self): - # TODO: memoize this - models_module = self.media_type + '.models' - __import__(models_module) - return sys.modules[models_module].DATA_MODEL - - -class FileKeynames(Base_v0): - """ - keywords for various places. - currently the MediaFile keys - """ - __tablename__ = "core__file_keynames" - id = Column(Integer, primary_key=True) - name = Column(Unicode, unique=True) - - def __repr__(self): - return "" % (self.id, self.name) - - @classmethod - def find_or_new(cls, name): - t = cls.query.filter_by(name=name).first() - if t is not None: - return t - return cls(name=name) - - -class MediaFile(Base_v0): - """ - TODO: Highly consider moving "name" into a new table. - TODO: Consider preloading said table in software - """ - __tablename__ = "core__mediafiles" - - media_entry = Column( - Integer, ForeignKey(MediaEntry.id), - nullable=False) - name_id = Column(SmallInteger, ForeignKey(FileKeynames.id), nullable=False) - file_path = Column(PathTupleWithSlashes) - - __table_args__ = ( - PrimaryKeyConstraint('media_entry', 'name_id'), - {}) - - def __repr__(self): - return "" % (self.name, self.file_path) - - name_helper = relationship(FileKeynames, lazy="joined", innerjoin=True) - name = association_proxy('name_helper', 'name', - creator=FileKeynames.find_or_new - ) - - -class MediaAttachmentFile(Base_v0): - __tablename__ = "core__attachment_files" - - id = Column(Integer, primary_key=True) - media_entry = Column( - Integer, ForeignKey(MediaEntry.id), - nullable=False) - name = Column(Unicode, nullable=False) - filepath = Column(PathTupleWithSlashes) - created = Column(DateTime, nullable=False, default=datetime.datetime.now) - - -class Tag(Base_v0): - __tablename__ = "core__tags" - - id = Column(Integer, primary_key=True) - slug = Column(Unicode, nullable=False, unique=True) - - def __repr__(self): - return "" % (self.id, self.slug) - - @classmethod - def find_or_new(cls, slug): - t = cls.query.filter_by(slug=slug).first() - if t is not None: - return t - return cls(slug=slug) - - -class MediaTag(Base_v0): - __tablename__ = "core__media_tags" - - id = Column(Integer, primary_key=True) - media_entry = Column( - Integer, ForeignKey(MediaEntry.id), - nullable=False, index=True) - tag = Column(Integer, ForeignKey(Tag.id), nullable=False, index=True) - name = Column(Unicode) - # created = Column(DateTime, nullable=False, default=datetime.datetime.now) - - __table_args__ = ( - UniqueConstraint('tag', 'media_entry'), - {}) - - tag_helper = relationship(Tag) - slug = association_proxy('tag_helper', 'slug', - creator=Tag.find_or_new - ) - - def __init__(self, name=None, slug=None): - Base_v0.__init__(self) - if name is not None: - self.name = name - if slug is not None: - self.tag_helper = Tag.find_or_new(slug) - - -class MediaComment(Base_v0): - __tablename__ = "core__media_comments" - - id = Column(Integer, primary_key=True) - media_entry = Column( - Integer, ForeignKey(MediaEntry.id), nullable=False, index=True) - author = Column(Integer, ForeignKey(User.id), nullable=False) - created = Column(DateTime, nullable=False, default=datetime.datetime.now) - content = Column(UnicodeText, nullable=False) - - get_author = relationship(User) - - -class ImageData(Base_v0): - __tablename__ = "image__mediadata" - - # The primary key *and* reference to the main media_entry - media_entry = Column(Integer, ForeignKey('core__media_entries.id'), - primary_key=True) - get_media_entry = relationship("MediaEntry", - backref=backref("image__media_data", cascade="all, delete-orphan")) - - width = Column(Integer) - height = Column(Integer) - exif_all = Column(JSONEncoded) - gps_longitude = Column(Float) - gps_latitude = Column(Float) - gps_altitude = Column(Float) - gps_direction = Column(Float) - - -class VideoData(Base_v0): - __tablename__ = "video__mediadata" - - # The primary key *and* reference to the main media_entry - media_entry = Column(Integer, ForeignKey('core__media_entries.id'), - primary_key=True) - get_media_entry = relationship("MediaEntry", - backref=backref("video__media_data", cascade="all, delete-orphan")) - - width = Column(SmallInteger) - height = Column(SmallInteger) - - -class AsciiData(Base_v0): - __tablename__ = "ascii__mediadata" - - # The primary key *and* reference to the main media_entry - media_entry = Column(Integer, ForeignKey('core__media_entries.id'), - primary_key=True) - get_media_entry = relationship("MediaEntry", - backref=backref("ascii__media_data", cascade="all, delete-orphan")) - - -class AudioData(Base_v0): - __tablename__ = "audio__mediadata" - - # The primary key *and* reference to the main media_entry - media_entry = Column(Integer, ForeignKey('core__media_entries.id'), - primary_key=True) - get_media_entry = relationship("MediaEntry", - backref=backref("audio__media_data", cascade="all, delete-orphan")) - - -###################################################### -# Special, migrations-tracking table -# -# Not listed in MODELS because this is special and not -# really migrated, but used for migrations (for now) -###################################################### - -class MigrationData(Base_v0): - __tablename__ = "core__migrations" - - name = Column(Unicode, primary_key=True) - version = Column(Integer, nullable=False, default=0) - -###################################################### diff --git a/mediagoblin/decorators.py b/mediagoblin/decorators.py index daeddb3f..2b8343b8 100644 --- a/mediagoblin/decorators.py +++ b/mediagoblin/decorators.py @@ -268,8 +268,7 @@ def get_media_entry_by_id(controller): @wraps(controller) def wrapper(request, *args, **kwargs): media = MediaEntry.query.filter_by( - id=request.matchdict['media_id'], - state=u'processed').first() + id=request.matchdict['media_id']).first() # Still no media? Okay, 404. if not media: return render_404(request) diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py index 69f69da5..717241e8 100644 --- a/mediagoblin/edit/views.py +++ b/mediagoblin/edit/views.py @@ -1,4 +1,4 @@ -# GNU MediaGoblin -- federated, autonomous media hosting + # Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. # # This program is free software: you can redistribute it and/or modify @@ -55,6 +55,10 @@ import mimetypes @get_media_entry_by_id @require_active_login def edit_media(request, media): + # If media is not processed, return NotFound. + if not media.state == u'processed': + return render_404(request) + if not may_edit_media(request, media): raise Forbidden("User may not edit this media") @@ -66,7 +70,7 @@ def edit_media(request, media): license=media.license) form = forms.EditForm( - request.form, + request.method=='POST' and request.form or None, **defaults) if request.method == 'POST' and form.validate(): @@ -115,6 +119,10 @@ UNSAFE_MIMETYPES = [ @get_media_entry_by_id @require_active_login def edit_attachments(request, media): + # If media is not processed, return NotFound. + if not media.state == u'processed': + return render_404(request) + if mg_globals.app_config['allow_attachments']: form = forms.EditAttachmentsForm() @@ -211,7 +219,8 @@ def edit_profile(request, url_user=None): else: location = user.get_location.name - form = forms.EditProfileForm(request.form, + form = forms.EditProfileForm( + request.method == 'POST' and request.form or None, url=user.url, bio=user.bio, location=location) @@ -227,6 +236,8 @@ def edit_profile(request, url_user=None): location = user.get_location location.name = six.text_type(form.location.data) location.save() + else: + user.location = None user.save() @@ -252,7 +263,8 @@ EMAIL_VERIFICATION_TEMPLATE = ( @require_active_login def edit_account(request): user = request.user - form = forms.EditAccountForm(request.form, + form = forms.EditAccountForm( + request.method == 'POST' and request.form or None, wants_comment_notification=user.wants_comment_notification, license_preference=user.license_preference, wants_notifications=user.wants_notifications) @@ -350,7 +362,7 @@ def edit_collection(request, collection): description=collection.description) form = forms.EditCollectionForm( - request.form, + request.method == 'POST' and request.form or None, **defaults) if request.method == 'POST' and form.validate(): @@ -443,9 +455,11 @@ def verify_email(request): user=user.username) +@require_active_login def change_email(request): """ View to change the user's email """ - form = forms.ChangeEmailForm(request.form) + form = forms.ChangeEmailForm( + request.method == 'POST' and request.form or None) user = request.user # If no password authentication, no need to enter a password @@ -498,7 +512,12 @@ def change_email(request): @require_active_login @get_media_entry_by_id def edit_metadata(request, media): - form = forms.EditMetaDataForm(request.form) + # If media is not processed, return NotFound. + if not media.state == u'processed': + return render_404(request) + + form = forms.EditMetaDataForm( + request.method == 'POST' and request.form or None) if request.method == "POST" and form.validate(): metadata_dict = dict([(row['identifier'],row['value']) for row in form.media_metadata.data]) diff --git a/mediagoblin/gmg_commands/addmedia.py b/mediagoblin/gmg_commands/addmedia.py index 8cbfc806..026f3495 100644 --- a/mediagoblin/gmg_commands/addmedia.py +++ b/mediagoblin/gmg_commands/addmedia.py @@ -56,6 +56,11 @@ def parser_setup(subparser): help=( "Slug for this media entry. " "Will be autogenerated if unspecified.")) + subparser.add_argument( + "-c", "--collection-slug", + help=( + "Slug of the collection for this media entry. " + "Should already exist.")) subparser.add_argument( '--celery', @@ -85,8 +90,6 @@ def addmedia(args): print("Can't find a file with filename '%s'" % args.filename) return - upload_limit, max_file_size = get_upload_file_limits(user) - def maybe_unicodeify(some_string): # this is kinda terrible if some_string is None: @@ -102,9 +105,9 @@ def addmedia(args): submitted_file=open(abs_filename, 'rb'), filename=filename, title=maybe_unicodeify(args.title), description=maybe_unicodeify(args.description), + collection_slug=args.collection_slug, license=maybe_unicodeify(args.license), - tags_string=maybe_unicodeify(args.tags) or u"", - upload_limit=upload_limit, max_file_size=max_file_size) + tags_string=maybe_unicodeify(args.tags) or u"") except FileUploadLimit: print("This file is larger than the upload limits for this site.") except UserUploadLimit: diff --git a/mediagoblin/gmg_commands/batchaddmedia.py b/mediagoblin/gmg_commands/batchaddmedia.py index 2ad7e39e..55ed865b 100644 --- a/mediagoblin/gmg_commands/batchaddmedia.py +++ b/mediagoblin/gmg_commands/batchaddmedia.py @@ -19,6 +19,7 @@ from __future__ import print_function import codecs import csv import os +import sys import requests import six @@ -28,8 +29,7 @@ from six.moves.urllib.parse import urlparse from mediagoblin.db.models import LocalUser from mediagoblin.gmg_commands import util as commands_util from mediagoblin.submit.lib import ( - submit_media, get_upload_file_limits, - FileUploadLimit, UserUploadLimit, UserPastUploadLimit) + submit_media, FileUploadLimit, UserUploadLimit, UserPastUploadLimit) from mediagoblin.tools.metadata import compact_and_validate from mediagoblin.tools.translate import pass_to_ugettext as _ from jsonschema.exceptions import ValidationError @@ -73,9 +73,6 @@ def batchaddmedia(args): username=args.username))) return - upload_limit, max_file_size = get_upload_file_limits(user) - temp_files = [] - if os.path.isfile(args.metadata_path): metadata_path = args.metadata_path @@ -87,7 +84,6 @@ def batchaddmedia(args): abs_metadata_filename = os.path.abspath(metadata_path) abs_metadata_dir = os.path.dirname(abs_metadata_filename) - upload_limit, max_file_size = get_upload_file_limits(user) def maybe_unicodeify(some_string): # this is kinda terrible @@ -101,7 +97,7 @@ def batchaddmedia(args): contents = all_metadata.read() media_metadata = parse_csv_file(contents) - for media_id, file_metadata in media_metadata.iteritems(): + for media_id, file_metadata in media_metadata.items(): files_attempted += 1 # In case the metadata was not uploaded initialize an empty dictionary. json_ld_metadata = compact_and_validate({}) @@ -115,6 +111,7 @@ def batchaddmedia(args): title = file_metadata.get('title') or file_metadata.get('dc:title') description = (file_metadata.get('description') or file_metadata.get('dc:description')) + collection_slug = file_metadata.get('collection-slug') license = file_metadata.get('license') try: @@ -143,7 +140,7 @@ Metadata was not uploaded.""".format( file_path = os.path.join(abs_metadata_dir, path) file_abs_path = os.path.abspath(file_path) try: - media_file = file(file_abs_path, 'r') + media_file = open(file_abs_path, 'rb') except IOError: print(_(u"""\ FAIL: Local file {filename} could not be accessed. @@ -157,10 +154,10 @@ FAIL: Local file {filename} could not be accessed. filename=filename, title=maybe_unicodeify(title), description=maybe_unicodeify(description), + collection_slug=maybe_unicodeify(collection_slug), license=maybe_unicodeify(license), metadata=json_ld_metadata, - tags_string=u"", - upload_limit=upload_limit, max_file_size=max_file_size) + tags_string=u"") print(_(u"""Successfully submitted {filename}! Be sure to look at the Media Processing Panel on your website to be sure it uploaded successfully.""".format(filename=filename))) @@ -206,7 +203,12 @@ def parse_csv_file(file_contents): # Build a dictionary for index, line in enumerate(lines): if line.isspace() or line == u'': continue - values = unicode_csv_reader([line]).next() + if (sys.version_info[0] == 3): + # Python 3's csv.py supports Unicode out of the box. + reader = csv.reader([line]) + else: + reader = unicode_csv_reader([line]) + values = next(reader) line_dict = dict([(key[i], val) for i, val in enumerate(values)]) media_id = line_dict.get('id') or index diff --git a/mediagoblin/gmg_commands/dbupdate.py b/mediagoblin/gmg_commands/dbupdate.py index bafe76bb..2700ccbc 100644 --- a/mediagoblin/gmg_commands/dbupdate.py +++ b/mediagoblin/gmg_commands/dbupdate.py @@ -133,7 +133,9 @@ def run_alembic_migrations(db, app_config, global_config): session = Session() cfg = build_alembic_config(global_config, None, session) - return command.upgrade(cfg, 'heads') + res = command.upgrade(cfg, 'heads') + session.commit() + return res def run_dbupdate(app_config, global_config): @@ -146,7 +148,7 @@ def run_dbupdate(app_config, global_config): # Set up the database db = setup_connection_and_db_from_config(app_config, migrations=True) - # Do we have migrations + # Do we have migrations should_run_sqam_migrations = db.engine.has_table("core__migrations") and \ sqam_migrations_to_run(db, app_config, global_config) diff --git a/mediagoblin/i18n/es/mediagoblin.po b/mediagoblin/i18n/es/mediagoblin.po index 8fd27b62..bdc63e56 100644 --- a/mediagoblin/i18n/es/mediagoblin.po +++ b/mediagoblin/i18n/es/mediagoblin.po @@ -2645,7 +2645,7 @@ msgstr "más antiguo" #: mediagoblin/templates/mediagoblin/utils/profile.html:36 msgid "Location" -msgstr "Locación" +msgstr "Lugar" #: mediagoblin/templates/mediagoblin/utils/report.html:25 msgid "Report media" diff --git a/mediagoblin/init/config.py b/mediagoblin/init/config.py index a9189e8d..fe469156 100644 --- a/mediagoblin/init/config.py +++ b/mediagoblin/init/config.py @@ -123,6 +123,7 @@ def read_mediagoblin_config(config_path, config_spec_path=CONFIG_SPEC_PATH): config = ConfigObj( config_path, configspec=config_spec, + encoding="UTF8", interpolation="ConfigParser") _setup_defaults(config, config_path, mainconfig_defaults) diff --git a/mediagoblin/listings/views.py b/mediagoblin/listings/views.py index f640cc95..6e1528ca 100644 --- a/mediagoblin/listings/views.py +++ b/mediagoblin/listings/views.py @@ -17,9 +17,10 @@ from mediagoblin import mg_globals from mediagoblin.db.models import MediaEntry from mediagoblin.db.util import media_entries_for_tag_slug +from mediagoblin.decorators import uses_pagination +from mediagoblin.plugins.api.tools import get_media_file_paths from mediagoblin.tools.pagination import Pagination from mediagoblin.tools.response import render_to_response -from mediagoblin.decorators import uses_pagination from werkzeug.contrib.atom import AtomFeed @@ -72,19 +73,25 @@ def atom_feed(request): tag_slug = request.matchdict.get(u'tag') feed_title = "MediaGoblin Feed" if tag_slug: - cursor = media_entries_for_tag_slug(request.db, tag_slug) + feed_title += " for tag '%s'" % tag_slug link = request.urlgen('mediagoblin.listings.tags_listing', qualified=True, tag=tag_slug ) - feed_title += "for tag '%s'" % tag_slug + cursor = media_entries_for_tag_slug(request.db, tag_slug) else: # all recent item feed - cursor = MediaEntry.query.filter_by(state=u'processed') + feed_title += " for all recent items" link = request.urlgen('index', qualified=True) - feed_title += "for all recent items" + cursor = MediaEntry.query.filter_by(state=u'processed') + cursor = cursor.order_by(MediaEntry.created.desc()) + cursor = cursor.limit(ATOM_DEFAULT_NR_OF_UPDATED_ITEMS) + - atomlinks = [ - {'href': link, - 'rel': 'alternate', - 'type': 'text/html'}] + """ + ATOM feed id is a tag URI (see http://en.wikipedia.org/wiki/Tag_URI) + """ + atomlinks = [{ + 'href': link, + 'rel': 'alternate', + 'type': 'text/html'}] if mg_globals.app_config["push_urls"]: for push_url in mg_globals.app_config["push_urls"]: @@ -92,9 +99,6 @@ def atom_feed(request): 'rel': 'hub', 'href': push_url}) - cursor = cursor.order_by(MediaEntry.created.desc()) - cursor = cursor.limit(ATOM_DEFAULT_NR_OF_UPDATED_ITEMS) - feed = AtomFeed( feed_title, feed_url=request.url, @@ -102,19 +106,30 @@ def atom_feed(request): links=atomlinks) for entry in cursor: - feed.add(entry.get('title'), - entry.description_html, - id=entry.url_for_self(request.urlgen,qualified=True), + # Include a thumbnail image in content. + file_urls = get_media_file_paths(entry.media_files, request.urlgen) + if 'thumb' in file_urls: + content = u' {desc}'.format( + thumb=file_urls['thumb'], desc=entry.description_html) + else: + content = entry.description_html + + feed.add( + entry.get('title'), + content, + id=entry.url_for_self(request.urlgen, qualified=True), content_type='html', - author={'name': entry.get_actor.username, + author={ + 'name': entry.get_actor.username, 'uri': request.urlgen( 'mediagoblin.user_pages.user_home', - qualified=True, user=entry.get_actor.username)}, + qualified=True, + user=entry.get_actor.username)}, updated=entry.get('created'), links=[{ - 'href':entry.url_for_self( - request.urlgen, - qualified=True), + 'href': entry.url_for_self( + request.urlgen, + qualified=True), 'rel': 'alternate', 'type': 'text/html'}]) diff --git a/mediagoblin/media_types/blog/models.py b/mediagoblin/media_types/blog/models.py index 0e1ddf97..83f520c7 100644 --- a/mediagoblin/media_types/blog/models.py +++ b/mediagoblin/media_types/blog/models.py @@ -34,6 +34,7 @@ class BlogMixin(GenerateSlugMixin): def check_slug_used(self, slug): return check_blog_slug_used(self.author, slug, self.id) +BLOG_BACKREF_NAME = "mediatype__blogs" class Blog(Base, BlogMixin): __tablename__ = "mediatype__blogs" @@ -43,6 +44,7 @@ class Blog(Base, BlogMixin): author = Column(Integer, ForeignKey(User.id), nullable=False, index=True) #similar to uploader created = Column(DateTime, nullable=False, default=datetime.datetime.now, index=True) slug = Column(Unicode) + get_author = relationship("User", backref=backref(BLOG_BACKREF_NAME, cascade="all, delete-orphan")) @property def slug_or_id(self): @@ -66,7 +68,7 @@ class Blog(Base, BlogMixin): -BACKREF_NAME = "blogpost__media_data" +BLOG_POST_BACKREF_NAME = "blogpost__media_data" class BlogPostData(Base): __tablename__ = "blogpost__mediadata" @@ -75,7 +77,7 @@ class BlogPostData(Base): media_entry = Column(Integer, ForeignKey('core__media_entries.id'), primary_key=True) blog = Column(Integer, ForeignKey('mediatype__blogs.id'), nullable=False) get_media_entry = relationship("MediaEntry", - backref=backref(BACKREF_NAME, uselist=False, + backref=backref(BLOG_POST_BACKREF_NAME, uselist=False, cascade="all, delete-orphan")) diff --git a/mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html b/mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html index 3b881466..97408b59 100644 --- a/mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html +++ b/mediagoblin/media_types/blog/templates/mediagoblin/blog/blog_admin_dashboard.html @@ -53,7 +53,7 @@ {% set blog_delete_url = request.urlgen('mediagoblin.media_types.blog.blog_delete', blog_slug=blog.slug, user=request.user.username) %} - + {%- trans %}Delete Blog{% endtrans -%}

@@ -90,7 +90,7 @@ media_id=blog_post.id) %} {% trans %}Edit{% endtrans %} - {% trans %}Delete{% endtrans %} + {% trans %}Delete{% endtrans %} {% endfor %} diff --git a/mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html b/mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html index 6d820550..7a53cc9e 100644 --- a/mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html +++ b/mediagoblin/media_types/blog/templates/mediagoblin/blog/blogpost_draft_view.html @@ -33,7 +33,7 @@ user= blogpost.get_actor.username, media_id=blogpost.id) %} {% trans %}Edit{% endtrans %} - {% trans %}Delete{% endtrans %} + {% trans %}Delete{% endtrans %} {% endblock %} diff --git a/mediagoblin/media_types/blog/templates/mediagoblin/blog/list_of_blogs.html b/mediagoblin/media_types/blog/templates/mediagoblin/blog/list_of_blogs.html index 8c16daeb..bad33c8c 100644 --- a/mediagoblin/media_types/blog/templates/mediagoblin/blog/list_of_blogs.html +++ b/mediagoblin/media_types/blog/templates/mediagoblin/blog/list_of_blogs.html @@ -52,7 +52,7 @@ {% if request.user and request.user.username==user.username %}

You have not created any blog yet.

{% else %} -

No blog has been created by {{ user.username }}yet.

+

No blog has been created by {{ user.username }} yet.

{% endif %} {% endif %}
diff --git a/mediagoblin/media_types/blog/views.py b/mediagoblin/media_types/blog/views.py index d48cf82f..288a47ae 100644 --- a/mediagoblin/media_types/blog/views.py +++ b/mediagoblin/media_types/blog/views.py @@ -376,7 +376,9 @@ def blog_about_view(request): user = request.db.LocalUser.query.filter( LocalUser.username==url_user ).first() - blog = get_blog_by_slug(request, blog_slug, author=user.id) + + if user: + blog = get_blog_by_slug(request, blog_slug, author=user.id) if not user or not blog: return render_404(request) diff --git a/mediagoblin/media_types/video/models.py b/mediagoblin/media_types/video/models.py index 4742b342..da635ed7 100644 --- a/mediagoblin/media_types/video/models.py +++ b/mediagoblin/media_types/video/models.py @@ -69,7 +69,7 @@ class VideoData(Base): orig_metadata = self.orig_metadata or {} if ("webm_video" not in self.get_media_entry.media_files - and "mimetype" in orig_metadata['common']['tags'] + and "mimetype" in orig_metadata.get('common', {}).get('tags', {}) and "codec" in orig_metadata['audio'] and "codec" in orig_metadata['video']): if orig_metadata['mimetype'] == 'application/ogg': diff --git a/mediagoblin/media_types/video/processing.py b/mediagoblin/media_types/video/processing.py index ca3087a2..71204fc7 100644 --- a/mediagoblin/media_types/video/processing.py +++ b/mediagoblin/media_types/video/processing.py @@ -79,7 +79,17 @@ def sniffer(media_file): return MEDIA_TYPE +EXCLUDED_EXTS = ["nef", "svg"] + def sniff_handler(media_file, filename): + name, ext = os.path.splitext(filename) + clean_ext = ext.lower()[1:] + + if clean_ext in EXCLUDED_EXTS: + # We don't handle this filetype, though gstreamer might think we can + _log.info('Refused to process {0} due to excluded extension'.format(filename)) + return None + try: return sniffer(media_file) except: @@ -106,10 +116,13 @@ def get_tags(stream_info): # TODO: handle timezone info; gst.get_time_zone_offset + # python's tzinfo should help dt = tags['datetime'] - tags['datetime'] = datetime.datetime( - dt.get_year(), dt.get_month(), dt.get_day(), dt.get_hour(), - dt.get_minute(), dt.get_second(), - dt.get_microsecond()).isoformat() + try: + tags['datetime'] = datetime.datetime( + dt.get_year(), dt.get_month(), dt.get_day(), dt.get_hour(), + dt.get_minute(), dt.get_second(), + dt.get_microsecond()).isoformat() + except: + tags['datetime'] = None for k, v in tags.copy().items(): # types below are accepted by json; others must not present if not isinstance(v, (dict, list, six.string_types, int, float, bool, diff --git a/mediagoblin/media_types/video/transcoders.py b/mediagoblin/media_types/video/transcoders.py index f4b0341e..2d3392f2 100644 --- a/mediagoblin/media_types/video/transcoders.py +++ b/mediagoblin/media_types/video/transcoders.py @@ -31,7 +31,7 @@ sys.argv = [] import gi gi.require_version('Gst', '1.0') -from gi.repository import GObject, Gst +from gi.repository import GLib, Gst Gst.init(None) # init before import to work around https://bugzilla.gnome.org/show_bug.cgi?id=736260 from gi.repository import GstPbutils @@ -154,7 +154,7 @@ class VideoTranscoder(object): def __init__(self): _log.info('Initializing VideoTranscoder...') self.progress_percentage = None - self.loop = GObject.MainLoop() + self.loop = GLib.MainLoop() def transcode(self, src, dst, **kwargs): ''' @@ -371,11 +371,11 @@ class VideoTranscoder(object): self.pipeline.set_state(Gst.State.NULL) # This kills the loop, mercifully - GObject.idle_add(self.__stop_mainloop) + GLib.idle_add(self.__stop_mainloop) def __stop_mainloop(self): ''' - Wrapper for GObject.MainLoop.quit() + Wrapper for GLib.MainLoop.quit() This wrapper makes us able to see if self.loop.quit has been called ''' diff --git a/mediagoblin/plugins/api/views.py b/mediagoblin/plugins/api/views.py index 23341065..fdd22ace 100644 --- a/mediagoblin/plugins/api/views.py +++ b/mediagoblin/plugins/api/views.py @@ -52,8 +52,6 @@ def post_entry(request): _log.debug('File field not found') raise BadRequest() - upload_limit, max_file_size = get_upload_file_limits(request.user) - callback_url = request.form.get('callback_url') if callback_url: callback_url = six.text_type(callback_url) @@ -66,7 +64,6 @@ def post_entry(request): description=six.text_type(request.form.get('description')), license=six.text_type(request.form.get('license', '')), tags_string=six.text_type(request.form.get('tags', '')), - upload_limit=upload_limit, max_file_size=max_file_size, callback_url=callback_url) return json_response(get_entry_serializable(entry, request.urlgen)) diff --git a/mediagoblin/plugins/basic_auth/README.rst b/mediagoblin/plugins/basic_auth/README.rst index 82f247ed..87a7b16f 100644 --- a/mediagoblin/plugins/basic_auth/README.rst +++ b/mediagoblin/plugins/basic_auth/README.rst @@ -5,7 +5,7 @@ =================== The basic_auth plugin is enabled by default in mediagoblin.ini. This plugin -provides basic username and password authentication for GNU Mediagoblin. +provides basic username and password authentication for GNU MediaGoblin. This plugin can be enabled alongside :ref:`openid-chapter` and :ref:`persona-chapter`. diff --git a/mediagoblin/plugins/basic_auth/forms.py b/mediagoblin/plugins/basic_auth/forms.py index 9a6db226..3d684e91 100644 --- a/mediagoblin/plugins/basic_auth/forms.py +++ b/mediagoblin/plugins/basic_auth/forms.py @@ -38,7 +38,7 @@ class LoginForm(wtforms.Form): username = wtforms.StringField( _('Username or Email'), [wtforms.validators.InputRequired(), - normalize_user_or_email_field()]) + normalize_user_or_email_field(is_login=True)]) password = wtforms.PasswordField( _('Password')) stay_logged_in = wtforms.BooleanField( diff --git a/mediagoblin/plugins/flatpagesfile/README.rst b/mediagoblin/plugins/flatpagesfile/README.rst index 59cd6217..0354a46c 100644 --- a/mediagoblin/plugins/flatpagesfile/README.rst +++ b/mediagoblin/plugins/flatpagesfile/README.rst @@ -57,7 +57,7 @@ Examples: ``flatpages-about``, ``about-view``, ``contact-view``, ... The value has two parts separated by commas: -1. **route path**: This is the url that this route matches. +1. **route path**: This is the URL that this route matches. Examples: ``/about``, ``/contact``, ``/pages/about``, ... @@ -74,7 +74,7 @@ The value has two parts separated by commas: For example: ``'/siteadmin/{adminname:\w+}'`` -2. **template**: The template to use for this url. The template is in +2. **template**: The template to use for this URL. The template is in the flatpagesfile template directory, so you just need to specify the file name. @@ -139,10 +139,10 @@ template:: Recipes ======= -Url variables +URL variables ------------- -You can handle urls like ``/about/{name}`` and access the name that's +You can handle URLs like ``/about/{name}`` and access the name that's passed in in the template. Sample route:: diff --git a/mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html b/mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html index 87f790d1..be608ac0 100644 --- a/mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html +++ b/mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html @@ -43,8 +43,9 @@ href="http://www.openstreetmap.org/copyright">OpenStreetMap contributors
  • Imaging ©MapQuest
  • Maps powered by - Leaflet
    • + href="https://www.openstreetmap.org">OpenStreetMap + contributors
  • Maps powered by + Leaflet

    • diff --git a/mediagoblin/plugins/ldap/README.rst b/mediagoblin/plugins/ldap/README.rst index ea9a34b3..049b5c4d 100644 --- a/mediagoblin/plugins/ldap/README.rst +++ b/mediagoblin/plugins/ldap/README.rst @@ -14,16 +14,16 @@ .. _ldap-plugin: ============= - ldap plugin + LDAP plugin ============= .. Warning:: This plugin is not compatible with the other authentication plugins. -This plugin allow your GNU Mediagoblin instance to authenticate against an +This plugin allow your GNU MediaGoblin instance to authenticate against an LDAP server. -Set up the ldap plugin +Set up the LDAP plugin ====================== 1. Install the ``python-ldap`` package. @@ -32,13 +32,13 @@ Set up the ldap plugin [[mediagoblin.plugins.ldap]] -Configuring the ldap plugin +Configuring the LDAP plugin =========================== -This plugin allows you to use multiple ldap servers for authentication. +This plugin allows you to use multiple LDAP servers for authentication. In order to configure a server, add the following to you MediaGoblin .ini file -under the ldap plugin:: +under the LDAP plugin:: [[mediagoblin.plugins.ldap]] [[[server1]]] @@ -50,15 +50,15 @@ under the ldap plugin:: Make any necessary changes to the above to work with your sever. Make sure ``{username}`` is where the username should be in LDAP_USER_DN_TEMPLATE. -If you would like to fetch the users email from the ldap server upon account +If you would like to fetch the users email from the LDAP server upon account registration, add ``LDAP_SEARCH_BASE = 'ou=users,dc=testathon,dc=net'`` and ``EMAIL_SEARCH_FIELD = 'mail'`` under you server configuration in your MediaGoblin .ini file. .. Warning:: By default, this plugin provides no encryption when communicating with the - ldap servers. If you would like to use an SSL connection, change - LDAP_SERVER_URI to use ``ldaps://`` and whichever port you use. Default ldap + LDAP servers. If you would like to use an SSL connection, change + LDAP_SERVER_URI to use ``ldaps://`` and whichever port you use. Default LDAP port for SSL connections is 636. If you would like to use a TLS connection, add ``LDAP_START_TLS = 'true'`` under your server configuration in your MediaGoblin .ini file. diff --git a/mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html.orig b/mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html.orig deleted file mode 100644 index 2bd1a14c..00000000 --- a/mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html.orig +++ /dev/null @@ -1,60 +0,0 @@ -{# -# GNU MediaGoblin -- federated, autonomous media hosting -# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -#} - -<<<<<<< HEAD:mediagoblin/templates/mediagoblin/utils/metadata_table.html -{%- macro render_table(request, media_entry, format_predicate) %} - {%- set metadata=media_entry.media_metadata %} - {%- set metadata_context=metadata['@context'] %} - {%- if metadata %} -

    {% trans %}Metadata Information{% endtrans %}

    - - {%- for key, value in metadata.iteritems() if ( - not key=='@context' and value) %} - - - - - {%- endfor %} -
    {{ format_predicate(key) }} - {{ value }}
    - {% endif %} - {% if request.user and request.user.has_privilege('admin') %} - - {% trans %}Edit Metadata{% endtrans %} - {% endif %} -{%- endmacro %} -======= -{%- set metadata=media.media_metadata %} -{%- set metadata_context=metadata['@context'] %} -{%- if metadata %} - {#- NOTE: In some smart future where the context is more extensible, - we will need to add to the prefix here-#} - - {%- for key, value in metadata.iteritems() if not key=='@context' %} - {% if value -%} - - - - - {%- endif -%} - {%- endfor %} -
    {{ rdfa_to_readable(key) }}{{ value }}
    -{% endif %} ->>>>>>> acfcaf6366bd4695c1c37c7aa8ff5a176b412e2a:mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html diff --git a/mediagoblin/plugins/openid/README.rst b/mediagoblin/plugins/openid/README.rst index 870a2b58..1a777336 100644 --- a/mediagoblin/plugins/openid/README.rst +++ b/mediagoblin/plugins/openid/README.rst @@ -1,23 +1,23 @@ .. _openid-chapter: =================== - openid plugin + OpenID plugin =================== -The openid plugin allows user to login to your GNU Mediagoblin instance using -their openid url. +The OpenID plugin allows user to login to your GNU MediaGoblin instance using +their OpenID URL. This plugin can be enabled alongside :ref:`basic_auth-chapter` and :ref:`persona-chapter`. .. note:: - When :ref:`basic_auth-chapter` is enabled alongside this openid plugin, and - a user creates an account using their openid. If they would like to add a + When :ref:`basic_auth-chapter` is enabled alongside this OpenID plugin, and + a user creates an account using their OpenID. If they would like to add a password to their account, they can use the forgot password feature to do so. -Set up the openid plugin +Set up the OpenID plugin ============================ 1. Install the ``python-openid`` package. diff --git a/mediagoblin/plugins/piwigo/views.py b/mediagoblin/plugins/piwigo/views.py index ab741a72..30c7ffa2 100644 --- a/mediagoblin/plugins/piwigo/views.py +++ b/mediagoblin/plugins/piwigo/views.py @@ -128,16 +128,13 @@ def pwg_images_addSimple(request): if not check_file_field(request, 'image'): raise BadRequest() - upload_limit, max_file_size = get_upload_file_limits(request.user) - try: entry = submit_media( mg_app=request.app, user=request.user, submitted_file=request.files['image'], filename=request.files['image'].filename, title=six.text_type(form.name.data), - description=six.text_type(form.comment.data), - upload_limit=upload_limit, max_file_size=max_file_size) + description=six.text_type(form.comment.data)) collection_id = form.category.data if collection_id > 0: diff --git a/mediagoblin/plugins/trim_whitespace/README.rst b/mediagoblin/plugins/trim_whitespace/README.rst index db9a0c53..d83af06b 100644 --- a/mediagoblin/plugins/trim_whitespace/README.rst +++ b/mediagoblin/plugins/trim_whitespace/README.rst @@ -2,7 +2,7 @@ Trim whitespace plugin ======================= -Mediagoblin templates are written with 80 char limit for better +MediaGoblin templates are written with 80 char limit for better readability. However that means that the HTML output is very verbose containing *lots* of whitespace. This plugin inserts a middleware that filters out whitespace from the returned HTML in the ``Response()`` diff --git a/mediagoblin/processing/task.py b/mediagoblin/processing/task.py index 5e0e772d..bedfd32d 100644 --- a/mediagoblin/processing/task.py +++ b/mediagoblin/processing/task.py @@ -69,6 +69,9 @@ class ProcessMedia(celery.Task): """ Pass this entry off for processing. """ + + name = 'process_media' + def run(self, media_id, feed_url, reprocess_action, reprocess_info=None): """ Pass the media entry off to the appropriate processing function diff --git a/mediagoblin/static/css/audio.css b/mediagoblin/static/css/audio.css index 5c50e727..de388094 100644 --- a/mediagoblin/static/css/audio.css +++ b/mediagoblin/static/css/audio.css @@ -24,10 +24,11 @@ font-size: 40px; width: 50px; text-shadow: 0 0 10px black; + background: none; + border: none; } .audio-control-play-pause.playing { color: #b71500; - letter-spacing: -17px; margin-left: -7px; } .audio-control-play-pause.paused { diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index 7852cae9..6da19f94 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -394,6 +394,12 @@ text-align: center; margin-right: auto; } +.form_box > h1, .form_box_xl > h1 { + /* Fix header overflowing issue. */ + overflow: hidden; + text-overflow: ellipsis +} + .form_box_xl { max-width: 460px; } @@ -456,12 +462,10 @@ text-align: center; margin-bottom: 10px; } -.form_field_label { - margin-bottom: 4px; -} - .form_field_label { font-size:1.125em; + margin-bottom: 0; + padding: 10px 0; } .form_field_description { @@ -585,7 +589,6 @@ ul#action_to_resolve {list-style:none; margin-left:10px;} border-radius: 0 0 5px 5px; padding: 0 0 6px; text-overflow: ellipsis; - white-space: nowrap; overflow: hidden; border-color: #0D0D0D; border-style: solid; diff --git a/mediagoblin/static/js/audio.js b/mediagoblin/static/js/audio.js index 50d58cd9..59a8c801 100644 --- a/mediagoblin/static/js/audio.js +++ b/mediagoblin/static/js/audio.js @@ -116,6 +116,10 @@ var audioPlayer = new Object(); var im = audioPlayer.imageElement; var pos = (e.offsetX || e.originalEvent.layerX) / im.width(); + console.log('pos', (e.offsetX || e.originalEvent.layerX) / im.width()) + console.log('setting current time to', + pos * audioPlayer.audioElement.duration) + audioPlayer.audioElement.currentTime = pos * audioPlayer.audioElement.duration; audioPlayer.audioElement.play(); audioPlayer.setState(audioPlayer.PLAYING); @@ -151,14 +155,16 @@ var audioPlayer = new Object(); switch (state) { case audioPlayer.PLAYING: - $('.audio-spectrogram .audio-control-play-pause') + el = $('.audio-spectrogram .audio-control-play-pause') .removeClass('paused').addClass('playing') - .text('▮▮'); + .text('▮▮').attr('aria-label', 'Pause'); + el[0].setAttribute('aria-label', 'Pause') break; case audioPlayer.PAUSED: - $('.audio-spectrogram .audio-control-play-pause') + el = $('.audio-spectrogram .audio-control-play-pause') .removeClass('playing').addClass('paused') - .text('▶'); + .text('▶').attr('aria-label', 'Play'); + el[0].setAttribute('aria-label', 'Play') break; } }; @@ -200,19 +206,9 @@ var audioPlayer = new Object(); * Attach the player to an image element */ console.log(imageElement); - var im = $(imageElement); - audioPlayer.imageElement = im; - $('
    ').appendTo(im.parent()); - $('
    ').appendTo(im.parent()); - $('
    ').appendTo(im.parent()); - $('
    ▶
    ').appendTo(im.parent()); - $('
    00:00
    ').appendTo(im.parent()); - $('').appendTo(im.parent()); - $('.audio-spectrogram').trigger('attachedControls'); }; })(audioPlayer); diff --git a/mediagoblin/static/js/geolocation-map.js b/mediagoblin/static/js/geolocation-map.js index 26d94c5d..c30788f7 100644 --- a/mediagoblin/static/js/geolocation-map.js +++ b/mediagoblin/static/js/geolocation-map.js @@ -30,13 +30,11 @@ $(document).ready(function () { // Get a new map instance attached and element with id="tile-map" var map = new L.Map('tile-map'); - var mqtileUrl = 'http://otile{s}.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.jpg'; + var mqtileUrl = 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png'; var mqtileAttrib = 'see map license'; var mqtile = new L.TileLayer( mqtileUrl, - {maxZoom: 18, - attribution: mqtileAttrib, - subdomains: '1234'}); + {maxZoom: 18}); map.attributionControl.setPrefix(''); var location = new L.LatLng(latitude, longitude); diff --git a/mediagoblin/static/js/header_dropdown.js b/mediagoblin/static/js/header_dropdown.js index 3ee46228..979d2690 100644 --- a/mediagoblin/static/js/header_dropdown.js +++ b/mediagoblin/static/js/header_dropdown.js @@ -17,9 +17,27 @@ */ $(document).ready(function(){ - $("#header_dropdown").hide(); - $(".header_dropdown_up").hide(); - $(".header_dropdown_down,.header_dropdown_up").click(function() { + // The header drop-down header panel defaults to open until you explicitly + // close it. After that, the panel open/closed setting will persist across + // page loads. + + // Initialise the panel status when page is loaded. + if (localStorage.getItem("panel_closed")) { + $("#header_dropdown").hide(); + $(".header_dropdown_up").hide(); + } + else { + $(".header_dropdown_down").hide(); + } + + // Toggle and persist the panel status. + $(".header_dropdown_down, .header_dropdown_up").click(function() { + if (localStorage.getItem("panel_closed")) { + localStorage.removeItem("panel_closed"); + } + else { + localStorage.setItem("panel_closed", "true"); + } $(".header_dropdown_down").toggle(); $(".header_dropdown_up").toggle(); $("#header_dropdown").slideToggle(); diff --git a/mediagoblin/static/js/post_comment.js b/mediagoblin/static/js/post_comment.js new file mode 100644 index 00000000..431c222f --- /dev/null +++ b/mediagoblin/static/js/post_comment.js @@ -0,0 +1,63 @@ +/** + * GNU MediaGoblin -- federated, autonomous media hosting + * Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + +$(document).ready(function(){ + $(function() { + // Hide this button if script is enabled + $('.form_submit_buttons').find('input').hide(); + + // Include this link if script is enabled + $('.form_submit_buttons').append( + '' + + 'Add this comment '); + + $('#post_comment').click(function() { + $.ajax({ + url: $('#postCommentURL').val(), + data: $('#form_comment').serialize(), + type: 'POST', + success: function(response) { + var message = $(response).find('.mediagoblin_messages'); + var commentsInResponse = $($(response).find('.media_comments')).find('li'); + var commentsInPage = $('.media_comments').find('ul'); + + // Post the message + message.css({"position":"fixed", "top":"50px", "width":"100%"}); + $('body').append(message); + message.delay(1500).fadeOut(); + + // Checking if there is new comment + if(commentsInResponse.length != $(commentsInPage).find('li').length) { + // Post comment and scroll down to it + var newComment = commentsInResponse[commentsInResponse.length - 1]; + $('#form_comment').fadeOut('fast'); + $('#button_addcomment').fadeIn('fast'); + $('#comment_preview').replaceWith("
    "); + $(commentsInPage).append(newComment); + $('html, body').animate({ + scrollTop: $(newComment).offset().top + }, 1000); + } + }, + error: function(error) { + console.log(error); + } + }); + }); + }); +}); \ No newline at end of file diff --git a/mediagoblin/static/js/show_password.js b/mediagoblin/static/js/show_password.js index b3fbc862..12935124 100644 --- a/mediagoblin/static/js/show_password.js +++ b/mediagoblin/static/js/show_password.js @@ -18,7 +18,7 @@ $(document).ready(function(){ //Create a duplicate password field. We could change the input type dynamically, but this angers the IE gods (not just IE6). - $("#password").after(''); + $("#password").after(''); $('#password_clear').hide(); $('#password_boolean').click(function(){ if($('#password_boolean').prop("checked")) { diff --git a/mediagoblin/submit/lib.py b/mediagoblin/submit/lib.py index 2edea70f..08a603e9 100644 --- a/mediagoblin/submit/lib.py +++ b/mediagoblin/submit/lib.py @@ -27,11 +27,12 @@ from mediagoblin import mg_globals from mediagoblin.tools.response import json_response from mediagoblin.tools.text import convert_to_tag_list_of_dicts from mediagoblin.tools.federation import create_activity, create_generator -from mediagoblin.db.models import MediaEntry, ProcessingMetaData +from mediagoblin.db.models import Collection, MediaEntry, ProcessingMetaData from mediagoblin.processing import mark_entry_failed from mediagoblin.processing.task import ProcessMedia from mediagoblin.notifications import add_comment_subscription from mediagoblin.media_types import sniff_media +from mediagoblin.user_pages.lib import add_media_to_collection _log = logging.getLogger(__name__) @@ -101,9 +102,8 @@ class UserPastUploadLimit(UploadLimitError): def submit_media(mg_app, user, submitted_file, filename, - title=None, description=None, + title=None, description=None, collection_slug=None, license=None, metadata=None, tags_string=u"", - upload_limit=None, max_file_size=None, callback_url=None, urlgen=None,): """ Args: @@ -116,15 +116,15 @@ def submit_media(mg_app, user, submitted_file, filename, one on disk being referenced by submitted_file. - title: title for this media entry - description: description for this media entry + - collection_slug: collection for this media entry - license: license for this media entry - tags_string: comma separated string of tags to be associated with this entry - - upload_limit: size in megabytes that's the per-user upload limit - - max_file_size: maximum size each file can be that's uploaded - callback_url: possible post-hook to call after submission - urlgen: if provided, used to do the feed_url update and assign a public ID used in the API (very important). """ + upload_limit, max_file_size = get_upload_file_limits(user) if upload_limit and user.uploaded >= upload_limit: raise UserPastUploadLimit() @@ -205,6 +205,13 @@ def submit_media(mg_app, user, submitted_file, filename, create_activity("post", entry, entry.actor) entry.save() + # add to collection + if collection_slug: + collection = Collection.query.filter_by(slug=collection_slug, + actor=user.id).first() + if collection: + add_media_to_collection(collection, entry) + # Pass off to processing # # (... don't change entry after this point to avoid race diff --git a/mediagoblin/submit/views.py b/mediagoblin/submit/views.py index be473615..7bbfb645 100644 --- a/mediagoblin/submit/views.py +++ b/mediagoblin/submit/views.py @@ -76,7 +76,6 @@ def submit_start(request): description=six.text_type(submit_form.description.data), license=six.text_type(submit_form.license.data) or None, tags_string=submit_form.tags.data, - upload_limit=upload_limit, max_file_size=max_file_size, urlgen=request.urlgen) if submit_form.collection and submit_form.collection.data: diff --git a/mediagoblin/templates/mediagoblin/federation/host-meta.xml b/mediagoblin/templates/mediagoblin/api/host-meta.xml similarity index 100% rename from mediagoblin/templates/mediagoblin/federation/host-meta.xml rename to mediagoblin/templates/mediagoblin/api/host-meta.xml diff --git a/mediagoblin/templates/mediagoblin/api/oob.html b/mediagoblin/templates/mediagoblin/api/oob.html index 97bdd9ca..e4d3a132 100644 --- a/mediagoblin/templates/mediagoblin/api/oob.html +++ b/mediagoblin/templates/mediagoblin/api/oob.html @@ -27,7 +27,5 @@

    {% trans %}Copy and paste this verifier code into your client:{% endtrans %}

    -

    - {{ oauth_request.verifier }} -

    +

    {{ oauth_request.verifier }}

    {% endblock %} diff --git a/mediagoblin/templates/mediagoblin/auth/register.html b/mediagoblin/templates/mediagoblin/auth/register.html index a7b8033f..b52ecff4 100644 --- a/mediagoblin/templates/mediagoblin/auth/register.html +++ b/mediagoblin/templates/mediagoblin/auth/register.html @@ -37,6 +37,7 @@ {% template_hook("register_link") %} {{ wtforms_util.render_divs(register_form, True) }} {{ csrf_token }} + {% template_hook("register_captcha") %}
    diff --git a/mediagoblin/templates/mediagoblin/media_displays/audio.html b/mediagoblin/templates/mediagoblin/media_displays/audio.html index 7571f863..191eff14 100644 --- a/mediagoblin/templates/mediagoblin/media_displays/audio.html +++ b/mediagoblin/templates/mediagoblin/media_displays/audio.html @@ -30,6 +30,12 @@
    {% if 'spectrogram' in media.media_files %}
    +
    +
    +
    + +
    00:00
    + Spectrogram diff --git a/mediagoblin/templates/mediagoblin/moderation/media_panel.html b/mediagoblin/templates/mediagoblin/moderation/media_panel.html index 94d4a1a0..e60f5e98 100644 --- a/mediagoblin/templates/mediagoblin/moderation/media_panel.html +++ b/mediagoblin/templates/mediagoblin/moderation/media_panel.html @@ -35,6 +35,7 @@ {% if processing_entries.count() %} + diff --git a/mediagoblin/templates/mediagoblin/user_pages/blog_media.html b/mediagoblin/templates/mediagoblin/user_pages/blog_media.html index 261b21e7..24328725 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/blog_media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/blog_media.html @@ -77,7 +77,7 @@ {% set delete_url = request.urlgen('mediagoblin.user_pages.media_confirm_delete', user= media.get_actor.username, media_id=media.id) %} - {% trans %}Delete{% endtrans %} + {% trans %}Delete{% endtrans %} {% endif %}
    @@ -165,8 +165,6 @@ {% include "mediagoblin/utils/license.html" %} - {% include "mediagoblin/utils/exif.html" %} - {% template_hook("media_sideinfo") %} {% block mediagoblin_sidebar %} diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index d1f437d1..b93da06e 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -29,6 +29,8 @@ src="{{ request.staticdirect('/js/comment_show.js') }}"> + {% template_hook("location_head") %} {% template_hook("media_head") %} @@ -75,6 +77,7 @@

    {{ media.title }}

    + {% template_hook("media_titleinfo") %} {% if request.user and (media.actor == request.user.id or request.user.has_privilege('admin')) %} @@ -116,6 +119,7 @@ {{ csrf_token }} + diff --git a/mediagoblin/templates/mediagoblin/user_pages/processing_panel.html b/mediagoblin/templates/mediagoblin/user_pages/processing_panel.html index 96786937..ee7b646a 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/processing_panel.html +++ b/mediagoblin/templates/mediagoblin/user_pages/processing_panel.html @@ -40,7 +40,7 @@ Show: Failed, Succesful + user=request.user.username, state="processed") }}">Successful

    {% if entries.count() %} diff --git a/mediagoblin/templates/mediagoblin/utils/collection_gallery.html b/mediagoblin/templates/mediagoblin/utils/collection_gallery.html index 86680cb6..8a3f7a75 100644 --- a/mediagoblin/templates/mediagoblin/utils/collection_gallery.html +++ b/mediagoblin/templates/mediagoblin/utils/collection_gallery.html @@ -31,11 +31,17 @@ {%- if loop.first %} thumb_entry_first {%- elif loop.last %} thumb_entry_last{% endif %}"> + {% if obj.icon_url %} + + {% endif %} + {% if obj.title %} + {{ obj.title }} + {% endif %} {% if item.note %} - {{ item.note }} + {{ item.note }} {% endif %} {% if request.user and (item.in_collection.actor == request.user.id or diff --git a/mediagoblin/templates/mediagoblin/utils/prev_next.html b/mediagoblin/templates/mediagoblin/utils/prev_next.html index 9e262ed9..fc8672fb 100644 --- a/mediagoblin/templates/mediagoblin/utils/prev_next.html +++ b/mediagoblin/templates/mediagoblin/utils/prev_next.html @@ -19,29 +19,36 @@ {# Provide navigation links to neighboring media entries, if possible #} {% set prev_entry_url = media.url_to_prev(request.urlgen) %} {% set next_entry_url = media.url_to_next(request.urlgen) %} +{% if is_rtl %} + {% set next_arrow = "→" %} + {% set prev_arrow = "←" %} +{% else %} + {% set next_arrow = "←" %} + {% set prev_arrow = "→" %} +{% endif %} {% if prev_entry_url or next_entry_url %}
    {# There are no previous entries for the very first media entry #} {% if prev_entry_url %} - ← {% trans %}newer{% endtrans %} + {{next_arrow}} {% trans %}newer{% endtrans %} {% else %} {# This is the first entry. display greyed-out 'previous' image #}

    - ← {% trans %}newer{% endtrans %} + {{next_arrow}} {% trans %}newer{% endtrans %}

    {% endif %} {# Likewise, this could be the very last media entry #} {% if next_entry_url %} - {% trans %}older{% endtrans %} → + {% trans %}older{% endtrans %} {{prev_arrow}} {% else %} {# This is the last entry. display greyed-out 'next' image #}

    - {% trans %}older{% endtrans %} → + {% trans %}older{% endtrans %} {{prev_arrow}}

    {% endif %}
    diff --git a/mediagoblin/templates/mediagoblin/utils/wtforms.html b/mediagoblin/templates/mediagoblin/utils/wtforms.html index 7e16708c..e2921258 100644 --- a/mediagoblin/templates/mediagoblin/utils/wtforms.html +++ b/mediagoblin/templates/mediagoblin/utils/wtforms.html @@ -40,9 +40,9 @@ {{- render_label_p(field) }}
    {% if autofocus_first %} - {{ field(autofocus=True) }} + {{ field(autofocus=True, style="width:100%;") }} {% else %} - {{ field }} + {{ field(style="width:100%;") }} {% endif %} {%- if field.errors -%} {% for error in field.errors %} diff --git a/mediagoblin/tests/.gitignore b/mediagoblin/tests/.gitignore new file mode 100644 index 00000000..16d3c4db --- /dev/null +++ b/mediagoblin/tests/.gitignore @@ -0,0 +1 @@ +.cache diff --git a/mediagoblin/tests/fake_carrot_conf_good.ini b/mediagoblin/tests/fake_carrot_conf_good.ini index 1377907b..8dc32525 100644 --- a/mediagoblin/tests/fake_carrot_conf_good.ini +++ b/mediagoblin/tests/fake_carrot_conf_good.ini @@ -7,7 +7,7 @@ num_carrots = 88 encouragement_phrase = "I'd love it if you eat your carrots!" # Something extra! -blah_blah = "blah!" +blah_blah = "blæh!" [celery] EAT_CELERY_WITH_CARROTS = False diff --git a/mediagoblin/tests/resources.py b/mediagoblin/tests/resources.py index 480f6d9a..38406d62 100644 --- a/mediagoblin/tests/resources.py +++ b/mediagoblin/tests/resources.py @@ -41,3 +41,4 @@ GOOD_JPG = resource_exif('good.jpg') EMPTY_JPG = resource_exif('empty.jpg') BAD_JPG = resource_exif('bad.jpg') GPS_JPG = resource_exif('has-gps.jpg') +BAD_GPS_JPG = resource_exif('bad-gps.jpg') diff --git a/mediagoblin/tests/test_api.py b/mediagoblin/tests/test_api.py index 90873cb9..f4741fd1 100644 --- a/mediagoblin/tests/test_api.py +++ b/mediagoblin/tests/test_api.py @@ -25,11 +25,11 @@ from webtest import AppError from .resources import GOOD_JPG from mediagoblin import mg_globals -from mediagoblin.db.models import User, Activity, MediaEntry, TextComment -from mediagoblin.tools.routing import extract_url_arguments +from mediagoblin.db.models import User, MediaEntry, TextComment from mediagoblin.tests.tools import fixture_add_user from mediagoblin.moderation.tools import take_away_privileges + class TestAPI(object): """ Test mediagoblin's pump.io complient APIs """ @@ -38,7 +38,8 @@ class TestAPI(object): self.test_app = test_app self.db = mg_globals.database - self.user = fixture_add_user(privileges=[u'active', u'uploader', u'commenter']) + self.user = fixture_add_user(privileges=[u'active', u'uploader', + u'commenter']) self.other_user = fixture_add_user( username="otheruser", privileges=[u'active', u'uploader', u'commenter'] @@ -61,7 +62,7 @@ class TestAPI(object): return response, json.loads(response.body.decode()) - def _upload_image(self, test_app, image): + def _upload_image(self, test_app, image, custom_filename=None): """ Uploads and image to MediaGoblin via pump.io API """ data = open(image, "rb").read() headers = { @@ -69,6 +70,8 @@ class TestAPI(object): "Content-Length": str(len(data)) } + if custom_filename is not None: + headers["X-File-Name"] = custom_filename with self.mock_oauth(): response = test_app.post( @@ -126,9 +129,48 @@ class TestAPI(object): assert image["objectType"] == "image" # Check that we got the response we're expecting - response, _ = self._post_image_to_feed(test_app, image) + response, data = self._post_image_to_feed(test_app, image) + assert response.status_code == 200 + assert data["object"]["fullImage"]["url"].endswith("unknown.jpe") + assert data["object"]["image"]["url"].endswith("unknown.thumbnail.jpe") + + def test_can_post_image_custom_filename(self, test_app): + """ Tests an image can be posted to the API with custom filename """ + # First request we need to do is to upload the image + response, image = self._upload_image(test_app, GOOD_JPG, + custom_filename="hello.jpg") + + # I should have got certain things back + assert response.status_code == 200 + + assert "id" in image + assert "fullImage" in image + assert "url" in image["fullImage"] + assert "url" in image + assert "author" in image + assert "published" in image + assert "updated" in image + assert image["objectType"] == "image" + + # Check that we got the response we're expecting + response, data = self._post_image_to_feed(test_app, image) + assert response.status_code == 200 + assert data["object"]["fullImage"]["url"].endswith("hello.jpg") + assert data["object"]["image"]["url"].endswith("hello.thumbnail.jpg") + + def test_can_post_image_tags(self, test_app): + """ Tests that an image can be posted to the API """ + # First request we need to do is to upload the image + response, image = self._upload_image(test_app, GOOD_JPG) assert response.status_code == 200 + image["tags"] = ["hello", "world"] + + # Check that we got the response we're expecting + response, data = self._post_image_to_feed(test_app, image) + assert response.status_code == 200 + assert data["object"]["tags"] == ["hello", "world"] + def test_unable_to_upload_as_someone_else(self, test_app): """ Test that can't upload as someoen else """ data = open(GOOD_JPG, "rb").read() @@ -172,7 +214,7 @@ class TestAPI(object): assert "403 FORBIDDEN" in excinfo.value.args[0] def test_only_able_to_update_own_image(self, test_app): - """ Test's that the uploader is the only person who can update an image """ + """ Test uploader is the only person who can update an image """ response, data = self._upload_image(test_app, GOOD_JPG) response, data = self._post_image_to_feed(test_app, data) @@ -186,13 +228,16 @@ class TestAPI(object): } # Lets change the image uploader to be self.other_user, this is easier - # than uploading the image as someone else as the way self.mocked_oauth_required - # and self._upload_image. - media = MediaEntry.query.filter_by(public_id=data["object"]["id"]).first() + # than uploading the image as someone else as the way + # self.mocked_oauth_required and self._upload_image. + media = MediaEntry.query \ + .filter_by(public_id=data["object"]["id"]) \ + .first() media.actor = self.other_user.id media.save() - # Now lets try and edit the image as self.user, this should produce a 403 error. + # Now lets try and edit the image as self.user, this should produce a + # 403 error. with self.mock_oauth(): with pytest.raises(AppError) as excinfo: test_app.post( @@ -242,7 +287,6 @@ class TestAPI(object): assert image["content"] == description assert image["license"] == license - def test_only_uploaders_post_image(self, test_app): """ Test that only uploaders can upload images """ # Remove uploader permissions from user @@ -288,12 +332,15 @@ class TestAPI(object): image = json.loads(request.body.decode()) entry = MediaEntry.query.filter_by(public_id=image["id"]).first() + assert entry is not None + assert request.status_code == 200 assert "image" in image assert "fullImage" in image assert "pump_io" in image assert "links" in image + assert "tags" in image def test_post_comment(self, test_app): """ Tests that I can post an comment media """ @@ -316,7 +363,9 @@ class TestAPI(object): assert response.status_code == 200 # Find the objects in the database - media = MediaEntry.query.filter_by(public_id=data["object"]["id"]).first() + media = MediaEntry.query \ + .filter_by(public_id=data["object"]["id"]) \ + .first() comment = media.get_comments()[0].comment() # Tests that it matches in the database @@ -378,7 +427,9 @@ class TestAPI(object): response, comment_data = self._activity_to_feed(test_app, activity) # change who uploaded the comment as it's easier than changing - comment = TextComment.query.filter_by(public_id=comment_data["object"]["id"]).first() + comment = TextComment.query \ + .filter_by(public_id=comment_data["object"]["id"]) \ + .first() comment.actor = self.other_user.id comment.save() @@ -432,7 +483,7 @@ class TestAPI(object): def test_whoami_without_login(self, test_app): """ Test that whoami endpoint returns error when not logged in """ with pytest.raises(AppError) as excinfo: - response = test_app.get("/api/whoami") + test_app.get("/api/whoami") assert "401 UNAUTHORIZED" in excinfo.value.args[0] @@ -621,8 +672,11 @@ class TestAPI(object): delete = self._activity_to_feed(test_app, activity)[1] # Verify the comment no longer exists - assert TextComment.query.filter_by(public_id=comment["object"]["id"]).first() is None - comment_id = comment["object"]["id"] + assert TextComment.query \ + .filter_by(public_id=comment["object"]["id"]) \ + .first() is None + + assert "id" in comment["object"] # Check we've got a delete activity back assert "id" in delete @@ -662,6 +716,8 @@ class TestAPI(object): comment = self._activity_to_feed(test_app, activity)[1] # Verify the comment reflects the changes - model = TextComment.query.filter_by(public_id=comment["object"]["id"]).first() + model = TextComment.query \ + .filter_by(public_id=comment["object"]["id"]) \ + .first() assert model.content == activity["object"]["content"] diff --git a/mediagoblin/tests/test_auth.py b/mediagoblin/tests/test_auth.py index cb971fdb..9cf5ccb0 100644 --- a/mediagoblin/tests/test_auth.py +++ b/mediagoblin/tests/test_auth.py @@ -1,4 +1,3 @@ - # GNU MediaGoblin -- federated, autonomous media hosting # Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. # @@ -102,7 +101,7 @@ def test_register_views(test_app): 'password': 'iamsohappy', 'email': 'easter@egg.com'}) - ## At this point there should on user in the database + ## At this point there should be one user in the database assert User.query.count() == 1 # Successful register @@ -373,6 +372,53 @@ def test_authentication_views(test_app): assert not form.username.data == u'ANDREW' assert form.username.data == u'andrew' + # Successful login with short user + # -------------------------------- + short_user = fixture_add_user(username=u'me', password=u'sho') + template.clear_test_template_context() + response = test_app.post( + '/auth/login/', { + 'username': u'me', + 'password': 'sho'}) + + # User should be redirected + response.follow() + + assert urlparse.urlsplit(response.location)[2] == '/' + assert 'mediagoblin/root.html' in template.TEMPLATE_TEST_CONTEXT + + # Make sure user is in the session + context = template.TEMPLATE_TEST_CONTEXT['mediagoblin/root.html'] + session = context['request'].session + assert session['user_id'] == six.text_type(short_user.id) + + # Must logout + template.clear_test_template_context() + response = test_app.get('/auth/logout/') + + # Successful login with long user + # ---------------- + long_user = fixture_add_user( + username=u'realllylonguser@reallylongdomain.com.co', password=u'sho') + template.clear_test_template_context() + response = test_app.post( + '/auth/login/', { + 'username': u'realllylonguser@reallylongdomain.com.co', + 'password': 'sho'}) + + # User should be redirected + response.follow() + assert urlparse.urlsplit(response.location)[2] == '/' + assert 'mediagoblin/root.html' in template.TEMPLATE_TEST_CONTEXT + + # Make sure user is in the session + context = template.TEMPLATE_TEST_CONTEXT['mediagoblin/root.html'] + session = context['request'].session + assert session['user_id'] == six.text_type(long_user.id) + + template.clear_test_template_context() + response = test_app.get('/auth/logout/') + @pytest.fixture() def authentication_disabled_app(request): return get_app( diff --git a/mediagoblin/tests/test_celery_setup.py b/mediagoblin/tests/test_celery_setup.py index df0d04b0..0749c7f4 100644 --- a/mediagoblin/tests/test_celery_setup.py +++ b/mediagoblin/tests/test_celery_setup.py @@ -55,7 +55,4 @@ def test_setup_celery_from_config(): 'sqlite:///' + pkg_resources.resource_filename('mediagoblin.tests', 'celery.db')) - assert fake_celery_module.BROKER_TRANSPORT == 'sqlalchemy' - assert fake_celery_module.BROKER_URL == ( - 'sqlite:///' + - pkg_resources.resource_filename('mediagoblin.tests', 'kombu.db')) + assert fake_celery_module.BROKER_URL == 'amqp://' diff --git a/mediagoblin/tests/test_config.py b/mediagoblin/tests/test_config.py index b13adae6..c3527418 100644 --- a/mediagoblin/tests/test_config.py +++ b/mediagoblin/tests/test_config.py @@ -1,3 +1,5 @@ +# -*- coding: utf-8 -*- +# # GNU MediaGoblin -- federated, autonomous media hosting # Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. # @@ -47,7 +49,7 @@ def test_read_mediagoblin_config(): assert this_conf['carrotapp']['num_carrots'] == 88 assert this_conf['carrotapp']['encouragement_phrase'] == \ "I'd love it if you eat your carrots!" - assert this_conf['carrotapp']['blah_blah'] == "blah!" + assert this_conf['carrotapp']['blah_blah'] == u"blæh!" assert this_conf['celery']['EAT_CELERY_WITH_CARROTS'] == False # A bad file diff --git a/mediagoblin/tests/test_exif.py b/mediagoblin/tests/test_exif.py index d0495a7a..ad771cca 100644 --- a/mediagoblin/tests/test_exif.py +++ b/mediagoblin/tests/test_exif.py @@ -24,7 +24,7 @@ from collections import OrderedDict from mediagoblin.tools.exif import exif_fix_image_orientation, \ extract_exif, clean_exif, get_gps_data, get_useful -from .resources import GOOD_JPG, EMPTY_JPG, BAD_JPG, GPS_JPG +from .resources import GOOD_JPG, EMPTY_JPG, BAD_JPG, GPS_JPG, BAD_GPS_JPG def assert_in(a, b): @@ -437,3 +437,18 @@ def test_exif_gps_data(): 'direction': 25.674046740467404, 'altitude': 37.64365671641791, 'longitude': 18.016166666666667} + + +def test_exif_bad_gps_data(): + ''' + Test extraction of GPS data from an image with bad GPS data + ''' + result = extract_exif(BAD_GPS_JPG) + gps = get_gps_data(result) + print(gps) + + assert gps == { + 'latitude': 0.0, + 'direction': 0.0, + 'altitude': 0.0, + 'longitude': 0.0} diff --git a/mediagoblin/tests/test_exif/bad-gps.jpg b/mediagoblin/tests/test_exif/bad-gps.jpg new file mode 100644 index 00000000..bd6c7bf2 Binary files /dev/null and b/mediagoblin/tests/test_exif/bad-gps.jpg differ diff --git a/mediagoblin/tests/test_tools.py b/mediagoblin/tests/test_tools.py index 6d3dd475..5f916400 100644 --- a/mediagoblin/tests/test_tools.py +++ b/mediagoblin/tests/test_tools.py @@ -16,10 +16,16 @@ from __future__ import absolute_import, unicode_literals +try: + import mock +except ImportError: + import unittest.mock as mock + from werkzeug.wrappers import Request from werkzeug.test import EnvironBuilder from mediagoblin.tools.request import decode_request +from mediagoblin.tools.pagination import Pagination class TestDecodeRequest(object): """Test the decode_request function.""" @@ -59,3 +65,54 @@ class TestDecodeRequest(object): request.form = {'foo': 'bar'} data = decode_request(request) assert data['foo'] == 'bar' + + +class TestPagination(object): + def _create_paginator(self, num_items, page, per_page): + """Create a Paginator with a mock database cursor.""" + mock_cursor = mock.MagicMock() + mock_cursor.count.return_value = num_items + return Pagination(page, mock_cursor, per_page) + + def test_creates_valid_page_url_from_explicit_base_url(self): + """Check that test_page_url_explicit runs. + + This is a regression test for a Python 2/3 compatibility fix. + + """ + paginator = self._create_paginator(num_items=1, page=1, per_page=30) + url = paginator.get_page_url_explicit('http://example.com', [], 1) + assert url == 'http://example.com?page=1' + + def test_iter_pages_handles_single_page(self): + """Check that iter_pages produces the expected result for single page. + + This is a regression test for a Python 2/3 compatibility fix. + + """ + paginator = self._create_paginator(num_items=1, page=1, per_page=30) + assert list(paginator.iter_pages()) == [1] + + def test_zero_items(self): + """Check that no items produces no pages.""" + paginator = self._create_paginator(num_items=0, page=1, per_page=30) + assert paginator.total_count == 0 + assert paginator.pages == 0 + + def test_single_item(self): + """Check that one item produces one page.""" + paginator = self._create_paginator(num_items=1, page=1, per_page=30) + assert paginator.total_count == 1 + assert paginator.pages == 1 + + def test_full_page(self): + """Check that a full page of items produces one page.""" + paginator = self._create_paginator(num_items=30, page=1, per_page=30) + assert paginator.total_count == 30 + assert paginator.pages == 1 + + def test_multiple_pages(self): + """Check that more than a full page produces two pages.""" + paginator = self._create_paginator(num_items=31, page=1, per_page=30) + assert paginator.total_count == 31 + assert paginator.pages == 2 diff --git a/mediagoblin/tests/test_util.py b/mediagoblin/tests/test_util.py index 8193233f..02976405 100644 --- a/mediagoblin/tests/test_util.py +++ b/mediagoblin/tests/test_util.py @@ -19,6 +19,7 @@ try: except ImportError: import unittest.mock as mock import email +import socket import pytest import smtplib import pkg_resources @@ -26,6 +27,7 @@ import pkg_resources import six from mediagoblin.tests.tools import get_app +from mediagoblin import mg_globals from mediagoblin.tools import common, url, translate, mail, text, testing testing._activate_testing() @@ -181,3 +183,30 @@ def test_html_cleaner(): '

    innocent link!

    ') assert result == ( '

    innocent link!

    ') + + +class TestMail(object): + """ Test mediagoblin's mail tool """ + def test_no_mail_server(self): + """ Tests that no smtp server is available """ + with pytest.raises(mail.NoSMTPServerError), mock.patch("smtplib.SMTP") as smtp_mock: + smtp_mock.side_effect = socket.error + mg_globals.app_config = { + "email_debug_mode": False, + "email_smtp_use_ssl": False, + "email_smtp_host": "127.0.0.1", + "email_smtp_port": 0} + common.TESTS_ENABLED = False + mail.send_email("", "", "", "") + + def test_no_smtp_host(self): + """ Empty email_smtp_host """ + with pytest.raises(mail.NoSMTPServerError), mock.patch("smtplib.SMTP") as smtp_mock: + smtp_mock.return_value.connect.side_effect = socket.error + mg_globals.app_config = { + "email_debug_mode": False, + "email_smtp_use_ssl": False, + "email_smtp_host": "", + "email_smtp_port": 0} + common.TESTS_ENABLED = False + mail.send_email("", "", "", "") diff --git a/mediagoblin/tests/tools.py b/mediagoblin/tests/tools.py index 39b9ac50..82def02c 100644 --- a/mediagoblin/tests/tools.py +++ b/mediagoblin/tests/tools.py @@ -153,28 +153,6 @@ def install_fixtures_simple(db, fixtures): collection.insert(fixture) -def assert_db_meets_expected(db, expected): - """ - Assert a database contains the things we expect it to. - - Objects are found via 'id', so you should make sure your document - has an id. - - Args: - - db: pymongo or mongokit database connection - - expected: the data we expect. Formatted like: - {'collection_name': [ - {'id': 'foo', - 'some_field': 'some_value'},]} - """ - for collection_name, collection_data in six.iteritems(expected): - collection = db[collection_name] - for expected_document in collection_data: - document = collection.query.filter_by(id=expected_document['id']).first() - assert document is not None # make sure it exists - assert document == expected_document # make sure it matches - - def fixture_add_user(username=u'chris', password=u'toast', privileges=[], wants_comment_notification=True): # Reuse existing user or create a new one diff --git a/mediagoblin/themes/airy/assets/css/airy.css b/mediagoblin/themes/airy/assets/css/airy.css index 7539997e..047e02dc 100644 --- a/mediagoblin/themes/airy/assets/css/airy.css +++ b/mediagoblin/themes/airy/assets/css/airy.css @@ -52,6 +52,10 @@ footer { border-top: 1px solid #E4E4E4; } +table.admin_panel th { + color: #4a4a4a; +} + .button_action, .button_action_highlight, .button_form { color: #4a4a4a; background-color: #fff; diff --git a/mediagoblin/tools/exif.py b/mediagoblin/tools/exif.py index fafd987d..2215fb0c 100644 --- a/mediagoblin/tools/exif.py +++ b/mediagoblin/tools/exif.py @@ -19,6 +19,11 @@ import six from exifread import process_file from exifread.utils import Ratio +try: + from PIL import Image +except ImportError: + import Image + from mediagoblin.processing import BadMediaFail from mediagoblin.tools.translate import pass_to_ugettext as _ @@ -61,12 +66,12 @@ def exif_fix_image_orientation(im, exif_tags): # Rotate image if 'Image Orientation' in exif_tags: rotation_map = { - 3: 180, - 6: 270, - 8: 90} + 3: Image.ROTATE_180, + 6: Image.ROTATE_270, + 8: Image.ROTATE_90} orientation = exif_tags['Image Orientation'].values[0] if orientation in rotation_map: - im = im.rotate( + im = im.transpose( rotation_map[orientation]) return im @@ -175,18 +180,14 @@ def get_gps_data(tags): pass try: - gps_data['direction'] = ( - lambda d: - float(d.num) / float(d.den) - )(tags['GPS GPSImgDirection'].values[0]) + direction = tags['GPS GPSImgDirection'].values[0] + gps_data['direction'] = safe_gps_ratio_divide(direction) except KeyError: pass try: - gps_data['altitude'] = ( - lambda a: - float(a.num) / float(a.den) - )(tags['GPS GPSAltitude'].values[0]) + altitude = tags['GPS GPSAltitude'].values[0] + gps_data['altitude'] = safe_gps_ratio_divide(altitude) except KeyError: pass diff --git a/mediagoblin/tools/licenses.py b/mediagoblin/tools/licenses.py index a964980e..2aff7f20 100644 --- a/mediagoblin/tools/licenses.py +++ b/mediagoblin/tools/licenses.py @@ -20,28 +20,45 @@ License = namedtuple("License", ["abbreviation", "name", "uri"]) SORTED_LICENSES = [ License("All rights reserved", "No license specified", ""), + License("CC BY 4.0", "Creative Commons Attribution 4.0 International", + "https://creativecommons.org/licenses/by/4.0/"), + License("CC BY-SA 4.0", + "Creative Commons Attribution-ShareAlike 4.0 International", + "https://creativecommons.org/licenses/by-sa/4.0/"), + License("CC BY-ND 4.0", + "Creative Commons Attribution-NoDerivs 4.0 International", + "https://creativecommons.org/licenses/by-nd/4.0/"), + License("CC BY-NC 4.0", + "Creative Commons Attribution-NonCommercial 4.0 International", + "https://creativecommons.org/licenses/by-nc/4.0/"), + License("CC BY-NC-SA 4.0", + "Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International", + "https://creativecommons.org/licenses/by-nc-sa/4.0/"), + License("CC BY-NC-ND 4.0", + "Creative Commons Attribution-NonCommercial-NoDerivs 4.0 International", + "https://creativecommons.org/licenses/by-nc-nd/4.0/"), License("CC BY 3.0", "Creative Commons Attribution Unported 3.0", - "http://creativecommons.org/licenses/by/3.0/"), + "https://creativecommons.org/licenses/by/3.0/"), License("CC BY-SA 3.0", - "Creative Commons Attribution-ShareAlike Unported 3.0", - "http://creativecommons.org/licenses/by-sa/3.0/"), + "Creative Commons Attribution-ShareAlike 3.0 Unported", + "https://creativecommons.org/licenses/by-sa/3.0/"), License("CC BY-ND 3.0", "Creative Commons Attribution-NoDerivs 3.0 Unported", - "http://creativecommons.org/licenses/by-nd/3.0/"), + "https://creativecommons.org/licenses/by-nd/3.0/"), License("CC BY-NC 3.0", - "Creative Commons Attribution-NonCommercial Unported 3.0", - "http://creativecommons.org/licenses/by-nc/3.0/"), + "Creative Commons Attribution-NonCommercial 3.0 Unported", + "https://creativecommons.org/licenses/by-nc/3.0/"), License("CC BY-NC-SA 3.0", "Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported", - "http://creativecommons.org/licenses/by-nc-sa/3.0/"), + "https://creativecommons.org/licenses/by-nc-sa/3.0/"), License("CC BY-NC-ND 3.0", "Creative Commons Attribution-NonCommercial-NoDerivs 3.0 Unported", - "http://creativecommons.org/licenses/by-nc-nd/3.0/"), + "https://creativecommons.org/licenses/by-nc-nd/3.0/"), License("CC0 1.0", "Creative Commons CC0 1.0 Universal", - "http://creativecommons.org/publicdomain/zero/1.0/"), + "https://creativecommons.org/publicdomain/zero/1.0/"), License("Public Domain","Public Domain", - "http://creativecommons.org/publicdomain/mark/1.0/"), + "https://creativecommons.org/publicdomain/mark/1.0/"), ] # dict {uri: License,...} to enable fast license lookup by uri. Ideally, diff --git a/mediagoblin/tools/mail.py b/mediagoblin/tools/mail.py index c11e392b..3dc180d8 100644 --- a/mediagoblin/tools/mail.py +++ b/mediagoblin/tools/mail.py @@ -16,6 +16,8 @@ from __future__ import print_function, unicode_literals +import socket +import logging import six import smtplib import sys @@ -54,6 +56,14 @@ EMAIL_TEST_INBOX = [] EMAIL_TEST_MBOX_INBOX = [] +class MailError(Exception): + """ General exception for mail errors """ + + +class NoSMTPServerError(MailError): + pass + + class FakeMhost(object): """ Just a fake mail host so we can capture and test messages @@ -101,13 +111,27 @@ def send_email(from_addr, to_addrs, subject, message_body): else: smtp_init = smtplib.SMTP - mhost = smtp_init( - mg_globals.app_config['email_smtp_host'], - mg_globals.app_config['email_smtp_port']) + try: + mhost = smtp_init( + mg_globals.app_config['email_smtp_host'], + mg_globals.app_config['email_smtp_port']) + except socket.error as original_error: + error_message = "Couldn't contact mail server on <{}>:<{}>".format( + mg_globals.app_config['email_smtp_host'], + mg_globals.app_config['email_smtp_port']) + logging.debug(original_error) + raise NoSMTPServerError(error_message) # SMTP.__init__ Issues SMTP.connect implicitly if host if not mg_globals.app_config['email_smtp_host']: # e.g. host = '' - mhost.connect() # We SMTP.connect explicitly + try: + mhost.connect() # We SMTP.connect explicitly + except socket.error as original_error: + error_message = "Couldn't contact mail server on <{}>:<{}>".format( + mg_globals.app_config['email_smtp_host'], + mg_globals.app_config['email_smtp_port']) + logging.debug(original_error) + raise NoSMTPServerError(error_message) try: mhost.starttls() diff --git a/mediagoblin/tools/pagination.py b/mediagoblin/tools/pagination.py index a525caf7..db5f69fb 100644 --- a/mediagoblin/tools/pagination.py +++ b/mediagoblin/tools/pagination.py @@ -14,13 +14,12 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -import urllib import copy from math import ceil, floor from itertools import count from werkzeug.datastructures import MultiDict -from six.moves import zip +from six.moves import range, urllib, zip PAGINATION_DEFAULT_PER_PAGE = 30 @@ -86,7 +85,7 @@ class Pagination(object): def iter_pages(self, left_edge=2, left_current=2, right_current=5, right_edge=2): last = 0 - for num in xrange(1, self.pages + 1): + for num in range(1, self.pages + 1): if num <= left_edge or \ (num > self.page - left_current - 1 and \ num < self.page + right_current) or \ @@ -107,7 +106,7 @@ class Pagination(object): new_get_params['page'] = page_no return "%s?%s" % ( - base_url, urllib.urlencode(new_get_params)) + base_url, urllib.parse.urlencode(new_get_params)) def get_page_url(self, request, page_no): """ diff --git a/mediagoblin/tools/theme.py b/mediagoblin/tools/theme.py index 97b041a6..79fd91e1 100644 --- a/mediagoblin/tools/theme.py +++ b/mediagoblin/tools/theme.py @@ -68,7 +68,7 @@ def register_themes(app_config, builtin_dir=BUILTIN_THEME_DIR): themedata = themedata_for_theme_dir(themedir, abs_themedir) registry[themedir] = themedata - + # Built-in themes if os.path.exists(builtin_dir): _install_themes_in_dir(builtin_dir) @@ -79,11 +79,9 @@ def register_themes(app_config, builtin_dir=BUILTIN_THEME_DIR): _install_themes_in_dir(theme_install_dir) current_theme_name = app_config.get('theme') - if current_theme_name \ - and registry.has_key(current_theme_name): + try: current_theme = registry[current_theme_name] - else: + except KeyError: current_theme = None return registry, current_theme - diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py index 28d3ba79..b4737ea8 100644 --- a/mediagoblin/user_pages/views.py +++ b/mediagoblin/user_pages/views.py @@ -24,6 +24,7 @@ from mediagoblin import messages, mg_globals from mediagoblin.db.models import (MediaEntry, MediaTag, Collection, Comment, CollectionItem, LocalUser, Activity, \ GenericModelReference) +from mediagoblin.plugins.api.tools import get_media_file_paths from mediagoblin.tools.response import render_to_response, render_404, \ redirect, redirect_obj from mediagoblin.tools.text import cleaned_markdown_conversion @@ -179,6 +180,10 @@ def media_post_comment(request, media): if not request.method == 'POST': raise MethodNotAllowed() + # If media is not processed, return NotFound. + if not media.state == u'processed': + return render_404(request) + comment = request.db.TextComment() comment.actor = request.user.id comment.content = six.text_type(request.form['comment_content']) @@ -231,6 +236,10 @@ def media_preview_comment(request): def media_collect(request, media): """Add media to collection submission""" + # If media is not processed, return NotFound. + if not media.state == u'processed': + return render_404(request) + form = user_forms.MediaCollectForm(request.form) # A user's own collections: form.collection.query = Collection.query.filter_by( @@ -288,12 +297,6 @@ def media_collect(request, media): collection = None # Make sure the user actually selected a collection - item = CollectionItem.query.filter_by(collection=collection.id) - item = item.join(CollectionItem.object_helper).filter_by( - model_type=media.__tablename__, - obj_pk=media.id - ).first() - if not collection: messages.add_message( request, @@ -303,8 +306,14 @@ def media_collect(request, media): user=media.get_actor.username, media_id=media.id) + item = CollectionItem.query.filter_by(collection=collection.id) + item = item.join(CollectionItem.object_helper).filter_by( + model_type=media.__tablename__, + obj_pk=media.id + ).first() + # Check whether media already exists in collection - elif item is not None: + if item is not None: messages.add_message( request, messages.ERROR, @@ -538,23 +547,21 @@ def atom_feed(request): username = request.matchdict['user']).first() if not user or not user.has_privilege(u'active'): return render_404(request) + feed_title = "MediaGoblin Feed for user '%s'" % request.matchdict['user'] + link = request.urlgen('mediagoblin.user_pages.user_home', + qualified=True, user=request.matchdict['user']) + cursor = MediaEntry.query.filter_by(actor=user.id, state=u'processed') + cursor = cursor.order_by(MediaEntry.created.desc()) + cursor = cursor.limit(ATOM_DEFAULT_NR_OF_UPDATED_ITEMS) - cursor = MediaEntry.query.filter_by( - actor = user.id, - state = u'processed').\ - order_by(MediaEntry.created.desc()).\ - limit(ATOM_DEFAULT_NR_OF_UPDATED_ITEMS) """ ATOM feed id is a tag URI (see http://en.wikipedia.org/wiki/Tag_URI) """ atomlinks = [{ - 'href': request.urlgen( - 'mediagoblin.user_pages.user_home', - qualified=True, user=request.matchdict['user']), - 'rel': 'alternate', - 'type': 'text/html' - }] + 'href': link, + 'rel': 'alternate', + 'type': 'text/html'}] if mg_globals.app_config["push_urls"]: for push_url in mg_globals.app_config["push_urls"]: @@ -563,25 +570,34 @@ def atom_feed(request): 'href': push_url}) feed = AtomFeed( - "MediaGoblin: Feed for user '%s'" % request.matchdict['user'], - feed_url=request.url, - id='tag:{host},{year}:gallery.user-{user}'.format( - host=request.host, - year=datetime.datetime.today().strftime('%Y'), - user=request.matchdict['user']), - links=atomlinks) + feed_title, + feed_url=request.url, + id='tag:{host},{year}:gallery.user-{user}'.format( + host=request.host, + year=datetime.datetime.today().strftime('%Y'), + user=request.matchdict['user']), + links=atomlinks) for entry in cursor: + # Include a thumbnail image in content. + file_urls = get_media_file_paths(entry.media_files, request.urlgen) + if 'thumb' in file_urls: + content = u' {desc}'.format( + thumb=file_urls['thumb'], desc=entry.description_html) + else: + content = entry.description_html + feed.add( entry.get('title'), - entry.description_html, + content, id=entry.url_for_self(request.urlgen, qualified=True), content_type='html', author={ 'name': entry.get_actor.username, 'uri': request.urlgen( 'mediagoblin.user_pages.user_home', - qualified=True, user=entry.get_actor.username)}, + qualified=True, + user=entry.get_actor.username)}, updated=entry.get('created'), links=[{ 'href': entry.url_for_self( diff --git a/setup.py b/setup.py index 0c2fe731..72c19735 100644 --- a/setup.py +++ b/setup.py @@ -57,7 +57,6 @@ install_requires = [ 'pytest-xdist', 'werkzeug>=0.7', 'celery>=3.0', - 'kombu', 'jinja2', 'Babel>=1.3', 'WebTest>=2.0.18', @@ -75,6 +74,7 @@ install_requires = [ 'PasteScript', 'requests>=2.6.0', 'pyld', + 'ExifRead>=2.0.0' # This is optional: # 'translitcodec', # For now we're expecting that users will install this from @@ -83,10 +83,8 @@ install_requires = [ # 'Pillow', ] + pyversion_install_requires -dependency_links = [] if not PY2: # PyPI version (1.4.2) does not have proper Python 3 support - dependency_links.append('https://github.com/ianare/exif-py/zipball/develop#egg=ExifRead-2.0.0') install_requires.append('ExifRead>=2.0.0') with open(READMEFILE, encoding="utf-8") as fobj: @@ -101,7 +99,6 @@ try: include_package_data = True, # scripts and dependencies install_requires=install_requires, - dependency_links=dependency_links, test_suite='nose.collector', entry_points="""\ [console_scripts] diff --git a/tox.ini b/tox.ini index 023c53ed..3c57e802 100644 --- a/tox.ini +++ b/tox.ini @@ -7,7 +7,7 @@ sitepackages = False usedevelop = True # for ExifRead 2.0.0 install_command = pip install --process-dependency-links --pre {opts} {packages} -commands = py.test ./mediagoblin/tests --boxed +commands = py.test ./mediagoblin/tests --boxed -k '{posargs}' deps = lxml Pillow
    {% trans %}Thumbnail{% endtrans %} {% trans %}ID{% endtrans %} {% trans %}User{% endtrans %} {% trans %}Title{% endtrans %}