X-Git-Url: https://vcs.fsf.org/?p=mediagoblin-libreplanet.git;a=blobdiff_plain;f=mediagoblin_libreplanet%2F__init__.py;h=775022187eff72cff0f9ac0807484d6812bd5701;hp=e27ba7e6394bf5211e5eb02359cf521c77faea3c;hb=2fba596706ef19bc46b1394e0abfd98eabb0ebc6;hpb=724f8731f74d347cca930c43ba2e72ffb8b680b4

diff --git a/mediagoblin_libreplanet/__init__.py b/mediagoblin_libreplanet/__init__.py
index e27ba7e..7750221 100644
--- a/mediagoblin_libreplanet/__init__.py
+++ b/mediagoblin_libreplanet/__init__.py
@@ -23,11 +23,18 @@ from mediagoblin.db.models import MediaEntry
 from mediagoblin.db.util import media_entries_for_tag_slug
 from mediagoblin.tools.pagination import Pagination
 from mediagoblin.tools.response import render_to_response
+from mediagoblin.tools.licenses import SORTED_LICENSES, SUPPORTED_LICENSES, License
 from mediagoblin.decorators import uses_pagination, user_not_banned
 
+# Add CC BY-SA 4.0 to licenses
+cc_by_sa_4 = License("CC BY-SA 4.0",
+                     "Creative Commons Attribution-ShareAlike 4.0 International",
+                     "https://creativecommons.org/licenses/by-sa/4.0/")
+SORTED_LICENSES.insert(1, cc_by_sa_4)
+SUPPORTED_LICENSES[cc_by_sa_4.uri] = cc_by_sa_4
+
 PLUGIN_DIR = os.path.dirname(__file__)
 MAX_HOME_ITEMS = 20
-LP_TAG = 'libreplanet2014'
 
 _log = logging.getLogger(__name__)
 
@@ -39,9 +46,15 @@ def setup_plugin():
     # Register the template path.
     register_template_path(os.path.join(PLUGIN_DIR, 'templates'))
 
-def lp_media_for_type(db, type):
-    return media_entries_for_tag_slug(db, 'libreplanet2015').\
-        filter(MediaEntry.media_type == type).\
+def lp_media_for_type(db, type, tag=None):
+    if (tag == None):
+        cursor = MediaEntry.query
+    else:
+        cursor = media_entries_for_tag_slug(db, tag)
+
+    return cursor.\
+        filter((MediaEntry.media_type == type)
+               & (MediaEntry.state == u'processed')).\
         order_by(MediaEntry.created.desc()).\
         limit(MAX_HOME_ITEMS)
 
@@ -60,9 +73,9 @@ def frontpage_view_hook():
     return frontpage_view
 
 register_routes([('all-videos', '/videos',
-                  'mediagoblin_libreplanet.views:video_listing'),
+                  'mediagoblin.plugins.libreplanet.views:video_listing'),
                  ('all-photos', '/photos',
-                  'mediagoblin_libreplanet.views:image_listing')
+                  'mediagoblin.plugins.libreplanet.views:image_listing')
              ])
 
 # This is a dict that specifies which hooks this plugin uses.