From 888e0ce990d224094d8810122f672275f8c32374 Mon Sep 17 00:00:00 2001
From: limepotato <bm01@limepot.xyz>
Date: Sat, 17 Feb 2024 04:16:53 -0700
Subject: [PATCH] Refactor, Rename, Cleanup

---
 .idea/.name                                            |  2 +-
 .idea/checkstyle-idea.xml                              |  1 +
 README.md                                              |  2 +-
 TODO.md                                                |  1 -
 build.gradle.kts                                       |  4 ++--
 settings.gradle.kts                                    |  2 +-
 .../{kRemoteAccess => kotRemote}/Application.kt        |  4 ++--
 .../xyz/limepot/{kRemoteAccess => kotRemote}/Config.kt | 10 +++++-----
 .../jexerWindow/LoginWindow.kt                         |  4 ++--
 .../jexerWindow/WelcomeWindow.kt                       |  8 ++++----
 .../xyz/limepot/{kRemoteAccess => kotRemote}/main.kt   |  2 +-
 11 files changed, 20 insertions(+), 20 deletions(-)
 rename src/main/kotlin/xyz/limepot/{kRemoteAccess => kotRemote}/Application.kt (93%)
 rename src/main/kotlin/xyz/limepot/{kRemoteAccess => kotRemote}/Config.kt (91%)
 rename src/main/kotlin/xyz/limepot/{kRemoteAccess => kotRemote}/jexerWindow/LoginWindow.kt (98%)
 rename src/main/kotlin/xyz/limepot/{kRemoteAccess => kotRemote}/jexerWindow/WelcomeWindow.kt (89%)
 rename src/main/kotlin/xyz/limepot/{kRemoteAccess => kotRemote}/main.kt (80%)

diff --git a/.idea/.name b/.idea/.name
index b01cfe5..83df1ba 100644
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +1 @@
-org-data-accessor
\ No newline at end of file
+KRemoteAccess
\ No newline at end of file
diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml
index 8dbefe7..ae8c40d 100644
--- a/.idea/checkstyle-idea.xml
+++ b/.idea/checkstyle-idea.xml
@@ -3,6 +3,7 @@
   <component name="CheckStyle-IDEA" serialisationVersion="2">
     <checkstyleVersion>10.12.5</checkstyleVersion>
     <scanScope>JavaOnly</scanScope>
+    <scanBeforeCheckin>true</scanBeforeCheckin>
     <option name="thirdPartyClasspath" />
     <option name="activeLocationIds" />
     <option name="locations">
diff --git a/README.md b/README.md
index 0658916..d3f1176 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# KRemoteAccess
+# kotRemote
 Wrapper for sshfs, built in Kotlin, and utilizes [Jexer](https://git.ouroboros.group/limepotato/jexer)
 
 
diff --git a/TODO.md b/TODO.md
index 02e46db..308e66b 100644
--- a/TODO.md
+++ b/TODO.md
@@ -11,6 +11,5 @@
 - Probably should have logging of some sort, if something goes wrong for a board member
 ~~- Detect system (windows/linux(x11 or wayland?)/terminal?)~~ and environment, ~~then switch Jexers environment based on that~~
 ~~- Maybe make this not hardcode org servers, rebrand, allow user to customize servers (none at start),~~ and keep them saved, then open-source?
-- Rename/Rebrand
 - Allow function of a file browser in Jexer?
 - Allow function of a terminal/remote terminal in Jexer?
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index c6c7d3c..a5aa945 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -34,14 +34,14 @@ tasks {
     named<ShadowJar>("shadowJar") {
         mergeServiceFiles()
         manifest {
-            attributes(mapOf("Main-Class" to "org.bm00.kRemoteAccess.MainKt"))
+            attributes(mapOf("Main-Class" to "xyz.limepot.kotRemote.MainKt"))
         }
     }
 }
 
 val jar by tasks.getting(Jar::class) {
     manifest {
-        attributes["Main-Class"] = "org.bm00.kRemoteAccess.MainKt"
+        attributes["Main-Class"] = "xyz.limepot.kotRemote.MainKt"
     }
 }
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 96b161c..d672209 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
     id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0"
 }
