Rezzect/syncplay
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

(Hopefully) Allow URLs as executable path (e.g. for XBMC)

Browse Source
This commit is contained in:
Et0h 2014-11-30 11:44:43 +00:00
parent f2a5d0242e
commit d9dfffefbb
1 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
syncplay/ui/GuiConfiguration.py
View File

@ -70,6 +70,10 @@ class ConfigDialog(QtGui.QDialog):
def openHelp(self): def openHelp(self):
self.QtGui.QDesktopServices.openUrl("http://syncplay.pl/guide/client/") self.QtGui.QDesktopServices.openUrl("http://syncplay.pl/guide/client/")
def _isURL(self, path):
if "http://" in path:
return True
def _tryToFillPlayerPath(self, playerpath, playerpathlist): def _tryToFillPlayerPath(self, playerpath, playerpathlist):
settings = QSettings("Syncplay", "PlayerList") settings = QSettings("Syncplay", "PlayerList")
settings.beginGroup("PlayerList") settings.beginGroup("PlayerList")
@ -81,25 +85,38 @@ class ConfigDialog(QtGui.QDialog):
foundpath = "" foundpath = ""
if playerpath != None and playerpath != "": if playerpath != None and playerpath != "":
if not os.path.isfile(playerpath): if self._isURL(playerpath):
expandedpath = PlayerFactory().getExpandedPlayerPathByPath(playerpath)
if expandedpath != None and os.path.isfile(expandedpath):
playerpath = expandedpath
if os.path.isfile(playerpath):
foundpath = playerpath foundpath = playerpath
self.executablepathCombobox.addItem(foundpath) self.executablepathCombobox.addItem(foundpath)
else:
if not os.path.isfile(playerpath):
expandedpath = PlayerFactory().getExpandedPlayerPathByPath(playerpath)
if expandedpath != None and os.path.isfile(expandedpath):
playerpath = expandedpath
if os.path.isfile(playerpath):
foundpath = playerpath
self.executablepathCombobox.addItem(foundpath)
for path in playerpathlist: for path in playerpathlist:
if os.path.isfile(path) and os.path.normcase(os.path.normpath(path)) != os.path.normcase(os.path.normpath(foundpath)): if self._isURL(playerpath):
foundpath = path
self.executablepathCombobox.addItem(path)
elif os.path.isfile(path) and os.path.normcase(os.path.normpath(path)) != os.path.normcase(os.path.normpath(foundpath)):
self.executablepathCombobox.addItem(path) self.executablepathCombobox.addItem(path)
if foundpath == "": if foundpath == "":
foundpath = path foundpath = path
if foundpath != "": if foundpath != "":
settings.beginGroup("PlayerList") settings.beginGroup("PlayerList")
playerpathlist.append(os.path.normcase(os.path.normpath(foundpath))) if self._isURL(foundpath):
settings.setValue("PlayerList", list(set(os.path.normcase(os.path.normpath(path)) for path in set(playerpathlist)))) playerpathlist.append(foundpath)
settings.setValue("PlayerList", list(set(path) for path in set(playerpathlist)))
else:
playerpathlist.append(os.path.normcase(os.path.normpath(foundpath)))
settings.setValue("PlayerList", list(set(os.path.normcase(os.path.normpath(path)) for path in set(playerpathlist))))
settings.endGroup() settings.endGroup()
return foundpath return foundpath