From 01a59852a31152c03361e8f984a20d62ee3ea643 Mon Sep 17 00:00:00 2001 From: Terry Geng Date: Sat, 7 Mar 2020 23:54:25 +0800 Subject: [PATCH] fix: tmp folder issue, more logs #91 --- media/library.py | 9 ++++++++- media/url.py | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/media/library.py b/media/library.py index c37e29b..fe0dc65 100644 --- a/media/library.py +++ b/media/library.py @@ -75,7 +75,12 @@ class MusicLibrary(dict): def delete(self, item): if item.type == 'file' and item.path in self.file_id_lookup: - del self.file_id_lookup[item.path] + self.log.debug("library: DELETE item from the database: %s" % item.format_debug_string()) + + if item.id in self: + del self[item.id] + if item.path in self.file_id_lookup: + del self.file_id_lookup[item.path] self.files.remove(item.path) self.save_dir_cache() @@ -83,9 +88,11 @@ class MusicLibrary(dict): def free(self, id): if id in self: + self.log.debug("library: cache freed for item: %s" % self[id].format_debug_string()) del self[id] def free_all(self): + self.log.debug("library: all cache freed") self.clear() def build_dir_cache(self, bot): diff --git a/media/url.py b/media/url.py index 661797f..81f3642 100644 --- a/media/url.py +++ b/media/url.py @@ -54,7 +54,7 @@ class URLItem(BaseItem): self.type = "url" def uri(self): - return var.music_folder + self.path if self.path[0] != "/" else self.path + return self.path def is_ready(self): if self.downloading or self.ready != 'yes': @@ -80,7 +80,7 @@ class URLItem(BaseItem): info = self._get_info_from_url() self.validating_lock.release() - if self.duration == 0 and not info: + if not info: return False if self.duration > var.config.getint('bot', 'max_track_duration') != 0: