Added logging to almost everything here

This commit is contained in:
2018-03-12 17:11:05 -06:00
parent 1a9200cefe
commit 2fe4f5b665
9 changed files with 65 additions and 11 deletions

View File

@@ -35,6 +35,7 @@ class Controller(object):
self.window.vol_slider.SetValue(player.player.volume)
# Shows window.
utils.call_threaded(updater.do_update)
log.debug("Music DL is ready")
self.window.Show()
def get_status_info(self):
@@ -52,6 +53,7 @@ class Controller(object):
def connect_events(self):
""" connects all widgets to their corresponding events."""
log.debug("Binding events...")
widgetUtils.connect_event(self.window.search, widgetUtils.BUTTON_PRESSED, self.on_search)
widgetUtils.connect_event(self.window.list, widgetUtils.LISTBOX_ITEM_ACTIVATED, self.on_activated)
widgetUtils.connect_event(self.window.list, widgetUtils.KEYPRESS, self.on_keypress)
@@ -166,11 +168,13 @@ class Controller(object):
def on_download(self, *args, **kwargs):
item = self.results[self.window.get_item()]
log.debug("Starting requested download: {0} (using extractor: {1})".format(item.title, self.extractor.name))
f = "{0}.mp3".format(item.title)
if item.download_url == "":
item.get_download_url()
path = self.window.get_destination_path(f)
if path != None:
log.debug("User has requested the following path: {0}".format(path,))
if self.extractor.needs_transcode == True: # Send download to vlc based transcoder
utils.call_threaded(player.player.transcode_audio, item, path)
else:
@@ -192,6 +196,7 @@ class Controller(object):
self.window.time_slider.SetValue(progress)
def on_close(self, event):
log.debug("Exiting...")
self.timer.Stop()
pub.unsubscribe(self.on_download_finished, "download_finished")
event.Skip()
@@ -234,6 +239,7 @@ class Controller(object):
self.extractor = zaycev.interface()
elif extractor == "":
return
log.debug("Started search for {0} (selected extractor: {1})".format(text, self.extractor.name))
self.window.list.Clear()
self.change_status(_(u"Searching {0}... ").format(text))
self.extractor.search(text)

View File

@@ -8,7 +8,7 @@ from pubsub import pub
from utils import call_threaded
player = None
log = logging.getLogger("player")
log = logging.getLogger("controller.player")
def setup():
global player
@@ -27,9 +27,11 @@ class audioPlayer(object):
self.shuffle = False
self.instance = vlc.Instance()
self.player = self.instance.media_player_new()
log.debug("Media player instantiated.")
self.event_manager = self.player.event_manager()
self.event_manager.event_attach(vlc.EventType.MediaPlayerEndReached, self.end_callback)
self.event_manager.event_attach(vlc.EventType.MediaPlayerEncounteredError, self.playback_error)
log.debug("Bound media playback events.")
def play(self, item):
self.stopped = True
@@ -37,6 +39,7 @@ class audioPlayer(object):
self.is_working = True
if item.download_url == "":
item.get_download_url()
log.debug("playing {0}...".format(item.download_url,))
self.stream_new = self.instance.media_new(item.download_url)
self.player.set_media(self.stream_new)
if self.player.play() == -1:
@@ -109,6 +112,7 @@ class audioPlayer(object):
""" Converts given item to mp3. This method will be available when needed automatically."""
if item.download_url == "":
item.get_download_url()
log.debug("Download started: filename={0}, url={1}".format(path, item.download_url))
temporary_filename = "chunk_{0}".format(random.randint(0,2000000))
temporary_path = os.path.join(os.path.dirname(path), temporary_filename)
# Let's get a new VLC instance for transcoding this file.
@@ -128,6 +132,7 @@ class audioPlayer(object):
break
transcoder.release()
os.rename(temporary_path, path)
log.debug("Download finished sucsessfully.")
pub.sendMessage("download_finished", file=os.path.basename(path))
def playback_error(self, event):