-rootProject.name = "KRemoteAccess"
+rootProject.name = "kotRemote"
 
diff --git a/src/main/kotlin/xyz/limepot/kRemoteAccess/Application.kt b/src/main/kotlin/xyz/limepot/kotRemote/Application.kt
similarity index 93%
rename from src/main/kotlin/xyz/limepot/kRemoteAccess/Application.kt
rename to src/main/kotlin/xyz/limepot/kotRemote/Application.kt
index c800e84..ec2f7a3 100644
--- a/src/main/kotlin/xyz/limepot/kRemoteAccess/Application.kt
+++ b/src/main/kotlin/xyz/limepot/kotRemote/Application.kt
@@ -1,7 +1,7 @@
-package xyz.limepot.kRemoteAccess
+package xyz.limepot.kotRemote
 
 import jexer.TApplication
-import xyz.limepot.kRemoteAccess.jexerWindow.WelcomeWindow
+import xyz.limepot.kotRemote.jexerWindow.WelcomeWindow
 import java.util.*
 
 //// OS CHECKER ////
diff --git a/src/main/kotlin/xyz/limepot/kRemoteAccess/Config.kt b/src/main/kotlin/xyz/limepot/kotRemote/Config.kt
similarity index 91%
rename from src/main/kotlin/xyz/limepot/kRemoteAccess/Config.kt
rename to src/main/kotlin/xyz/limepot/kotRemote/Config.kt
index f605be1..2fcd82e 100644
--- a/src/main/kotlin/xyz/limepot/kRemoteAccess/Config.kt
+++ b/src/main/kotlin/xyz/limepot/kotRemote/Config.kt
@@ -1,4 +1,4 @@
-package xyz.limepot.kRemoteAccess
+package xyz.limepot.kotRemote
 
 import dev.dirs.ProjectDirectories
 import java.io.File
