added LP 2016 videos to the front page

[mediagoblin-libreplanet.git] / mediagoblin_libreplanet / __init__.py

diff --git a/mediagoblin_libreplanet/__init__.py b/mediagoblin_libreplanet/__init__.py
index 09ded6cbd31a5ef9c05a1f3fa7b3aed5aa9a48ce..0f1cbbbb4fbc1ac3e86502279d2e79c6fe9e62fb 100644 (file)
--- a/mediagoblin_libreplanet/__init__.py
+++ b/mediagoblin_libreplanet/__init__.py
@@ -21,6 +21,7 @@ from mediagoblin import mg_globals
 from mediagoblin.tools.pluginapi import get_config, register_template_path, register_routes
 from mediagoblin.db.models import MediaEntry
 from mediagoblin.db.util import media_entries_for_tag_slug
 from mediagoblin.tools.pluginapi import get_config, register_template_path, register_routes
 from mediagoblin.db.models import MediaEntry
 from mediagoblin.db.util import media_entries_for_tag_slug

+from lp_helper import media_entries_for_tag_slug_case_insensitive

 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.tools.pagination import Pagination
 from mediagoblin.tools.response import render_to_response
 from mediagoblin.tools.licenses import SORTED_LICENSES, SUPPORTED_LICENSES, License


@@ -34,7 +35,13 @@ 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__)
 SUPPORTED_LICENSES[cc_by_sa_4.uri] = cc_by_sa_4
 
 PLUGIN_DIR = os.path.dirname(__file__)

+

 MAX_HOME_ITEMS = 20
 MAX_HOME_ITEMS = 20

+MAX_HOME_FEATURED_ITEMS = 10
+MAX_HOME_LP_ITEMS = 10
+
+FEATURED_TAG = "featured"
+LATEST_LP_VIDEO_TAG = "LibrePlanet 2016 video"

 
 _log = logging.getLogger(__name__)
 
 
 _log = logging.getLogger(__name__)
 


@@ -46,27 +53,36 @@ def setup_plugin():
     # Register the template path.
     register_template_path(os.path.join(PLUGIN_DIR, 'templates'))
 
     # Register the template path.
     register_template_path(os.path.join(PLUGIN_DIR, 'templates'))
 

-def lp_media_for_type(db, type, tag=None):
+def lp_media_for_type(db, type, tag=None, max_items=MAX_HOME_ITEMS):

     if (tag == None):
         cursor = MediaEntry.query
     else:
     if (tag == None):
         cursor = MediaEntry.query
     else:

+        ## case insensitive tag search is not working yet -- sudoman
+        #cursor = media_entries_for_tag_slug_case_insensitive(db, tag)

         cursor = media_entries_for_tag_slug(db, tag)
 
     return cursor.\
         filter((MediaEntry.media_type == type)
                & (MediaEntry.state == u'processed')).\
         order_by(MediaEntry.created.desc()).\
         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)
+        limit(max_items)

 
 @user_not_banned
 def frontpage_view(request):
 
 @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')
+
+    lp2016_videos = lp_media_for_type(request.db, u'mediagoblin.media_types.video', LATEST_LP_VIDEO_TAG, MAX_HOME_LP_ITEMS)
+
+    featured_images = lp_media_for_type(request.db, u'mediagoblin.media_types.image', FEATURED_TAG, MAX_HOME_FEATURED_ITEMS)
+    featured_videos = lp_media_for_type(request.db, u'mediagoblin.media_types.video', FEATURED_TAG, MAX_HOME_FEATURED_ITEMS)

 
     return render_to_response(
         request, 'libreplanet/root.html',
         {'images': images,
          'videos': videos,
 
     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():
          'allow_registration': mg_globals.app_config["allow_registration"]})
 
 def frontpage_view_hook():


@@ -76,9 +92,10 @@ register_routes([('all-videos', '/videos',
                   'mediagoblin.plugins.libreplanet.views:video_listing'),
                  ('all-photos', '/photos',
                   'mediagoblin.plugins.libreplanet.views:image_listing'),
                   'mediagoblin.plugins.libreplanet.views:video_listing'),
                  ('all-photos', '/photos',
                   'mediagoblin.plugins.libreplanet.views:image_listing'),

-                 ('all-photos', '/videos/featured',
+
+                 ('featured-videos', '/videos/featured',

                   'mediagoblin.plugins.libreplanet.views:featured_video_listing'),
                   'mediagoblin.plugins.libreplanet.views:featured_video_listing'),

-                 ('all-photos', '/photos/featured',
+                 ('featured-photos', '/photos/featured',

                   'mediagoblin.plugins.libreplanet.views:featured_image_listing')
              ])
 
                   'mediagoblin.plugins.libreplanet.views:featured_image_listing')
              ])