by default do not filter items based on tags

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

diff --git a/mediagoblin_libreplanet/__init__.py b/mediagoblin_libreplanet/__init__.py
index b4eb7ce8e53ed1e7001fe24044b0b96a369b7f2b..775022187eff72cff0f9ac0807484d6812bd5701 100644 (file)
--- a/mediagoblin_libreplanet/__init__.py
+++ b/mediagoblin_libreplanet/__init__.py
@@ -35,7 +35,6 @@ SUPPORTED_LICENSES[cc_by_sa_4.uri] = cc_by_sa_4
 
 PLUGIN_DIR = os.path.dirname(__file__)
 MAX_HOME_ITEMS = 20
-LP_TAG = 'lp2015'
 
 _log = logging.getLogger(__name__)
 
@@ -47,8 +46,13 @@ 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):
+    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()).\
@@ -69,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.