projects
/
zukebox
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
In ZAudioLibrary class added the methos do_scan
[zukebox]
/
zukebox_server
/
src
/
plugins
/
audio_library
/
library.py
diff --git
a/zukebox_server/src/plugins/audio_library/library.py
b/zukebox_server/src/plugins/audio_library/library.py
index
5dd9870
..
8dca824
100644
(file)
--- a/
zukebox_server/src/plugins/audio_library/library.py
+++ b/
zukebox_server/src/plugins/audio_library/library.py
@@
-21,7
+21,7
@@
class ZAudioLibrary(PluginInterface):
def load(self):
self._load_config()
def load(self):
self._load_config()
- self._load_scanner()
+ self.do_scan()
self._load_audio()
def publish(self, webserver):
self._load_audio()
def publish(self, webserver):
@@
-34,7
+34,7
@@
class ZAudioLibrary(PluginInterface):
mgr.set_parameter(plugin_section, ".scanned", True)
mgr.save()
mgr.set_parameter(plugin_section, ".scanned", True)
mgr.save()
- def _load_scanner(self):
+ def do_scan(self):
self.lms = LightMediaScanner(self.db_path, self.audio_types, "utf8",
3, 3)
self.lms.check(self.audio_folder)
self.lms = LightMediaScanner(self.db_path, self.audio_types, "utf8",
3, 3)
self.lms.check(self.audio_folder)
@@
-51,10
+51,18
@@
class ZAudioLibrary(PluginInterface):
self.containers[self.all_container.id] = self.all_container
def process_audio_folder(self):
self.containers[self.all_container.id] = self.all_container
def process_audio_folder(self):
- self.lms.process(self.audio_folder)
+ if self.lms is not None:
+ self.lms.process(self.audio_folder)
+ else:
+ raise Exception("Could not process audio folder lightmediascanner is
+ None")
def check_audio_folder(self):
def check_audio_folder(self):
- self.lms.check(self.audio_folder)
+ if self.lms is not None:
+ self.lms.check(self.audio_folder)
+ else:
+ raise Exception("Could not check audio folder lightmediascanner is
+ None")
def browse(self,id, browse_flag, filter, starting_index, requested_count, sort_criteria):
if id in self.containers:
def browse(self,id, browse_flag, filter, starting_index, requested_count, sort_criteria):
if id in self.containers: