X-Git-Url: https://vcs.fsf.org/?p=mediagoblin-libreplanet.git;a=blobdiff_plain;f=mediagoblin_libreplanet%2F__init__.py;h=d363dcdd067576f4d5f7cb66c7fa79d016846874;hp=fa9c112282d1de9102f31d773ae8acf360587aa1;hb=bfedf48a07dee4191c2761803d811001d6a5c4ec;hpb=7f8847829a190d78683f98ed4f3073f67a7542be diff --git a/mediagoblin_libreplanet/__init__.py b/mediagoblin_libreplanet/__init__.py index fa9c112..d363dcd 100644 --- 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 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 @@ -34,8 +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__) + MAX_HOME_ITEMS = 20 -LP_TAG = 'lp2015' +MAX_HOME_FEATURED_ITEMS = 10 +MAX_HOME_LP_ITEMS = 10 + +FEATURED_TAG = "featured" +LATEST_LP_VIDEO_TAG = "LibrePlanet 2016 video" _log = logging.getLogger(__name__) @@ -47,22 +53,37 @@ 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).\ +def lp_media_for_type(db, type, tag=None, max_items=MAX_HOME_ITEMS): + 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()).\ - limit(MAX_HOME_ITEMS) + limit(max_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') + + 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, + 'lp2016_videos': lp2016_videos, + 'featured_images': featured_images, + 'featured_videos': featured_videos, 'allow_registration': mg_globals.app_config["allow_registration"]}) def frontpage_view_hook(): @@ -71,7 +92,12 @@ def frontpage_view_hook(): register_routes([('all-videos', '/videos', 'mediagoblin.plugins.libreplanet.views:video_listing'), ('all-photos', '/photos', - 'mediagoblin.plugins.libreplanet.views:image_listing') + 'mediagoblin.plugins.libreplanet.views:image_listing'), + + ('featured-videos', '/videos/featured', + 'mediagoblin.plugins.libreplanet.views:featured_video_listing'), + ('featured-photos', '/photos/featured', + 'mediagoblin.plugins.libreplanet.views:featured_image_listing') ]) # This is a dict that specifies which hooks this plugin uses.