support for listing Sketchbook

Author: Stefterv

app/src/processing/app/Processing.kt

@@ -11,6 +11,7 @@ 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.api.Contributions
+import processing.app.api.Sketchbook
 import processing.app.ui.Start
 import java.io.File
 import java.util.prefs.Preferences
@@ -50,7 +51,8 @@ suspend fun main(args: Array<String>){
         .subcommands(
             LSP(),
             LegacyCLI(args),
-            Contributions()
+            Contributions(),
+            Sketchbook()
         )
         .main(args)
 }

app/src/processing/app/api/Contributions.kt

@@ -29,23 +29,7 @@ class Contributions: SuspendingCliktCommand(){
     }
 
     class ExamplesList: SuspendingCliktCommand("list") {
-        @Serializable
-        data class Sketch(
-            val type: String = "sketch",
-            val name: String,
-            val path: String,
-            val mode: String = "java",
-        )
 
-        @Serializable
-        data class Folder(
-            val type: String = "folder",
-            val name: String,
-            val path: String,
-            val mode: String = "java",
-            val children: List<Folder> = emptyList(),
-            val sketches: List<Sketch> = emptyList()
-        )
 
         val serializer = Json {
             prettyPrint = true

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

@@ -1,16 +1,40 @@
 package processing.app.api
 
+import kotlinx.serialization.Serializable
 import java.io.File
 
 class Sketch {
     companion object{
-        fun getSketches(file: File): Contributions.ExamplesList.Folder {
+        @Serializable
+        data class Sketch(
+            val type: String = "sketch",
+            val name: String,
+            val path: String,
+            val mode: String = "java",
+        )
+
+        @Serializable
+        data class Folder(
+            val type: String = "folder",
+            val name: String,
+            val path: String,
+            val mode: String = "java",
+            val children: List<Folder> = emptyList(),
+            val sketches: List<Sketch> = emptyList()
+        )
+
+        fun getSketches(file: File, filter: (File) -> Boolean = { true }): Folder {
             val name = file.name
-            val (sketchesFolders, childrenFolders) = file.listFiles().partition { isSketchFolder(it) }
+            val (sketchesFolders, childrenFolders) = file.listFiles()?.partition { isSketchFolder(it) } ?: return Folder(
+                name = name,
+                path = file.absolutePath,
+                sketches = emptyList(),
+                children = emptyList()
+            )
 
-            val children = childrenFolders.map { getSketches(it) }
-            val sketches = sketchesFolders.map { Contributions.ExamplesList.Sketch(name = it.name, path = it.absolutePath) }
-            return Contributions.ExamplesList.Folder(
+            val children = childrenFolders.filter(filter) .map { getSketches(it) }
+            val sketches = sketchesFolders.map { Sketch(name = it.name, path = it.absolutePath) }
+            return Folder(
                 name = name,
                 path = file.absolutePath,
                 children = children,

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

@@ -3,23 +3,40 @@ 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 kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
+import processing.app.Platform
+import processing.app.Preferences
 import processing.app.api.Sketch.Companion.getSketches
+import java.io.File
 
 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") {
+        val serializer = Json {
+            prettyPrint = true
+        }
+
         override fun help(context: Context) = "List all sketches"
         override suspend fun run() {
-            val sketchbookFolder = Base.getSketchbookFolder()
+            Platform.init()
+            // TODO: Allow the user to change the sketchbook location
+            // TODO: Currently blocked since `Base.getSketchbookFolder()` is not available in headless mode
+            val sketchbookFolder = Platform.getDefaultSketchbookFolder()
 
-            val sketches = getSketches(sketchbookFolder)
+            val sketches = getSketches(sketchbookFolder.resolve("sketchbook"))
+            val json = serializer.encodeToString(listOf(sketches))
+            println(json)
         }
     }
 }