Actually implement disconnecting from the ftp server, not just visually.

Also says "disconnected" on statusbar when successfully disconnected
soywiz-archive · Sep 22, 2016 · e83e966 · e83e966 · Wantedbra · Oct 19, 2016
1 parent 001757c
commit e83e966
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/src/com/soywiz/vitaorganizer/PsvitaDevice.kt b/src/com/soywiz/vitaorganizer/PsvitaDevice.kt
@@ -86,11 +86,17 @@ object PsvitaDevice {
 
 
         retries@for (n in 0 until 5) {
-			println("Connecting to ftp $ip:$port...")
-            if (!ftp.isConnected) {
+            if (!ftp.isConnected()) {
+                println("Connecting to ftp $ip:$port...")
                 ftp.connect(ip, port)
                 ftp.login("", "")
-				println("Connected")
+                if(ftp.isConnected()) {
+				    println("Connected")
+                }
+                else {
+                    println("Could not connect ($n)");
+                    break@retries
+                }
             }
             try {
                 ftp.noop()
@@ -101,6 +107,11 @@ object PsvitaDevice {
         }
         return ftp
     }
+
+    fun disconnectFromFtp(): Boolean {
+        ftp.disconnect(true);
+        return !ftp.isConnected();
+    } 
 
     fun getGameIds() = connectedFtp().list("/ux0:/app").filter { i -> i.type == it.sauronsoftware.ftp4j.FTPFile.TYPE_DIRECTORY }.map { File(it.name).name }
 

diff --git a/src/com/soywiz/vitaorganizer/VitaOrganizer.kt b/src/com/soywiz/vitaorganizer/VitaOrganizer.kt
@@ -355,13 +355,17 @@ class VitaOrganizer : JPanel(BorderLayout()), StatusUpdater {
 				val button = this
 
 				fun disconnect() {
+                    if(PsvitaDevice.disconnectFromFtp()) {
 					connected = false
 					button.text = connectText
 					synchronized(VITA_GAME_IDS) {
 						VITA_GAME_IDS.clear()
 					}
 					updateEntries()
-					statusLabel.text = Texts.format("DISCONNECTED")
+					    updateStatus(Texts.format("DISCONNECTED"))
+                    }
+                    else
+                        println("Failed to disconnect!")
 				}
 
 				fun connect(ip: String) {