Merge pull request #12 from Shigerello/main

Add support for directory structure

Author: Serverfrog

src/main/kotlin/com/github/serverfrog/bitburnerplugin/action/BitburnerPushAction.kt

@@ -10,6 +10,6 @@ class BitburnerPushAction() : AnAction(MyBundle.message("pushActionLabel")) {
 
     override fun actionPerformed(e: AnActionEvent) {
         val file = e.dataContext.getData(CommonDataKeys.VIRTUAL_FILE)?.canonicalFile!!
-        PushToBitburner.pushToBitburner(file, e.project)
+        PushToBitburner.pushToBitburner(file, e.project!!)
     }
 }

src/main/kotlin/com/github/serverfrog/bitburnerplugin/bitburner/PushToBitburner.kt

@@ -11,6 +11,7 @@ import java.net.URI
 import java.net.http.HttpClient
 import java.net.http.HttpRequest
 import java.net.http.HttpResponse
+import java.nio.file.Paths
 import java.util.*
 
 
@@ -22,14 +23,14 @@ class PushToBitburner {
         private val notificationGroup: NotificationGroup = NotificationGroupManager.getInstance()
             .getNotificationGroup(MyBundle.message("groupId"))
 
-        fun pushToBitburner(file: VirtualFile, project: Project?) {
+        fun pushToBitburner(file: VirtualFile, project: Project) {
 
 
             val client = HttpClient.newBuilder().build()
             val request = HttpRequest.newBuilder()
                 .header("Authorization", "Bearer " + BitburnerSettings.getAuthToken())
                 .uri(uri)
-                .POST(HttpRequest.BodyPublishers.ofString(createJson(file)))
+                .POST(HttpRequest.BodyPublishers.ofString(createJson(file, project)))
                 .build()
             val response = client.send(request, HttpResponse.BodyHandlers.ofString())
             val status = response.statusCode()
@@ -42,8 +43,9 @@ class PushToBitburner {
 
         }
 
-        private fun createJson(file: VirtualFile): String {
-            val fileName = file.name.replace("/[\\\\|/]+/g", "/")
+        private fun createJson(file: VirtualFile, project: Project): String {
+            val relativePath = Paths.get(project.basePath!!).relativize(Paths.get(file.path))
+            val fileName = relativePath.toString().replace("[\\\\|/]+".toRegex(), "/")
 
             val fileContent = String(file.contentsToByteArray())
             val encode = String(Base64.getEncoder().encode(fileContent.toByteArray()))