changed number of items on front page

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

diff --git a/mediagoblin_libreplanet/__init__.py b/mediagoblin_libreplanet/__init__.py
index 0f1cbbbb4fbc1ac3e86502279d2e79c6fe9e62fb..2533be4793e37203d0f41be484a6a81a53787dbf 100644 (file)
--- a/mediagoblin_libreplanet/__init__.py
+++ b/mediagoblin_libreplanet/__init__.py
@@ -21,7 +21,6 @@ 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 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
@@ -36,12 +35,18 @@ SUPPORTED_LICENSES[cc_by_sa_4.uri] = cc_by_sa_4
 
 PLUGIN_DIR = os.path.dirname(__file__)
 
-MAX_HOME_ITEMS = 20
+MAX_HOME_ITEMS_DEFAULT = 10
+
+MAX_HOME_ALL_VIDEO_ITEMS = 10
+MAX_HOME_ALL_PHOTO_ITEMS = 20
 MAX_HOME_FEATURED_ITEMS = 10
 MAX_HOME_LP_ITEMS = 10
 
+# make tags lowercase and use dashes in place of spaces.
+# uppercase tags will be included by the lowercase form.
 FEATURED_TAG = "featured"
-LATEST_LP_VIDEO_TAG = "LibrePlanet 2016 video"
+LATEST_LP_VIDEO_TAG = "libreplanet-2016-video"
+
 
 _log = logging.getLogger(__name__)
 
@@ -53,12 +58,10 @@ def setup_plugin():
     # Register the template path.
     register_template_path(os.path.join(PLUGIN_DIR, 'templates'))
 
-def lp_media_for_type(db, type, tag=None, max_items=MAX_HOME_ITEMS):
+def lp_media_for_type(db, type, tag=None, max_items=MAX_HOME_ITEMS_DEFAULT):
     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.\
@@ -69,10 +72,10 @@ def lp_media_for_type(db, type, tag=None, max_items=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', None, MAX_HOME_ALL_PHOTO_ITEMS)
+    videos          = lp_media_for_type(request.db, u'mediagoblin.media_types.video', None, MAX_HOME_ALL_VIDEO_ITEMS)
 
-    lp2016_videos = lp_media_for_type(request.db, u'mediagoblin.media_types.video', LATEST_LP_VIDEO_TAG, MAX_HOME_LP_ITEMS)
+    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)
@@ -81,6 +84,7 @@ def frontpage_view(request):
         request, 'libreplanet/root.html',
         {'images': images,
          'videos': videos,
+         'lp2016_videos': lp2016_videos,
          'featured_images': featured_images,
          'featured_videos': featured_videos,
          'allow_registration': mg_globals.app_config["allow_registration"]})