Moved into api folder + listing Sketchbook

Author: Stefterv

app/src/processing/app/Processing.kt

@@ -10,7 +10,7 @@ import com.github.ajalt.clikt.parameters.arguments.multiple
 import com.github.ajalt.clikt.parameters.options.flag
 import com.github.ajalt.clikt.parameters.options.help
 import com.github.ajalt.clikt.parameters.options.option
-import processing.app.contrib.Contributions
+import processing.app.api.Contributions
 import processing.app.ui.Start
 import java.io.File
 import java.util.prefs.Preferences

…/processing/app/contrib/Contributions.kt …/src/processing/app/api/Contributions.ktapp/src/processing/app/contrib/Contributions.kt renamed to app/src/processing/app/api/Contributions.kt app/src/processing/app/contrib/Contributions.kt renamed to app/src/processing/app/api/Contributions.kt

@@ -1,14 +1,14 @@
-package processing.app.contrib
+package processing.app.api
 
 import com.github.ajalt.clikt.command.SuspendingCliktCommand
 import com.github.ajalt.clikt.core.Context
 import com.github.ajalt.clikt.core.subcommands
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
 import processing.app.Base
+import processing.app.api.Sketch.Companion.getSketches
 import java.io.File
-import kotlinx.serialization.json.*
-
 
 class Contributions: SuspendingCliktCommand(){
     override fun help(context: Context) = "Manage Processing contributions"
@@ -47,7 +47,7 @@ class Contributions: SuspendingCliktCommand(){
             val sketches: List<Sketch> = emptyList()
         )
 
-        val serializer = Json{
+        val serializer = Json {
             prettyPrint = true
         }
 
@@ -61,7 +61,7 @@ class Contributions: SuspendingCliktCommand(){
             val javaMode = "$resourcesDir/modes/java"
             val javaModeExamples = "$javaMode/examples"
 
-            val javaExamples = getExamples(File(javaModeExamples))
+            val javaExamples = getSketches(File(javaModeExamples))
 
             val json = serializer.encodeToString(listOf(javaExamples))
             println(json)
@@ -74,22 +74,6 @@ class Contributions: SuspendingCliktCommand(){
             // Mode examples
         }
 
-        suspend fun getExamples(file: File): Folder {
-            val name = file.name
-            val (sketchesFolders, childrenFolders) = file.listFiles().partition { isExampleFolder(it) }
 
-            val children = childrenFolders.map { getExamples(it) }
-            val sketches = sketchesFolders.map { Sketch(name = it.name, path = it.absolutePath) }
-            return Folder(
-                name = name,
-                path = file.absolutePath,
-                children = children,
-                sketches = sketches
-            )
-        }
-        fun isExampleFolder(file: File): Boolean {
-            return file.isDirectory && file.listFiles().any { it.isFile && it.name.endsWith(".pde") }
-        }
     }
-}
-
+}

app/src/processing/app/api/Sketch.kt

@@ -0,0 +1,24 @@
+package processing.app.api
+
+import java.io.File
+
+class Sketch {
+    companion object{
+        fun getSketches(file: File): Contributions.ExamplesList.Folder {
+            val name = file.name
+            val (sketchesFolders, childrenFolders) = file.listFiles().partition { isSketchFolder(it) }
+
+            val children = childrenFolders.map { getSketches(it) }
+            val sketches = sketchesFolders.map { Contributions.ExamplesList.Sketch(name = it.name, path = it.absolutePath) }
+            return Contributions.ExamplesList.Folder(
+                name = name,
+                path = file.absolutePath,
+                children = children,
+                sketches = sketches
+            )
+        }
+        fun isSketchFolder(file: File): Boolean {
+            return file.isDirectory && file.listFiles().any { it.isFile && it.name.endsWith(".pde") }
+        }
+    }
+}

app/src/processing/app/api/Sketchbook.kt

@@ -0,0 +1,25 @@
+package processing.app.api
+
+import com.github.ajalt.clikt.command.SuspendingCliktCommand
+import com.github.ajalt.clikt.core.Context
+import com.github.ajalt.clikt.core.subcommands
+import processing.app.Base
+import processing.app.api.Sketch.Companion.getSketches
+
+class Sketchbook: SuspendingCliktCommand() {
+    override fun help(context: Context) = "Manage the sketchbook"
+    override suspend fun run() {
+        System.setProperty("java.awt.headless", "true")
+    }
+    init {
+        subcommands(SketchbookList())
+    }
+    class SketchbookList: SuspendingCliktCommand("list") {
+        override fun help(context: Context) = "List all sketches"
+        override suspend fun run() {
+            val sketchbookFolder = Base.getSketchbookFolder()
+
+            val sketches = getSketches(sketchbookFolder)
+        }
+    }
+}