Managers: move FilterParsers into base classes

lib/galaxy/managers/base.py

@@ -807,7 +807,13 @@ class FilterParser( object ):
         """
         Set up, extend, or alter `orm_filter_parsers` and `fn_filter_parsers`.
         """
-        pass
+        self.orm_filter_parsers.update({
+            # (prob.) applicable to all models
+            'id'            : { 'op': ( 'in' ), 'val': self.parse_id_list },
+            # dates can be directly passed through the orm into a filter (no need to parse into datetime object)
+            'create_time'   : { 'op': ( 'le', 'ge' ) },
+            'update_time'   : { 'op': ( 'le', 'ge' ) },
+        })
         
     def parse_filters( self, filter_tuple_list ):
         """
@@ -899,6 +905,8 @@ class FilterParser( object ):
     #UNCHANGED_OPS = ( 'like' )
     def _convert_op_string_to_fn( self, column, op_string ):
         """
+        Convert the query string filter op shorthand into actual ORM usable
+        function names, then return the ORM function.
         """
         # correct op_string to usable function key
         fn_name = op_string
@@ -971,7 +979,7 @@ class FilterParser( object ):
         """
         Parse a boolean from a string.
         """
-        #Be strict here to remove complexity of options.
+        # Be strict here to remove complexity of options (but allow already parsed).
         if bool_string in ( 'True', True ):
             return True
         if bool_string in ( 'False', False ):
@@ -982,7 +990,9 @@ class FilterParser( object ):
         """
         Split `id_list_string` at `sep`.
         """
-        return id_list_string.split( sep )
+        #TODO: move id decoding out
+        id_list = [ self.app.security.decode_id( id_ ) for id_ in id_list_string.split( sep ) ]
+        return id_list
 
 
 # ==== Security Mixins
@@ -1158,6 +1168,14 @@ class DeletableModelDeserializer( object ):
         return item.deleted
 
 
+class DeletableModelFilters( object ):
+
+    def _add_parsers( self ):
+        self.orm_filter_parsers.update({
+            'deleted'       : { 'op': ( 'eq' ), 'val': self.parse_bool }
+        })
+
+
 class PurgableModelInterface( DeletableModelInterface ):
     """
     A manager interface/mixin for a resource that allows deleting and purging where
@@ -1200,3 +1218,12 @@ class PurgableModelDeserializer( DeletableModelDeserializer ):
         if new_purged:
             self.manager.purge( trans, item, flush=False )
         return self.purged
+
+
+class PurgableModelFilters( DeletableModelFilters ):
+
+    def _add_parsers( self ):
+        DeletableModelFilters._add_parsers( self )
+        self.orm_filter_parsers.update({
+            'purged'        : { 'op': ( 'eq' ), 'val': self.parse_bool }
+        })

lib/galaxy/managers/histories.py

@@ -353,32 +353,17 @@ class HistoryDeserializer( sharable.SharableModelDeserializer, base.PurgableMode
         })
 
 
-class HistoryFilters( base.FilterParser ):
+class HistoryFilters( sharable.SharableModelFilters, base.PurgableModelFilters ):
     model_class = model.History
 
     def _add_parsers( self ):
         super( HistoryFilters, self )._add_parsers()
-        self.orm_filter_parsers.update({
-            #TODO: these three are (prob.) applicable to all models
-            'id'            : { 'op': ( 'in' ), 'val': self.parse_id_list },
-            # dates can be directly passed through the orm into a filter (no need to parse into datetime object)
-            'create_time'   : { 'op': ( 'le', 'ge' ) },
-            'update_time'   : { 'op': ( 'le', 'ge' ) },
+        base.PurgableModelFilters._add_parsers( self )
 
+        self.orm_filter_parsers.update({
             # history specific
             'name'          : { 'op': ( 'eq', 'contains', 'like' ) },
             'genome_build'  : { 'op': ( 'eq', 'contains', 'like' ) },
-
-            #TODO: purgable
-            'deleted'       : { 'op': ( 'eq' ), 'val': self.parse_bool },
-            'purged'        : { 'op': ( 'eq' ), 'val': self.parse_bool },
-
-            #TODO: sharable
-            'importable'    : { 'op': ( 'eq' ), 'val': self.parse_bool },
-            'published'     : { 'op': ( 'eq' ), 'val': self.parse_bool },
-            'slug'          : { 'op': ( 'eq', 'contains', 'like' ) },
-            # chose by user should prob. only be available for admin? (most often we'll only need trans.user)
-            #'user'          : { 'op': ( 'eq' ), 'val': self.parse_id_list },
         })
 
         #TODO: I'm not entirely convinced this (or tags) are a good idea for filters since they involve a/the user

lib/galaxy/managers/sharable.py

@@ -416,3 +416,16 @@ class SharableModelDeserializer( base.ModelDeserializer,
     #    pass
 
     #def deserialize_user_shares():
+
+
+class SharableModelFilters( base.FilterParser ):
+
+    def _add_parsers( self ):
+        super( SharableModelFilters, self )._add_parsers()
+        self.orm_filter_parsers.update({
+            'importable'    : { 'op': ( 'eq' ), 'val': self.parse_bool },
+            'published'     : { 'op': ( 'eq' ), 'val': self.parse_bool },
+            'slug'          : { 'op': ( 'eq', 'contains', 'like' ) },
+            # chose by user should prob. only be available for admin? (most often we'll only need trans.user)
+            #'user'          : { 'op': ( 'eq' ), 'val': self.parse_id_list },
+        })