@@ -12,9 +12,9 @@ import java.util.*
 val prop = Properties()
 
 class Config {
-    val confDir = ProjectDirectories.from("org", "bm00", "osda")
+    val confDir = ProjectDirectories.from("limepot", "xyz", "kotRemote")
     val runDir = File(confDir.configDir)
-    val confFile = File(confDir.configDir + "/osda.cfg")
+    val confFile = File(confDir.configDir + "/kotRemote.cfg")
     private val prop = Properties()
     private var runDirExists = runDir.exists()
     init {
@@ -27,13 +27,13 @@ class Config {
         }
         //Otherwise create the necessary directories
         else{
-            Files.createFile(Paths.get(confDir.configDir + "/osda.cfg"))
+            Files.createFile(Paths.get(confDir.configDir + "/kotRemote.cfg"))
             FileInputStream(confFile).use {
                 prop.load(it)
                 prop.setProperty("configVersion", "1")
             }
             val out: OutputStream = FileOutputStream(confFile)
-            prop.store(out, "Org Secure Data Accessor - OSDA Config file")
+            prop.store(out, "kotRemote Config File")
         }
 
         //Set Jexer Colors
diff --git a/src/main/kotlin/xyz/limepot/kRemoteAccess/jexerWindow/LoginWindow.kt b/src/main/kotlin/xyz/limepot/kotRemote/jexerWindow/LoginWindow.kt
similarity index 98%
rename from src/main/kotlin/xyz/limepot/kRemoteAccess/jexerWindow/LoginWindow.kt
rename to src/main/kotlin/xyz/limepot/kotRemote/jexerWindow/LoginWindow.kt
index f1e3c71..330c93b 100644
--- a/src/main/kotlin/xyz/limepot/kRemoteAccess/jexerWindow/LoginWindow.kt
+++ b/src/main/kotlin/xyz/limepot/kotRemote/jexerWindow/LoginWindow.kt
@@ -1,10 +1,10 @@
-package xyz.limepot.kRemoteAccess.jexerWindow
+package xyz.limepot.kotRemote.jexerWindow
 
 import jexer.TAction
 import jexer.TApplication
 import jexer.TWindow
 import jexer.layout.StretchLayoutManager
-import xyz.limepot.kRemoteAccess.osName
+import xyz.limepot.kotRemote.osName
 import java.util.*
 
 //// OS CHECKER ////
diff --git a/src/main/kotlin/xyz/limepot/kRemoteAccess/jexerWindow/WelcomeWindow.kt b/src/main/kotlin/xyz/limepot/kotRemote/jexerWindow/WelcomeWindow.kt
similarity index 89%
rename from src/main/kotlin/xyz/limepot/kRemoteAccess/jexerWindow/WelcomeWindow.kt
rename to src/main/kotlin/xyz/limepot/kotRemote/jexerWindow/WelcomeWindow.kt
index b29d108..9ae73de 100644
--- a/src/main/kotlin/xyz/limepot/kRemoteAccess/jexerWindow/WelcomeWindow.kt
+++ b/src/main/kotlin/xyz/limepot/kotRemote/jexerWindow/WelcomeWindow.kt
@@ -1,4 +1,4 @@
-package xyz.limepot.kRemoteAccess.jexerWindow
+package xyz.limepot.kotRemote.jexerWindow
 
 import jexer.TAction
 import jexer.TApplication
@@ -6,7 +6,7 @@ import jexer.TWindow
 import jexer.layout.StretchLayoutManager
 
 class WelcomeWindow private constructor(parent: TApplication, flags: Int) :
-    TWindow(parent, "KRemoteAccess", 0, 0, 46, 8, flags) {
+    TWindow(parent, "kotRemote", 0, 0, 46, 8, flags) {
     constructor(parent: TApplication) : this(parent, CENTERED)
     init {
         layoutManager = StretchLayoutManager(
@@ -25,7 +25,7 @@ class WelcomeWindow private constructor(parent: TApplication, flags: Int) :
         addButton("Exit...", CENTERED + 28, CENTERED - 2,
             object : TAction() {
                 override fun DO() {
-                    if (xyz.limepot.kRemoteAccess.osName == "LINUX") {
+                    if (xyz.limepot.kotRemote.osName == "LINUX") {
                         ProcessBuilder("umount", "/tmp/osda_mount")
                             .redirectOutput(ProcessBuilder.Redirect.INHERIT)
                             .redirectError(ProcessBuilder.Redirect.INHERIT)
@@ -33,7 +33,7 @@ class WelcomeWindow private constructor(parent: TApplication, flags: Int) :
                             .waitFor()
                         System.exit(0)
                     }
-                    else if (xyz.limepot.kRemoteAccess.osName == "WINDOWS") {
+                    else if (xyz.limepot.kotRemote.osName == "WINDOWS") {
                         ProcessBuilder("net", "use", "O:", "/delete")
                             .redirectOutput(ProcessBuilder.Redirect.INHERIT)
                             .redirectError(ProcessBuilder.Redirect.INHERIT)
diff --git a/src/main/kotlin/xyz/limepot/kRemoteAccess/main.kt b/src/main/kotlin/xyz/limepot/kotRemote/main.kt
similarity index 80%
rename from src/main/kotlin/xyz/limepot/kRemoteAccess/main.kt
rename to src/main/kotlin/xyz/limepot/kotRemote/main.kt
index 94eb3ab..01e3988 100644
--- a/src/main/kotlin/xyz/limepot/kRemoteAccess/main.kt
+++ b/src/main/kotlin/xyz/limepot/kotRemote/main.kt
@@ -1,4 +1,4 @@
-package xyz.limepot.kRemoteAccess
+package xyz.limepot.kotRemote
 
 import java.util.*