Writerside/topics/starter-topic.md

@@ -24,9 +24,4 @@ Abstraction about reading/writing to resources (filesystem, http, s3, etc pp)
 <def title="core-api">
 Defines the core interfaces
 </def>
-<def title="tui">
-Provides tui capabilities. When applied as koin modules
-the resources will automatically print a read/write progressbar
-on terminal.
-</def>
 </deflist>

app/src/main/kotlin/docthor/app/App.kt

@@ -7,7 +7,7 @@ import com.github.ajalt.clikt.parameters.options.required
 import com.github.ajalt.clikt.parameters.types.enum
 import com.github.ajalt.clikt.parameters.types.file
 import de.itkl.core_api.coreApiModule
-import de.itkl.core_api.interfaces.ProgressBarFactory
+import de.itkl.fileprocessing.ProgressBarFactory
 import de.itkl.textprocessing.textProcessingModule
 import de.itkl.tfidf.Language
 import de.itkl.tfidf.TerminalProgressBarFactory

libraries/fileprocessing/src/main/kotlin/de/itkl/fileprocessing/ProcessingPipeline.kt

@@ -1,7 +1,6 @@
 package de.itkl.fileprocessing
 
 import de.itkl.core_api.interfaces.FileProcessor
-import de.itkl.core_api.interfaces.ProgressBarFactory
 import io.github.oshai.kotlinlogging.KotlinLogging
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject

libraries/fileprocessing/src/main/kotlin/de/itkl/fileprocessing/ProgressBarFactory.kt

@@ -1,4 +1,6 @@
-package de.itkl.core_api.interfaces
+package de.itkl.fileprocessing
+
+import de.itkl.core_api.interfaces.Resource
 
 interface ProgressBarFactory {
     fun new(resource: Resource): ProgressBar

libraries/fileprocessing/src/main/kotlin/de/itkl/fileprocessing/ProgressInputStream.kt

@@ -1,6 +1,5 @@
 package de.itkl.fileprocessing
 
-import de.itkl.core_api.interfaces.ProgressBar
 import java.io.InputStream
 
 /**
@@ -12,8 +11,7 @@ import java.io.InputStream
  */
 class ProgressInputStream(
     private val inputStream: InputStream,
-    private val progressBar: ProgressBar
-) : InputStream() {
+    private val progressBar: ProgressBar) : InputStream() {
     @Volatile
     var bytesRead: Long = 0
         private set(value) {

libraries/fileprocessing/src/main/kotlin/de/itkl/fileprocessing/Resource.kt

@@ -1,8 +1,13 @@
 package de.itkl.fileprocessing
 
-import de.itkl.core_api.interfaces.ProgressBarFactory
+import de.itkl.core_api.interfaces.AbstractResource
 import de.itkl.core_api.interfaces.Resource
+import io.ktor.http.*
+import java.io.File
 import java.io.InputStream
+import java.nio.file.Files
+import java.nio.file.Path
+import kotlin.io.path.name
 
 class ProgressResource(
     private val resource: Resource,

libraries/tfidf/src/main/kotlin/de/itkl/tfidf/InverseDocumentFrequency.kt

@@ -3,7 +3,7 @@ package de.itkl.tfidf
 import com.github.doyaaaaaken.kotlincsv.dsl.csvWriter
 import de.itkl.core_api.interfaces.FileProcessor
 import de.itkl.core_api.interfaces.Resource
-import de.itkl.core_api.interfaces.ProgressBarFactory
+import de.itkl.fileprocessing.ProgressBarFactory
 import de.itkl.textprocessing.HistogramCsvStorage
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject

libraries/tfidf/src/main/kotlin/de/itkl/tfidf/TerminalProgressBarFactory.kt

@@ -4,8 +4,8 @@ import com.github.ajalt.mordant.animation.ProgressAnimation
 import com.github.ajalt.mordant.animation.progressAnimation
 import com.github.ajalt.mordant.terminal.Terminal
 import de.itkl.core_api.interfaces.Resource
-import de.itkl.core_api.interfaces.ProgressBar
-import de.itkl.core_api.interfaces.ProgressBarFactory
+import de.itkl.fileprocessing.ProgressBar
+import de.itkl.fileprocessing.ProgressBarFactory
 
 class TerminalProgressBarFactory : ProgressBarFactory {
     private val terminal = Terminal()

libraries/tui/build.gradle.kts

@@ -1,4 +0,0 @@
-dependencies {
-    api(project(":libraries:core-api"))
-    implementation("com.github.ajalt.mordant:mordant:2.2.0")
-}

libraries/tui/src/main/kotlin/de/itkl/tui/implementation/TerminalDataTableReporter.kt

@@ -1,4 +0,0 @@
-package de.itkl.tui.implementation
-
-class TerminalDataTableReporter {
-}

libraries/tui/src/main/kotlin/de/itkl/tui/implementation/TerminalProgressBar.kt

@@ -1,10 +0,0 @@
-package de.itkl.tui.implementation
-
-import de.itkl.core_api.interfaces.ResourceReadDecorator
-import java.io.InputStream
-
-class TerminalProgressBar : ResourceReadDecorator {
-    override fun decorate(length: Long, inputStream: InputStream): InputStream {
-        TODO("Not yet implemented")
-    }
-}

libraries/tui/src/main/kotlin/de/itkl/tui/tuiModule.kt

@@ -1,8 +0,0 @@
-package de.itkl.tui
-
-import org.koin.dsl.module
-
-/**
- * Add terminal ui capabilities
- */
-val tuiModule = module {  }