fix filescanner

diff --git a/ftpbrowser/src/FTPServerManager.py b/ftpbrowser/src/FTPServerManager.py
index 2c18d67..01e1049 100644 (file)
--- a/ftpbrowser/src/FTPServerManager.py
+++ b/ftpbrowser/src/FTPServerManager.py
@@ -96,11 +96,12 @@ class FTPServer:
        def cancel(self):
                self.cfg.cancel()
 
-def ftpserverFromURI(uri, name = ""):
+def ftpserverFromURI(uri, name = "", save = True):
        scheme, host, port, path, username, password = _parse(uri, defaultPort = 21)
        
        newServer = ConfigSubsection()
-       config.plugins.ftpbrowser.server.append(newServer)
+       if save:
+               config.plugins.ftpbrowser.server.append(newServer)
        newServer.name = ConfigText(fixed_size = False)
        newServer.name.value = name or host
        newServer.address = ConfigText(fixed_size = False)
@@ -113,11 +114,12 @@ def ftpserverFromURI(uri, name = ""):
        newServer.port.value = port
        newServer.passive = ConfigYesNo(False)
 
-       newServer.save()
-       config.plugins.ftpbrowser.servercount.value += 1
-       config.plugins.ftpbrowser.servercount.save()
+       if save:
+               newServer.save()
+               config.plugins.ftpbrowser.servercount.value += 1
+               config.plugins.ftpbrowser.servercount.save()
 
-       return newServer
+       return FTPServer(newServer)
 
 class FTPServerEditor(ConfigListScreen, Screen):
        skin = """

diff --git a/ftpbrowser/src/plugin.py b/ftpbrowser/src/plugin.py
index 9a598ce..f5fe3ba 100644 (file)
--- a/ftpbrowser/src/plugin.py
+++ b/ftpbrowser/src/plugin.py
@@ -29,6 +29,7 @@ while i < config.plugins.ftpbrowser.servercount.value:
 del append, i
 
 from FTPBrowser import FTPBrowser
+from FTPServerManager import ftpserverFromURI
 
 ftpbrowser = None
 
@@ -46,7 +47,7 @@ def main(session, **kwargs):
 def filescan_chosen(session, item):
        if item:
                createSingleton(session)
-               ftpbrowser.connect(item[1])
+               ftpbrowser.connect(ftpserverFromURI(item[1], save = False))
                session.execDialog(ftpbrowser)
 
 def filescan_open_connected(res, items, session, **kwargs):