From e745764fc55043f6107f68986f82845310537fee Mon Sep 17 00:00:00 2001 From: Jon Bergli Heier Date: Fri, 21 Dec 2012 22:07:45 +0100 Subject: Added feedback and limits to searches. --- db.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'db.py') diff --git a/db.py b/db.py index e680448..ed53fdb 100644 --- a/db.py +++ b/db.py @@ -177,11 +177,16 @@ class Track(Base): r = r.join(f) if n in kwargs: r = r.filter(f.name.ilike('%{0}%'.format(kwargs[n]))) + s_and = [] for i in args: - s_or.append(f.name.ilike('%{0}%'.format(i))) + s_and.append(f.name.ilike('%{0}%'.format(i))) + s_or.append(and_(*s_and)) if len(s_or): r = r.filter(or_(*s_or)) - return r.all() + r = r#.limit(100) + #.all() + #print r + return r def get_path(self): return os.path.join(self.directory.path, self.filename) -- cgit v1.2.3