From bb2308c0c9a64a378e40d474c4b827d383fe6132 Mon Sep 17 00:00:00 2001 From: Et0h Date: Tue, 25 Aug 2015 10:01:41 +0100 Subject: [PATCH] Use first mediaSearch directory as first choice for open file initial directory, followed by directory of currently open file --- syncplay/ui/GuiConfiguration.py | 4 +++- syncplay/ui/gui.py | 8 +++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/syncplay/ui/GuiConfiguration.py b/syncplay/ui/GuiConfiguration.py index c9b5539..12996f6 100644 --- a/syncplay/ui/GuiConfiguration.py +++ b/syncplay/ui/GuiConfiguration.py @@ -229,7 +229,9 @@ class ConfigDialog(QtGui.QDialog): def browseMediapath(self): self.loadMediaBrowseSettings() options = QtGui.QFileDialog.Options() - if os.path.isdir(self.mediadirectory): + if self.config["mediaSearchDirectories"] and os.path.isdir(self.config["mediaSearchDirectories"][0]): + defaultdirectory = self.config["mediaSearchDirectories"][0] + elif os.path.isdir(self.mediadirectory): defaultdirectory = self.mediadirectory elif os.path.isdir(QDesktopServices.storageLocation(QDesktopServices.MoviesLocation)): defaultdirectory = QDesktopServices.storageLocation(QDesktopServices.MoviesLocation) diff --git a/syncplay/ui/gui.py b/syncplay/ui/gui.py index b99c94f..a19762c 100644 --- a/syncplay/ui/gui.py +++ b/syncplay/ui/gui.py @@ -417,7 +417,13 @@ class MainWindow(QtGui.QMainWindow): self.loadMediaBrowseSettings() options = QtGui.QFileDialog.Options() - if os.path.isdir(self.mediadirectory): + self.mediadirectory = "" + currentdirectory = os.path.dirname(self._syncplayClient.userlist.currentUser.file["path"]) if self._syncplayClient.userlist.currentUser.file else None + if currentdirectory and os.path.isdir(currentdirectory): + defaultdirectory = currentdirectory + elif self.config["mediaSearchDirectories"] and os.path.isdir(self.config["mediaSearchDirectories"][0]): + defaultdirectory = self.config["mediaSearchDirectories"][0] + elif os.path.isdir(self.mediadirectory): defaultdirectory = self.mediadirectory elif os.path.isdir(QtGui.QDesktopServices.storageLocation(QtGui.QDesktopServices.MoviesLocation)): defaultdirectory = QtGui.QDesktopServices.storageLocation(QtGui.QDesktopServices.MoviesLocation)