X-Git-Url: https://vcs.fsf.org/?p=mediagoblin-libreplanet.git;a=blobdiff_plain;f=mediagoblin_libreplanet%2F__init__.py;h=9caf1c208f3034c65069791e9b08676b11863647;hp=6ae6c4a68dd30f4ea67f9543f5698839a6d25fa3;hb=267126234a1ba0db921314ffa9173579f51ab7ba;hpb=e3e1899c61de7f6b347642428a7ccdfb3ee050e6

diff --git a/mediagoblin_libreplanet/__init__.py b/mediagoblin_libreplanet/__init__.py
index 6ae6c4a..9caf1c2 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 = 'libreplanet2015'
 
 _log = logging.getLogger(__name__)
 
@@ -39,30 +46,44 @@ 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, LP_TAG).\
-        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)
 
 @user_not_banned
 def frontpage_view(request):
-    images = lp_media_for_type(request.db, u'mediagoblin.media_types.image')
-    videos = lp_media_for_type(request.db, u'mediagoblin.media_types.video')
+    images          = lp_media_for_type(request.db, u'mediagoblin.media_types.image')
+    videos          = lp_media_for_type(request.db, u'mediagoblin.media_types.video')
+    featured_images = lp_media_for_type(request.db, u'mediagoblin.media_types.image', "featured")
+    featured_videos = lp_media_for_type(request.db, u'mediagoblin.media_types.video', "featured")
 
     return render_to_response(
         request, 'libreplanet/root.html',
         {'images': images,
          'videos': videos,
+         'featured_images': featured_images,
+         'featured_videos': featured_videos,
          'allow_registration': mg_globals.app_config["allow_registration"]})
 
 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'),
+                 ('all-photos', '/videos/featured',
+                  'mediagoblin.plugins.libreplanet.views:featured_video_listing'),
+                 ('all-photos', '/photos/featured',
+                  'mediagoblin.plugins.libreplanet.views:featured_image_listing')
              ])
 
 # This is a dict that specifies which hooks this plugin uses.