changed indent style
This commit is contained in:
@@ -6,47 +6,47 @@ from . import player
|
||||
|
||||
class configuration(object):
|
||||
|
||||
def __init__(self):
|
||||
self.view = configurationDialog(_("Settings"))
|
||||
self.create_config()
|
||||
self.view.get_response()
|
||||
self.save()
|
||||
def __init__(self):
|
||||
self.view = configurationDialog(_("Settings"))
|
||||
self.create_config()
|
||||
self.view.get_response()
|
||||
self.save()
|
||||
|
||||
def create_config(self):
|
||||
self.output_devices = player.player.get_output_devices()
|
||||
self.view.create_general(output_devices=[i["name"] for i in self.output_devices])
|
||||
current_output_device = config.app["main"]["output_device"]
|
||||
for i in self.output_devices:
|
||||
# here we must compare against the str version of the vlc's device identifier.
|
||||
if str(i["id"]) == current_output_device:
|
||||
self.view.set_value("general", "output_device", i["name"])
|
||||
break
|
||||
self.view.realize()
|
||||
extractors = get_services(import_all=True)
|
||||
for i in extractors:
|
||||
if hasattr(i, "settings"):
|
||||
panel = getattr(i, "settings")(self.view.notebook)
|
||||
self.view.notebook.InsertSubPage(1, panel, panel.name)
|
||||
panel.load()
|
||||
if hasattr(panel, "on_enabled"):
|
||||
panel.on_enabled()
|
||||
def create_config(self):
|
||||
self.output_devices = player.player.get_output_devices()
|
||||
self.view.create_general(output_devices=[i["name"] for i in self.output_devices])
|
||||
current_output_device = config.app["main"]["output_device"]
|
||||
for i in self.output_devices:
|
||||
# here we must compare against the str version of the vlc's device identifier.
|
||||
if str(i["id"]) == current_output_device:
|
||||
self.view.set_value("general", "output_device", i["name"])
|
||||
break
|
||||
self.view.realize()
|
||||
extractors = get_services(import_all=True)
|
||||
for i in extractors:
|
||||
if hasattr(i, "settings"):
|
||||
panel = getattr(i, "settings")(self.view.notebook)
|
||||
self.view.notebook.InsertSubPage(1, panel, panel.name)
|
||||
panel.load()
|
||||
if hasattr(panel, "on_enabled"):
|
||||
panel.on_enabled()
|
||||
|
||||
|
||||
def save(self):
|
||||
selected_output_device = self.view.get_value("general", "output_device")
|
||||
selected_device_id = None
|
||||
for i in self.output_devices:
|
||||
# Vlc returns everything as bytes object whereas WX works with string objects, so I need to convert the wx returned string to bytes before
|
||||
# Otherwise the comparison will be false.
|
||||
# toDo: Check if utf-8 would be enough or we'd have to use the fylesystem encode for handling this.
|
||||
if i["name"] == bytes(selected_output_device, "utf-8"):
|
||||
selected_device_id = i["id"]
|
||||
break
|
||||
if config.app["main"]["output_device"] != selected_device_id:
|
||||
config.app["main"]["output_device"] = selected_device_id
|
||||
player.player.set_output_device(config.app["main"]["output_device"])
|
||||
for i in range(0, self.view.notebook.GetPageCount()):
|
||||
page = self.view.notebook.GetPage(i)
|
||||
if hasattr(page, "save"):
|
||||
page.save()
|
||||
config.app.write()
|
||||
def save(self):
|
||||
selected_output_device = self.view.get_value("general", "output_device")
|
||||
selected_device_id = None
|
||||
for i in self.output_devices:
|
||||
# Vlc returns everything as bytes object whereas WX works with string objects, so I need to convert the wx returned string to bytes before
|
||||
# Otherwise the comparison will be false.
|
||||
# toDo: Check if utf-8 would be enough or we'd have to use the fylesystem encode for handling this.
|
||||
if i["name"] == bytes(selected_output_device, "utf-8"):
|
||||
selected_device_id = i["id"]
|
||||
break
|
||||
if config.app["main"]["output_device"] != selected_device_id:
|
||||
config.app["main"]["output_device"] = selected_device_id
|
||||
player.player.set_output_device(config.app["main"]["output_device"])
|
||||
for i in range(0, self.view.notebook.GetPageCount()):
|
||||
page = self.view.notebook.GetPage(i)
|
||||
if hasattr(page, "save"):
|
||||
page.save()
|
||||
config.app.write()
|
||||
|
||||
@@ -20,252 +20,252 @@ log = logging.getLogger("controller.main")
|
||||
|
||||
class Controller(object):
|
||||
|
||||
def __init__(self):
|
||||
super(Controller, self).__init__()
|
||||
log.debug("Starting main controller...")
|
||||
# Setting up the player object
|
||||
player.setup()
|
||||
# Get main window
|
||||
self.window = mainWindow.mainWindow(extractors=[i.interface.name for i in get_services()])
|
||||
log.debug("Main window created")
|
||||
self.window.change_status(_(u"Ready"))
|
||||
# Here we will save results for searches as song objects.
|
||||
self.results = []
|
||||
self.connect_events()
|
||||
self.timer = wx.Timer(self.window)
|
||||
self.window.Bind(wx.EVT_TIMER, self.on_timer, self.timer)
|
||||
self.timer.Start(75)
|
||||
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 __init__(self):
|
||||
super(Controller, self).__init__()
|
||||
log.debug("Starting main controller...")
|
||||
# Setting up the player object
|
||||
player.setup()
|
||||
# Get main window
|
||||
self.window = mainWindow.mainWindow(extractors=[i.interface.name for i in get_services()])
|
||||
log.debug("Main window created")
|
||||
self.window.change_status(_(u"Ready"))
|
||||
# Here we will save results for searches as song objects.
|
||||
self.results = []
|
||||
self.connect_events()
|
||||
self.timer = wx.Timer(self.window)
|
||||
self.window.Bind(wx.EVT_TIMER, self.on_timer, self.timer)
|
||||
self.timer.Start(75)
|
||||
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):
|
||||
""" Formatting string for status bar messages """
|
||||
if len(self.results) > 0:
|
||||
results = _(u"Showing {0} results.").format(len(self.results))
|
||||
else:
|
||||
results = u""
|
||||
if player.player.shuffle:
|
||||
shuffle = _(u"Shuffle on")
|
||||
else:
|
||||
shuffle = u""
|
||||
final = u"{0} {1}".format(results, shuffle)
|
||||
return final
|
||||
def get_status_info(self):
|
||||
""" Formatting string for status bar messages """
|
||||
if len(self.results) > 0:
|
||||
results = _(u"Showing {0} results.").format(len(self.results))
|
||||
else:
|
||||
results = u""
|
||||
if player.player.shuffle:
|
||||
shuffle = _(u"Shuffle on")
|
||||
else:
|
||||
shuffle = u""
|
||||
final = u"{0} {1}".format(results, shuffle)
|
||||
return final
|
||||
|
||||
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)
|
||||
widgetUtils.connect_event(self.window, widgetUtils.MENU, self.on_play, menuitem=self.window.player_play)
|
||||
widgetUtils.connect_event(self.window, widgetUtils.MENU, self.on_settings, menuitem=self.window.settings)
|
||||
widgetUtils.connect_event(self.window, widgetUtils.MENU, self.on_next, menuitem=self.window.player_next)
|
||||
widgetUtils.connect_event(self.window, widgetUtils.MENU, self.on_previous, menuitem=self.window.player_previous)
|
||||
widgetUtils.connect_event(self.window, widgetUtils.MENU, self.on_stop, menuitem=self.window.player_stop)
|
||||
widgetUtils.connect_event(self.window, widgetUtils.MENU, self.on_volume_down, menuitem=self.window.player_volume_down)
|
||||
widgetUtils.connect_event(self.window, widgetUtils.MENU, self.on_volume_up, menuitem=self.window.player_volume_up)
|
||||
widgetUtils.connect_event(self.window, widgetUtils.MENU, self.on_mute, menuitem=self.window.player_mute)
|
||||
widgetUtils.connect_event(self.window, widgetUtils.MENU, self.on_shuffle, menuitem=self.window.player_shuffle)
|
||||
widgetUtils.connect_event(self.window, widgetUtils.MENU, self.window.about_dialog, menuitem=self.window.about)
|
||||
widgetUtils.connect_event(self.window, widgetUtils.MENU, self.on_check_for_updates, menuitem=self.window.check_for_updates)
|
||||
widgetUtils.connect_event(self.window, widgetUtils.MENU, self.on_visit_changelog, menuitem=self.window.changelog)
|
||||
widgetUtils.connect_event(self.window, widgetUtils.MENU, self.on_visit_website, menuitem=self.window.website)
|
||||
widgetUtils.connect_event(self.window, widgetUtils.MENU, self.on_report_error, menuitem=self.window.report)
|
||||
widgetUtils.connect_event(self.window.previous, widgetUtils.BUTTON_PRESSED, self.on_previous)
|
||||
widgetUtils.connect_event(self.window.play, widgetUtils.BUTTON_PRESSED, self.on_play_pause)
|
||||
widgetUtils.connect_event(self.window.stop, widgetUtils.BUTTON_PRESSED, self.on_stop)
|
||||
widgetUtils.connect_event(self.window.next, widgetUtils.BUTTON_PRESSED, self.on_next)
|
||||
self.window.Bind(wx.EVT_COMMAND_SCROLL_THUMBTRACK, self.on_set_volume, self.window.vol_slider)
|
||||
self.window.Bind(wx.EVT_COMMAND_SCROLL_CHANGED, self.on_set_volume, self.window.vol_slider)
|
||||
self.window.Bind(wx.EVT_COMMAND_SCROLL_THUMBTRACK, self.on_time_change, self.window.time_slider)
|
||||
self.window.Bind(wx.EVT_COMMAND_SCROLL_CHANGED, self.on_time_change, self.window.time_slider)
|
||||
self.window.list.Bind(wx.EVT_LISTBOX_DCLICK, self.on_play)
|
||||
self.window.list.Bind(wx.EVT_CONTEXT_MENU, self.on_context)
|
||||
self.window.Bind(wx.EVT_CLOSE, self.on_close)
|
||||
pub.subscribe(self.change_status, "change_status")
|
||||
pub.subscribe(self.on_download_finished, "download_finished")
|
||||
pub.subscribe(self.on_notify, "notify")
|
||||
pub.subscribe(self.on_update_progress, "update-progress")
|
||||
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)
|
||||
widgetUtils.connect_event(self.window, widgetUtils.MENU, self.on_play, menuitem=self.window.player_play)
|
||||
widgetUtils.connect_event(self.window, widgetUtils.MENU, self.on_settings, menuitem=self.window.settings)
|
||||
widgetUtils.connect_event(self.window, widgetUtils.MENU, self.on_next, menuitem=self.window.player_next)
|
||||
widgetUtils.connect_event(self.window, widgetUtils.MENU, self.on_previous, menuitem=self.window.player_previous)
|
||||
widgetUtils.connect_event(self.window, widgetUtils.MENU, self.on_stop, menuitem=self.window.player_stop)
|
||||
widgetUtils.connect_event(self.window, widgetUtils.MENU, self.on_volume_down, menuitem=self.window.player_volume_down)
|
||||
widgetUtils.connect_event(self.window, widgetUtils.MENU, self.on_volume_up, menuitem=self.window.player_volume_up)
|
||||
widgetUtils.connect_event(self.window, widgetUtils.MENU, self.on_mute, menuitem=self.window.player_mute)
|
||||
widgetUtils.connect_event(self.window, widgetUtils.MENU, self.on_shuffle, menuitem=self.window.player_shuffle)
|
||||
widgetUtils.connect_event(self.window, widgetUtils.MENU, self.window.about_dialog, menuitem=self.window.about)
|
||||
widgetUtils.connect_event(self.window, widgetUtils.MENU, self.on_check_for_updates, menuitem=self.window.check_for_updates)
|
||||
widgetUtils.connect_event(self.window, widgetUtils.MENU, self.on_visit_changelog, menuitem=self.window.changelog)
|
||||
widgetUtils.connect_event(self.window, widgetUtils.MENU, self.on_visit_website, menuitem=self.window.website)
|
||||
widgetUtils.connect_event(self.window, widgetUtils.MENU, self.on_report_error, menuitem=self.window.report)
|
||||
widgetUtils.connect_event(self.window.previous, widgetUtils.BUTTON_PRESSED, self.on_previous)
|
||||
widgetUtils.connect_event(self.window.play, widgetUtils.BUTTON_PRESSED, self.on_play_pause)
|
||||
widgetUtils.connect_event(self.window.stop, widgetUtils.BUTTON_PRESSED, self.on_stop)
|
||||
widgetUtils.connect_event(self.window.next, widgetUtils.BUTTON_PRESSED, self.on_next)
|
||||
self.window.Bind(wx.EVT_COMMAND_SCROLL_THUMBTRACK, self.on_set_volume, self.window.vol_slider)
|
||||
self.window.Bind(wx.EVT_COMMAND_SCROLL_CHANGED, self.on_set_volume, self.window.vol_slider)
|
||||
self.window.Bind(wx.EVT_COMMAND_SCROLL_THUMBTRACK, self.on_time_change, self.window.time_slider)
|
||||
self.window.Bind(wx.EVT_COMMAND_SCROLL_CHANGED, self.on_time_change, self.window.time_slider)
|
||||
self.window.list.Bind(wx.EVT_LISTBOX_DCLICK, self.on_play)
|
||||
self.window.list.Bind(wx.EVT_CONTEXT_MENU, self.on_context)
|
||||
self.window.Bind(wx.EVT_CLOSE, self.on_close)
|
||||
pub.subscribe(self.change_status, "change_status")
|
||||
pub.subscribe(self.on_download_finished, "download_finished")
|
||||
pub.subscribe(self.on_notify, "notify")
|
||||
pub.subscribe(self.on_update_progress, "update-progress")
|
||||
|
||||
# Event functions. These functions will call other functions in a thread and are bound to widget events.
|
||||
# Event functions. These functions will call other functions in a thread and are bound to widget events.
|
||||
|
||||
def on_update_progress(self, value):
|
||||
wx.CallAfter(self.window.progressbar.SetValue, value)
|
||||
def on_update_progress(self, value):
|
||||
wx.CallAfter(self.window.progressbar.SetValue, value)
|
||||
|
||||
def on_settings(self, *args, **kwargs):
|
||||
settings = configuration.configuration()
|
||||
self.reload_extractors()
|
||||
def on_settings(self, *args, **kwargs):
|
||||
settings = configuration.configuration()
|
||||
self.reload_extractors()
|
||||
|
||||
def on_search(self, *args, **kwargs):
|
||||
text = self.window.get_text()
|
||||
if text == "":
|
||||
return
|
||||
extractor = self.window.extractor.GetValue()
|
||||
self.change_status(_(u"Searching {0}... ").format(text))
|
||||
utils.call_threaded(self.search, text=text, extractor=extractor)
|
||||
def on_search(self, *args, **kwargs):
|
||||
text = self.window.get_text()
|
||||
if text == "":
|
||||
return
|
||||
extractor = self.window.extractor.GetValue()
|
||||
self.change_status(_(u"Searching {0}... ").format(text))
|
||||
utils.call_threaded(self.search, text=text, extractor=extractor)
|
||||
|
||||
def on_activated(self, *args, **kwargs):
|
||||
self.on_play()
|
||||
def on_activated(self, *args, **kwargs):
|
||||
self.on_play()
|
||||
|
||||
def on_keypress(self, ev):
|
||||
if ev.GetKeyCode() == wx.WXK_RETURN:
|
||||
return self.on_play()
|
||||
elif ev.GetKeyCode() == wx.WXK_SPACE:
|
||||
return self.on_play_pause()
|
||||
elif ev.GetKeyCode() == wx.WXK_LEFT and ev.ShiftDown():
|
||||
position = player.player.player.get_time()
|
||||
if position > 5000:
|
||||
player.player.player.set_time(position-5000)
|
||||
else:
|
||||
player.player.player.set_time(0)
|
||||
return
|
||||
elif ev.GetKeyCode() == wx.WXK_RIGHT and ev.ShiftDown():
|
||||
position = player.player.player.get_time()
|
||||
player.player.player.set_time(position+5000)
|
||||
return
|
||||
elif ev.GetKeyCode() == wx.WXK_UP and ev.ControlDown():
|
||||
return self.on_volume_up()
|
||||
elif ev.GetKeyCode() == wx.WXK_DOWN and ev.ControlDown():
|
||||
return self.on_volume_down()
|
||||
elif ev.GetKeyCode() == wx.WXK_LEFT and ev.AltDown():
|
||||
return self.on_previous()
|
||||
elif ev.GetKeyCode() == wx.WXK_RIGHT and ev.AltDown():
|
||||
return self.on_next()
|
||||
ev.Skip()
|
||||
def on_keypress(self, ev):
|
||||
if ev.GetKeyCode() == wx.WXK_RETURN:
|
||||
return self.on_play()
|
||||
elif ev.GetKeyCode() == wx.WXK_SPACE:
|
||||
return self.on_play_pause()
|
||||
elif ev.GetKeyCode() == wx.WXK_LEFT and ev.ShiftDown():
|
||||
position = player.player.player.get_time()
|
||||
if position > 5000:
|
||||
player.player.player.set_time(position-5000)
|
||||
else:
|
||||
player.player.player.set_time(0)
|
||||
return
|
||||
elif ev.GetKeyCode() == wx.WXK_RIGHT and ev.ShiftDown():
|
||||
position = player.player.player.get_time()
|
||||
player.player.player.set_time(position+5000)
|
||||
return
|
||||
elif ev.GetKeyCode() == wx.WXK_UP and ev.ControlDown():
|
||||
return self.on_volume_up()
|
||||
elif ev.GetKeyCode() == wx.WXK_DOWN and ev.ControlDown():
|
||||
return self.on_volume_down()
|
||||
elif ev.GetKeyCode() == wx.WXK_LEFT and ev.AltDown():
|
||||
return self.on_previous()
|
||||
elif ev.GetKeyCode() == wx.WXK_RIGHT and ev.AltDown():
|
||||
return self.on_next()
|
||||
ev.Skip()
|
||||
|
||||
def on_play_pause(self, *args, **kwargs):
|
||||
if player.player.player.is_playing() == 1:
|
||||
self.window.play.SetLabel(_(u"Play"))
|
||||
return player.player.pause()
|
||||
else:
|
||||
self.window.play.SetLabel(_(u"Pause"))
|
||||
return player.player.player.play()
|
||||
def on_play_pause(self, *args, **kwargs):
|
||||
if player.player.player.is_playing() == 1:
|
||||
self.window.play.SetLabel(_(u"Play"))
|
||||
return player.player.pause()
|
||||
else:
|
||||
self.window.play.SetLabel(_(u"Pause"))
|
||||
return player.player.player.play()
|
||||
|
||||
def on_next(self, *args, **kwargs):
|
||||
return utils.call_threaded(player.player.next)
|
||||
def on_next(self, *args, **kwargs):
|
||||
return utils.call_threaded(player.player.next)
|
||||
|
||||
def on_previous(self, *args, **kwargs):
|
||||
return utils.call_threaded(player.player.previous)
|
||||
def on_previous(self, *args, **kwargs):
|
||||
return utils.call_threaded(player.player.previous)
|
||||
|
||||
def on_play(self, *args, **kwargs):
|
||||
items = self.results[::]
|
||||
playing_item = self.window.get_item()
|
||||
self.window.play.SetLabel(_(u"Pause"))
|
||||
return utils.call_threaded(player.player.play_all, items, playing=playing_item, shuffle=self.window.player_shuffle.IsChecked())
|
||||
def on_play(self, *args, **kwargs):
|
||||
items = self.results[::]
|
||||
playing_item = self.window.get_item()
|
||||
self.window.play.SetLabel(_(u"Pause"))
|
||||
return utils.call_threaded(player.player.play_all, items, playing=playing_item, shuffle=self.window.player_shuffle.IsChecked())
|
||||
|
||||
def on_stop(self, *args, **kwargs):
|
||||
player.player.stop()
|
||||
self.window.play.SetLabel(_(u"Play"))
|
||||
def on_stop(self, *args, **kwargs):
|
||||
player.player.stop()
|
||||
self.window.play.SetLabel(_(u"Play"))
|
||||
|
||||
def on_volume_down(self, *args, **kwargs):
|
||||
self.window.vol_slider.SetValue(self.window.vol_slider.GetValue()-5)
|
||||
self.on_set_volume()
|
||||
def on_volume_down(self, *args, **kwargs):
|
||||
self.window.vol_slider.SetValue(self.window.vol_slider.GetValue()-5)
|
||||
self.on_set_volume()
|
||||
|
||||
def on_volume_up(self, *args, **kwargs):
|
||||
self.window.vol_slider.SetValue(self.window.vol_slider.GetValue()+5)
|
||||
self.on_set_volume()
|
||||
def on_volume_up(self, *args, **kwargs):
|
||||
self.window.vol_slider.SetValue(self.window.vol_slider.GetValue()+5)
|
||||
self.on_set_volume()
|
||||
|
||||
def on_mute(self, *args, **kwargs):
|
||||
self.window.vol_slider.SetValue(0)
|
||||
self.on_set_volume()
|
||||
def on_mute(self, *args, **kwargs):
|
||||
self.window.vol_slider.SetValue(0)
|
||||
self.on_set_volume()
|
||||
|
||||
def on_shuffle(self, *args, **kwargs):
|
||||
player.player.shuffle = self.window.player_shuffle.IsChecked()
|
||||
def on_shuffle(self, *args, **kwargs):
|
||||
player.player.shuffle = self.window.player_shuffle.IsChecked()
|
||||
|
||||
def on_context(self, *args, **kwargs):
|
||||
item = self.window.get_item()
|
||||
if item == -1:
|
||||
return wx.Bell()
|
||||
menu = menus.contextMenu()
|
||||
widgetUtils.connect_event(menu, widgetUtils.MENU, self.on_play, menuitem=menu.play)
|
||||
widgetUtils.connect_event(menu, widgetUtils.MENU, self.on_download, menuitem=menu.download)
|
||||
self.window.PopupMenu(menu, wx.GetMousePosition())
|
||||
menu.Destroy()
|
||||
def on_context(self, *args, **kwargs):
|
||||
item = self.window.get_item()
|
||||
if item == -1:
|
||||
return wx.Bell()
|
||||
menu = menus.contextMenu()
|
||||
widgetUtils.connect_event(menu, widgetUtils.MENU, self.on_play, menuitem=menu.play)
|
||||
widgetUtils.connect_event(menu, widgetUtils.MENU, self.on_download, menuitem=menu.download)
|
||||
self.window.PopupMenu(menu, wx.GetMousePosition())
|
||||
menu.Destroy()
|
||||
|
||||
def on_download(self, *args, **kwargs):
|
||||
item = self.results[self.window.get_item()]
|
||||
if item.download_url == "":
|
||||
item.get_download_url()
|
||||
log.debug("Starting requested download: {0} (using extractor: {1})".format(item.title, self.extractor.name))
|
||||
f = "{item_name}.{item_extension}".format(item_name=item.format_track(), item_extension=item.extractor.get_file_format())
|
||||
path = self.window.get_destination_path(utils.safe_filename(f))
|
||||
if path != None:
|
||||
log.debug("User has requested the following path: {0}".format(path,))
|
||||
if self.extractor.transcoder_enabled() == True: # Send download to vlc based transcoder
|
||||
utils.call_threaded(player.player.transcode_audio, item, path, _format=item.extractor.get_file_format(), metadata=item.get_metadata())
|
||||
else:
|
||||
log.debug("downloading %s URL to %s filename" % (item.download_url, path,))
|
||||
utils.call_threaded(utils.download_file, item.download_url, path, metadata=item.get_metadata())
|
||||
def on_download(self, *args, **kwargs):
|
||||
item = self.results[self.window.get_item()]
|
||||
if item.download_url == "":
|
||||
item.get_download_url()
|
||||
log.debug("Starting requested download: {0} (using extractor: {1})".format(item.title, self.extractor.name))
|
||||
f = "{item_name}.{item_extension}".format(item_name=item.format_track(), item_extension=item.extractor.get_file_format())
|
||||
path = self.window.get_destination_path(utils.safe_filename(f))
|
||||
if path != None:
|
||||
log.debug("User has requested the following path: {0}".format(path,))
|
||||
if self.extractor.transcoder_enabled() == True: # Send download to vlc based transcoder
|
||||
utils.call_threaded(player.player.transcode_audio, item, path, _format=item.extractor.get_file_format(), metadata=item.get_metadata())
|
||||
else:
|
||||
log.debug("downloading %s URL to %s filename" % (item.download_url, path,))
|
||||
utils.call_threaded(utils.download_file, item.download_url, path, metadata=item.get_metadata())
|
||||
|
||||
def on_set_volume(self, *args, **kwargs):
|
||||
volume = self.window.vol_slider.GetValue()
|
||||
player.player.volume = volume
|
||||
def on_set_volume(self, *args, **kwargs):
|
||||
volume = self.window.vol_slider.GetValue()
|
||||
player.player.volume = volume
|
||||
|
||||
def on_time_change(self, event, *args, **kwargs):
|
||||
p = event.GetPosition()
|
||||
player.player.player.set_position(p/100.0)
|
||||
event.Skip()
|
||||
def on_time_change(self, event, *args, **kwargs):
|
||||
p = event.GetPosition()
|
||||
player.player.player.set_position(p/100.0)
|
||||
event.Skip()
|
||||
|
||||
def on_timer(self, *args, **kwargs):
|
||||
if not self.window.time_slider.HasFocus():
|
||||
progress = player.player.player.get_position()*100
|
||||
self.window.time_slider.SetValue(progress)
|
||||
def on_timer(self, *args, **kwargs):
|
||||
if not self.window.time_slider.HasFocus():
|
||||
progress = player.player.player.get_position()*100
|
||||
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")
|
||||
config.app.write()
|
||||
event.Skip()
|
||||
widgetUtils.exit_application()
|
||||
def on_close(self, event):
|
||||
log.debug("Exiting...")
|
||||
self.timer.Stop()
|
||||
pub.unsubscribe(self.on_download_finished, "download_finished")
|
||||
config.app.write()
|
||||
event.Skip()
|
||||
widgetUtils.exit_application()
|
||||
|
||||
def change_status(self, status):
|
||||
""" Function used for changing the status bar from outside the main controller module."""
|
||||
self.window.change_status(u"{0} {1}".format(status, self.get_status_info()))
|
||||
def change_status(self, status):
|
||||
""" Function used for changing the status bar from outside the main controller module."""
|
||||
self.window.change_status(u"{0} {1}".format(status, self.get_status_info()))
|
||||
|
||||
def on_visit_website(self, *args, **kwargs):
|
||||
webbrowser.open_new_tab(application.url)
|
||||
def on_visit_website(self, *args, **kwargs):
|
||||
webbrowser.open_new_tab(application.url)
|
||||
|
||||
def on_report_error(self, *args, **kwargs):
|
||||
r = issueReporter.reportBug()
|
||||
def on_report_error(self, *args, **kwargs):
|
||||
r = issueReporter.reportBug()
|
||||
|
||||
def on_visit_changelog(self, *args, **kwargs):
|
||||
webbrowser.open_new_tab(application.url+"/news")
|
||||
def on_visit_changelog(self, *args, **kwargs):
|
||||
webbrowser.open_new_tab(application.url+"/news")
|
||||
|
||||
def on_check_for_updates(self, *args, **kwargs):
|
||||
utils.call_threaded(updater.do_update)
|
||||
def on_check_for_updates(self, *args, **kwargs):
|
||||
utils.call_threaded(updater.do_update)
|
||||
|
||||
def on_download_finished(self, file):
|
||||
title = "MusicDL"
|
||||
msg = _(u"File downloaded: {0}").format(file,)
|
||||
self.window.notify(title, msg)
|
||||
def on_download_finished(self, file):
|
||||
title = "MusicDL"
|
||||
msg = _(u"File downloaded: {0}").format(file,)
|
||||
self.window.notify(title, msg)
|
||||
|
||||
def on_notify(self, title, message):
|
||||
self.window.notify(title, message)
|
||||
def on_notify(self, title, message):
|
||||
self.window.notify(title, message)
|
||||
|
||||
# real functions. These functions really are doing the work.
|
||||
def search(self, text, extractor, *args, **kwargs):
|
||||
extractors = get_services()
|
||||
for i in extractors:
|
||||
if extractor == i.interface.name:
|
||||
self.extractor = i.interface()
|
||||
break
|
||||
log.debug("Started search for {0} (selected extractor: {1})".format(text, self.extractor.name))
|
||||
wx.CallAfter(self.window.list.Clear)
|
||||
self.extractor.search(text)
|
||||
self.results = self.extractor.results
|
||||
for i in self.results:
|
||||
wx.CallAfter(self.window.list.Append, i.format_track())
|
||||
if len(self.results) == 0:
|
||||
wx.CallAfter(self.change_status, _(u"No results found. "))
|
||||
else:
|
||||
wx.CallAfter(self.change_status, u"")
|
||||
wx.CallAfter(self.window.list.SetFocus)
|
||||
# real functions. These functions really are doing the work.
|
||||
def search(self, text, extractor, *args, **kwargs):
|
||||
extractors = get_services()
|
||||
for i in extractors:
|
||||
if extractor == i.interface.name:
|
||||
self.extractor = i.interface()
|
||||
break
|
||||
log.debug("Started search for {0} (selected extractor: {1})".format(text, self.extractor.name))
|
||||
wx.CallAfter(self.window.list.Clear)
|
||||
self.extractor.search(text)
|
||||
self.results = self.extractor.results
|
||||
for i in self.results:
|
||||
wx.CallAfter(self.window.list.Append, i.format_track())
|
||||
if len(self.results) == 0:
|
||||
wx.CallAfter(self.change_status, _(u"No results found. "))
|
||||
else:
|
||||
wx.CallAfter(self.change_status, u"")
|
||||
wx.CallAfter(self.window.list.SetFocus)
|
||||
|
||||
def reload_extractors(self):
|
||||
extractors = [i.interface.name for i in get_services()]
|
||||
self.window.extractor.SetItems(extractors)
|
||||
self.window.extractor.SetValue(extractors[0])
|
||||
def reload_extractors(self):
|
||||
extractors = [i.interface.name for i in get_services()]
|
||||
self.window.extractor.SetItems(extractors)
|
||||
self.window.extractor.SetValue(extractors[0])
|
||||
|
||||
@@ -12,158 +12,158 @@ player = None
|
||||
log = logging.getLogger("controller.player")
|
||||
|
||||
def setup():
|
||||
global player
|
||||
if player == None:
|
||||
player = audioPlayer()
|
||||
global player
|
||||
if player == None:
|
||||
player = audioPlayer()
|
||||
|
||||
class audioPlayer(object):
|
||||
|
||||
def __init__(self):
|
||||
self.is_playing = False
|
||||
self.vol = config.app["main"]["volume"]
|
||||
self.is_working = False
|
||||
self.queue = []
|
||||
self.stopped = True
|
||||
self.queue_pos = 0
|
||||
self.shuffle = False
|
||||
self.instance = vlc.Instance()
|
||||
log.debug("Instantiating Media player with the following information: VLC version detected={}. VLC bindings for python version{}".format(vlc.libvlc_get_version(), vlc.__version__))
|
||||
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.")
|
||||
# configure output device
|
||||
self.set_output_device(config.app["main"]["output_device"])
|
||||
def __init__(self):
|
||||
self.is_playing = False
|
||||
self.vol = config.app["main"]["volume"]
|
||||
self.is_working = False
|
||||
self.queue = []
|
||||
self.stopped = True
|
||||
self.queue_pos = 0
|
||||
self.shuffle = False
|
||||
self.instance = vlc.Instance()
|
||||
log.debug("Instantiating Media player with the following information: VLC version detected={}. VLC bindings for python version{}".format(vlc.libvlc_get_version(), vlc.__version__))
|
||||
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.")
|
||||
# configure output device
|
||||
self.set_output_device(config.app["main"]["output_device"])
|
||||
|
||||
def get_output_devices(self):
|
||||
""" Retrieve enabled output devices so we can switch or use those later. """
|
||||
log.debug("Retrieving output devices...")
|
||||
devices = []
|
||||
mods = self.player.audio_output_device_enum()
|
||||
if mods:
|
||||
mod = mods
|
||||
while mod:
|
||||
mod = mod.contents
|
||||
devices.append(dict(id=mod.device, name=mod.description))
|
||||
mod = mod.next
|
||||
vlc.libvlc_audio_output_device_list_release(mods)
|
||||
return devices
|
||||
def get_output_devices(self):
|
||||
""" Retrieve enabled output devices so we can switch or use those later. """
|
||||
log.debug("Retrieving output devices...")
|
||||
devices = []
|
||||
mods = self.player.audio_output_device_enum()
|
||||
if mods:
|
||||
mod = mods
|
||||
while mod:
|
||||
mod = mod.contents
|
||||
devices.append(dict(id=mod.device, name=mod.description))
|
||||
mod = mod.next
|
||||
vlc.libvlc_audio_output_device_list_release(mods)
|
||||
return devices
|
||||
|
||||
def set_output_device(self, device_id):
|
||||
""" Set Output device to be used in LibVLC"""
|
||||
log.debug("Setting output audio device to {device}...".format(device=device_id,))
|
||||
self.player.audio_output_device_set(None, device_id)
|
||||
def set_output_device(self, device_id):
|
||||
""" Set Output device to be used in LibVLC"""
|
||||
log.debug("Setting output audio device to {device}...".format(device=device_id,))
|
||||
self.player.audio_output_device_set(None, device_id)
|
||||
|
||||
def play(self, item):
|
||||
self.stopped = True
|
||||
if self.is_working == False:
|
||||
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:
|
||||
log.debug("Error when playing the file {0}".format(item.title,))
|
||||
pub.sendMessage("change_status", status=_("Error playing {0}. {1}.").format(item.title, e.description))
|
||||
self.stopped = True
|
||||
self.is_working = False
|
||||
self.next()
|
||||
return
|
||||
self.player.audio_set_volume(self.vol)
|
||||
pub.sendMessage("change_status", status=_("Playing {0}.").format(item.title))
|
||||
self.stopped = False
|
||||
self.is_working = False
|
||||
def play(self, item):
|
||||
self.stopped = True
|
||||
if self.is_working == False:
|
||||
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:
|
||||
log.debug("Error when playing the file {0}".format(item.title,))
|
||||
pub.sendMessage("change_status", status=_("Error playing {0}. {1}.").format(item.title, e.description))
|
||||
self.stopped = True
|
||||
self.is_working = False
|
||||
self.next()
|
||||
return
|
||||
self.player.audio_set_volume(self.vol)
|
||||
pub.sendMessage("change_status", status=_("Playing {0}.").format(item.title))
|
||||
self.stopped = False
|
||||
self.is_working = False
|
||||
|
||||
def next(self):
|
||||
if len(self.queue) > 0:
|
||||
if self.shuffle:
|
||||
self.queue_pos = random.randint(0, len(self.queue)-1)
|
||||
else:
|
||||
if self.queue_pos < len(self.queue)-1:
|
||||
self.queue_pos += 1
|
||||
else:
|
||||
self.queue_pos = 0
|
||||
self.play(self.queue[self.queue_pos])
|
||||
def next(self):
|
||||
if len(self.queue) > 0:
|
||||
if self.shuffle:
|
||||
self.queue_pos = random.randint(0, len(self.queue)-1)
|
||||
else:
|
||||
if self.queue_pos < len(self.queue)-1:
|
||||
self.queue_pos += 1
|
||||
else:
|
||||
self.queue_pos = 0
|
||||
self.play(self.queue[self.queue_pos])
|
||||
|
||||
def previous(self):
|
||||
if len(self.queue) > 0:
|
||||
if self.shuffle:
|
||||
self.queue_pos = random.randint(0, len(self.queue)-1)
|
||||
else:
|
||||
if self.queue_pos > 0:
|
||||
self.queue_pos -= 1
|
||||
else:
|
||||
self.queue_pos = len(self.queue)-1
|
||||
self.play(self.queue[self.queue_pos])
|
||||
def previous(self):
|
||||
if len(self.queue) > 0:
|
||||
if self.shuffle:
|
||||
self.queue_pos = random.randint(0, len(self.queue)-1)
|
||||
else:
|
||||
if self.queue_pos > 0:
|
||||
self.queue_pos -= 1
|
||||
else:
|
||||
self.queue_pos = len(self.queue)-1
|
||||
self.play(self.queue[self.queue_pos])
|
||||
|
||||
def stop(self):
|
||||
self.player.stop()
|
||||
self.stopped = True
|
||||
def stop(self):
|
||||
self.player.stop()
|
||||
self.stopped = True
|
||||
|
||||
def pause(self):
|
||||
self.player.pause()
|
||||
if self.stopped == True:
|
||||
self.stopped = False
|
||||
else:
|
||||
self.stopped = True
|
||||
def pause(self):
|
||||
self.player.pause()
|
||||
if self.stopped == True:
|
||||
self.stopped = False
|
||||
else:
|
||||
self.stopped = True
|
||||
|
||||
@property
|
||||
def volume(self):
|
||||
return self.vol
|
||||
@property
|
||||
def volume(self):
|
||||
return self.vol
|
||||
|
||||
@volume.setter
|
||||
def volume(self, vol):
|
||||
if vol <= 100 and vol >= 0:
|
||||
config.app["main"]["volume"] = vol
|
||||
self.vol = vol
|
||||
self.player.audio_set_volume(self.vol)
|
||||
@volume.setter
|
||||
def volume(self, vol):
|
||||
if vol <= 100 and vol >= 0:
|
||||
config.app["main"]["volume"] = vol
|
||||
self.vol = vol
|
||||
self.player.audio_set_volume(self.vol)
|
||||
|
||||
def play_all(self, list_of_items, playing=0, shuffle=False):
|
||||
if list_of_items != self.queue:
|
||||
self.queue = list_of_items
|
||||
self.shuffle = shuffle
|
||||
self.queue_pos = playing
|
||||
self.play(self.queue[self.queue_pos])
|
||||
def play_all(self, list_of_items, playing=0, shuffle=False):
|
||||
if list_of_items != self.queue:
|
||||
self.queue = list_of_items
|
||||
self.shuffle = shuffle
|
||||
self.queue_pos = playing
|
||||
self.play(self.queue[self.queue_pos])
|
||||
|
||||
def end_callback(self, event, *args, **kwargs):
|
||||
#https://github.com/ZeBobo5/Vlc.DotNet/issues/4
|
||||
call_threaded(self.next)
|
||||
def end_callback(self, event, *args, **kwargs):
|
||||
#https://github.com/ZeBobo5/Vlc.DotNet/issues/4
|
||||
call_threaded(self.next)
|
||||
|
||||
def transcode_audio(self, item, path, _format="mp3", bitrate=320, metadata=dict()):
|
||||
""" 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.
|
||||
transcoding_instance = vlc.Instance(*["--sout=#transcode{acodec=%s,ab=%d}:file{mux=raw,dst=\"%s\"}"% (_format, bitrate, temporary_path,)])
|
||||
transcoder = transcoding_instance.media_player_new()
|
||||
transcoder.set_mrl(item.download_url)
|
||||
pub.sendMessage("change_status", status=_(u"Downloading {0}.").format(item.title,))
|
||||
media = transcoder.get_media()
|
||||
transcoder.play()
|
||||
while True:
|
||||
state = media.get_state()
|
||||
pub.sendMessage("change_status", status=_("Downloading {0} ({1}%).").format(item.title, int(transcoder.get_position()*100)))
|
||||
pub.sendMessage("update-progress", value=int(transcoder.get_position()*100))
|
||||
if str(state) == 'State.Ended':
|
||||
break
|
||||
elif str(state) == 'state.error':
|
||||
os.remove(temporary_path)
|
||||
break
|
||||
transcoder.release()
|
||||
os.rename(temporary_path, path)
|
||||
log.debug("Download finished sucsessfully.")
|
||||
pub.sendMessage("download_finished", file=os.path.basename(path))
|
||||
def transcode_audio(self, item, path, _format="mp3", bitrate=320, metadata=dict()):
|
||||
""" 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.
|
||||
transcoding_instance = vlc.Instance(*["--sout=#transcode{acodec=%s,ab=%d}:file{mux=raw,dst=\"%s\"}"% (_format, bitrate, temporary_path,)])
|
||||
transcoder = transcoding_instance.media_player_new()
|
||||
transcoder.set_mrl(item.download_url)
|
||||
pub.sendMessage("change_status", status=_(u"Downloading {0}.").format(item.title,))
|
||||
media = transcoder.get_media()
|
||||
transcoder.play()
|
||||
while True:
|
||||
state = media.get_state()
|
||||
pub.sendMessage("change_status", status=_("Downloading {0} ({1}%).").format(item.title, int(transcoder.get_position()*100)))
|
||||
pub.sendMessage("update-progress", value=int(transcoder.get_position()*100))
|
||||
if str(state) == 'State.Ended':
|
||||
break
|
||||
elif str(state) == 'state.error':
|
||||
os.remove(temporary_path)
|
||||
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):
|
||||
pub.sendMessage("notify", title=_("Error"), message=_("There was an error while trying to access the file you have requested."))
|
||||
def playback_error(self, event):
|
||||
pub.sendMessage("notify", title=_("Error"), message=_("There was an error while trying to access the file you have requested."))
|
||||
|
||||
def __del__(self):
|
||||
self.event_manager.event_detach(vlc.EventType.MediaPlayerEndReached)
|
||||
if hasattr(self, "event_manager"):
|
||||
self.event_manager.event_detach(vlc.EventType.MediaPlayerEncounteredError, self.playback_error)
|
||||
def __del__(self):
|
||||
self.event_manager.event_detach(vlc.EventType.MediaPlayerEndReached)
|
||||
if hasattr(self, "event_manager"):
|
||||
self.event_manager.event_detach(vlc.EventType.MediaPlayerEncounteredError, self.playback_error)
|
||||
|
||||
Reference in New Issue
Block a user