diff --git a/src/controller/mainController.py b/src/controller/mainController.py index c44b73c..8ca5cdc 100644 --- a/src/controller/mainController.py +++ b/src/controller/mainController.py @@ -32,7 +32,7 @@ class Controller(object): # Setting up the player object player.setup() # Get main window - self.window = mainWindow.mainWindow() + self.window = mainWindow.mainWindow(extractors=[i.name for i in get_extractors()]) log.debug("Main window created") self.window.change_status(_(u"Ready")) # Here we will save results for searches as song objects. diff --git a/src/extractors/youtube.py b/src/extractors/youtube.py index 88f01c6..0ee1c6d 100644 --- a/src/extractors/youtube.py +++ b/src/extractors/youtube.py @@ -15,7 +15,7 @@ YOUTUBE_API_VERSION = "v3" log = logging.getLogger("extractors.youtube.com") class interface(object): - name = "youtube" + name = "YouTube" def __init__(self): self.results = [] diff --git a/src/wxUI/mainWindow.py b/src/wxUI/mainWindow.py index e234b1d..5fed437 100644 --- a/src/wxUI/mainWindow.py +++ b/src/wxUI/mainWindow.py @@ -32,7 +32,7 @@ class mainWindow(wx.Frame): mb.Append(help_, _(u"Help")) self.SetMenuBar(mb) - def __init__(self): + def __init__(self, extractors=[]): super(mainWindow, self).__init__(parent=None, id=wx.NewId(), title=application.name) self.Maximize(True) self.makeMenu() @@ -45,7 +45,7 @@ class mainWindow(wx.Frame): box.Add(lbl2, 0, wx.GROW) box.Add(self.text, 1, wx.GROW) box.Add(wx.StaticText(self.panel, wx.NewId(), _(u"Search in")), 0, wx.GROW) - self.extractor = wx.ComboBox(self.panel, wx.NewId(), choices=["youtube", "tidal", "mail.ru", "zaycev.net"], value="youtube", style=wx.CB_READONLY) + self.extractor = wx.ComboBox(self.panel, wx.NewId(), choices=extractors, value=extractors[0], style=wx.CB_READONLY) box.Add(self.extractor, 1, wx.GROW) self.search = wx.Button(self.panel, wx.NewId(), _(u"Search")) self.search.SetDefault()