From 0157d2bcf37ad7e90dd05b92814762355ad37166 Mon Sep 17 00:00:00 2001 From: Bryan Schumaker Date: Sat, 6 Nov 2010 13:53:43 -0400 Subject: [PATCH] Remove library functions from collections.lens I have removed some functions from the old library class since they have been re-implemented in the library module. --- libsaria/collection/__init__.py | 8 -------- libsaria/collection/lens.py | 10 ---------- libsaria/collection/library.py | 1 - ocarina/collection.py | 2 +- 4 files changed, 1 insertion(+), 20 deletions(-) diff --git a/libsaria/collection/__init__.py b/libsaria/collection/__init__.py index 06874804..555c2497 100644 --- a/libsaria/collection/__init__.py +++ b/libsaria/collection/__init__.py @@ -44,14 +44,6 @@ def lib_get_cur_id(): global cur_lib_id return cur_lib_id -#def lib_filter(text): -# global library -# library.filter(text) - -def lib_is_visible(text): - global library - return library.is_visible(text) - def walk_plist(): global playlist global library diff --git a/libsaria/collection/lens.py b/libsaria/collection/lens.py index 8a494788..cbc1eb4a 100644 --- a/libsaria/collection/lens.py +++ b/libsaria/collection/lens.py @@ -36,16 +36,6 @@ class Library(collection.Collection): save(badfiles, "badfiles", "") self.disp() - def inc_count(self, id): - rec = self.records.get(id, None) - if rec: - rec.count += 1 - - def inc_score(self, id, amount): - rec = self.records.get(id, None) - if rec: - rec.score += amount - def update(self, path): global badfiles FileRef = libsaria.collection.FileRef diff --git a/libsaria/collection/library.py b/libsaria/collection/library.py index 8e0ad258..7f8288ca 100644 --- a/libsaria/collection/library.py +++ b/libsaria/collection/library.py @@ -115,7 +115,6 @@ def filter(text): visible = None filtered = False - def is_visible(id): global filtered global visible diff --git a/ocarina/collection.py b/ocarina/collection.py index 87205ce5..d50ec42c 100644 --- a/ocarina/collection.py +++ b/ocarina/collection.py @@ -108,7 +108,7 @@ class Library(Collection): self.list.refilter() def refilter(self, list, iter): - return collection.lib_is_visible(list[iter][0]) + return library.is_visible(list[iter][0]) class Playlist(Collection):