From 445389d66699210eaac8c597d3e3b1b0f1fcb186 Mon Sep 17 00:00:00 2001
From: Kruemmelspalter <kruemmelspalter@duck.com>
Date: Sat, 28 Jan 2023 23:44:08 +0100
Subject: [PATCH 01/10] reorganize files

---
 .../backend/FileSpiderApplication.kt          | 66 ++++++----------
 .../backend/api/DocumentController.kt         |  2 +-
 .../database/{dao => }/CacheRepository.kt     |  2 +-
 .../DatabaseConfiguration.kt}                 | 76 +++++++++++--------
 .../backend/database/{model => }/Document.kt  |  2 +-
 .../database/{dao => }/DocumentRepository.kt  | 21 +++--
 .../backend/database/dao/DocumentDao.kt       | 29 -------
 .../backend/renderer/RenderCache.kt           |  2 +-
 .../file_spider/backend/renderer/Renderer.kt  |  3 +-
 .../{ => renderer}/RenderingException.kt      |  2 +-
 .../backend/services/DocumentMeta.kt          |  2 +-
 .../backend/services/DocumentService.kt       |  4 +-
 12 files changed, 87 insertions(+), 124 deletions(-)
 rename backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/database/{dao => }/CacheRepository.kt (95%)
 rename backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/{FileSpiderConfiguration.kt => database/DatabaseConfiguration.kt} (50%)
 rename backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/database/{model => }/Document.kt (82%)
 rename backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/database/{dao => }/DocumentRepository.kt (84%)
 delete mode 100644 backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/database/dao/DocumentDao.kt
 rename backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/{ => renderer}/RenderingException.kt (52%)

diff --git a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/FileSpiderApplication.kt b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/FileSpiderApplication.kt
index ef4483e..e2683ca 100644
--- a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/FileSpiderApplication.kt
+++ b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/FileSpiderApplication.kt
@@ -2,64 +2,48 @@ package me.kruemmelspalter.file_spider.backend
 
 import com.typesafe.config.ConfigFactory
 import org.slf4j.LoggerFactory
-import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration
 import org.springframework.boot.builder.SpringApplicationBuilder
-import org.springframework.boot.context.event.ApplicationReadyEvent
+import org.springframework.boot.web.server.ConfigurableWebServerFactory
+import org.springframework.boot.web.server.WebServerFactoryCustomizer
 import org.springframework.context.annotation.Bean
-import org.springframework.context.event.EventListener
-import org.springframework.core.io.ClassPathResource
-import org.springframework.core.io.support.EncodedResource
-import org.springframework.jdbc.core.JdbcTemplate
-import org.springframework.jdbc.datasource.init.ScriptUtils
+import org.springframework.data.jdbc.repository.config.AbstractJdbcConfiguration
+import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories
 import org.springframework.web.servlet.DispatcherServlet
+import org.springframework.web.servlet.config.annotation.CorsRegistry
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer
 import java.util.Properties
-import javax.sql.DataSource
 
 @SpringBootApplication
-class FileSpiderApplication {
+@Suppress("SpringComponentScan")
+@EnableJdbcRepositories(basePackages = ["com.springdata"])
+class FileSpiderApplication : WebMvcConfigurer, WebServerFactoryCustomizer<ConfigurableWebServerFactory>,
+    AbstractJdbcConfiguration() {
+
     private val logger = LoggerFactory.getLogger(javaClass)
     private val config = ConfigFactory.load()
 
-    @Autowired
-    private val dataSource: DataSource? = null
-
-    @Autowired
-    private val jdbcTemplate: JdbcTemplate? = null
-
-    @EventListener(ApplicationReadyEvent::class)
-    fun createTablesIfNonexistent() {
-        jdbcTemplate!!.queryForObject(
-            "select count(*) from information_schema.tables where table_name in ('Document', 'Tag', 'Cache')"
-        ) { rs, _ ->
-            if (rs.getInt(1) != 3) {
-                logger.warn("Not all tables 'Document', 'Tag' and 'Cache' exist; creating from init script")
-                try {
-                    ScriptUtils.executeSqlScript(
-                        dataSource!!.connection,
-                        EncodedResource(ClassPathResource(config.getString("app.initFilePath"))),
-                        true,
-                        false,
-                        "--",
-                        ";",
-                        "##/*",
-                        "*/##"
-                    )
-                } catch (e: Exception) {
-                    logger.error("could not execute init script")
-                    e.printStackTrace()
-                }
-            }
-        }
-    }
-
+    // enable OPTIONS request
     @Bean(name = [DispatcherServletAutoConfiguration.DEFAULT_DISPATCHER_SERVLET_BEAN_NAME])
     fun dispatcherServlet(): DispatcherServlet? {
         val dispatcherServlet = DispatcherServlet()
         dispatcherServlet.setDispatchOptionsRequest(true)
         return dispatcherServlet
     }
+    override fun addResourceHandlers(registry: ResourceHandlerRegistry) {
+        registry.addResourceHandler("/libs/katex/**").addResourceLocations("classpath:/katex/")
+    }
+
+    override fun customize(factory: ConfigurableWebServerFactory) {
+        factory.setPort(80)
+    }
+
+    // basically disable CORS
+    override fun addCorsMappings(registry: CorsRegistry) {
+        registry.addMapping("/**").allowedOrigins("*").allowedHeaders("*").allowedMethods("*")
+    }
 }
 
 fun main(args: Array<String>) {
diff --git a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/api/DocumentController.kt b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/api/DocumentController.kt
index 8271c97..08fd679 100644
--- a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/api/DocumentController.kt
+++ b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/api/DocumentController.kt
@@ -1,6 +1,6 @@
 package me.kruemmelspalter.file_spider.backend.api
 
-import me.kruemmelspalter.file_spider.backend.RenderingException
+import me.kruemmelspalter.file_spider.backend.renderer.RenderingException
 import me.kruemmelspalter.file_spider.backend.services.DocumentMeta
 import me.kruemmelspalter.file_spider.backend.services.DocumentService
 import me.kruemmelspalter.file_spider.backend.services.RenderedDocument
diff --git a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/database/dao/CacheRepository.kt b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/database/CacheRepository.kt
similarity index 95%
rename from backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/database/dao/CacheRepository.kt
rename to backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/database/CacheRepository.kt
index b7c6a50..a99e56b 100644
--- a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/database/dao/CacheRepository.kt
+++ b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/database/CacheRepository.kt
@@ -1,4 +1,4 @@
-package me.kruemmelspalter.file_spider.backend.database.dao
+package me.kruemmelspalter.file_spider.backend.database
 
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.dao.support.DataAccessUtils
diff --git a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/FileSpiderConfiguration.kt b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/database/DatabaseConfiguration.kt
similarity index 50%
rename from backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/FileSpiderConfiguration.kt
rename to backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/database/DatabaseConfiguration.kt
index dc7a29c..4694a89 100644
--- a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/FileSpiderConfiguration.kt
+++ b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/database/DatabaseConfiguration.kt
@@ -1,30 +1,57 @@
-package me.kruemmelspalter.file_spider.backend
+package me.kruemmelspalter.file_spider.backend.database
 
-import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
-import org.springframework.boot.web.server.ConfigurableWebServerFactory
-import org.springframework.boot.web.server.WebServerFactoryCustomizer
+import org.slf4j.LoggerFactory
+import org.springframework.boot.context.event.ApplicationReadyEvent
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
-import org.springframework.data.jdbc.repository.config.AbstractJdbcConfiguration
-import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories
+import org.springframework.context.event.EventListener
+import org.springframework.core.io.ClassPathResource
+import org.springframework.core.io.support.EncodedResource
 import org.springframework.jdbc.core.JdbcTemplate
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate
 import org.springframework.jdbc.datasource.DataSourceTransactionManager
 import org.springframework.jdbc.datasource.DriverManagerDataSource
+import org.springframework.jdbc.datasource.init.ScriptUtils
 import org.springframework.transaction.PlatformTransactionManager
-import org.springframework.web.servlet.config.annotation.CorsRegistry
-import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer
 import javax.sql.DataSource
 
-@Suppress("SpringComponentScan")
 @Configuration
-@EnableJdbcRepositories(basePackages = ["com.springdata"])
-class FileSpiderConfiguration : WebMvcConfigurer, WebServerFactoryCustomizer<ConfigurableWebServerFactory>,
-    AbstractJdbcConfiguration() {
-    val config: Config = ConfigFactory.load()
+class DatabaseConfiguration {
+    private val logger = LoggerFactory.getLogger(javaClass)
+    private val config = ConfigFactory.load()
+
+    @EventListener(ApplicationReadyEvent::class)
+    fun createTablesIfNonexistent() {
+        jdbcTemplate().queryForObject(
+            "select count(*) from information_schema.tables where table_name in ('Document', 'Tag', 'Cache')"
+        ) { rs, _ ->
+            if (rs.getInt(1) != 3) {
+                logger.warn("Not all tables 'Document', 'Tag' and 'Cache' exist; creating from init script")
+                try {
+                    ScriptUtils.executeSqlScript(
+                        dataSource().connection,
+                        EncodedResource(ClassPathResource(config.getString("app.initFilePath"))),
+                        true,
+                        false,
+                        "--",
+                        ";",
+                        "##/*",
+                        "*/##"
+                    )
+                } catch (e: Exception) {
+                    logger.error("could not execute init script")
+                    e.printStackTrace()
+                }
+            }
+        }
+    }
+
+    @Bean
+    fun jdbcTemplate(): JdbcTemplate {
+        return JdbcTemplate(dataSource())
+    }
 
     @Bean
     fun dataSource(): DataSource {
@@ -38,30 +65,13 @@ class FileSpiderConfiguration : WebMvcConfigurer, WebServerFactoryCustomizer<Con
         return dataSource
     }
 
-    @Bean
-    fun namedParameterJdbcOperations(dataSource: DataSource): NamedParameterJdbcOperations {
-        return NamedParameterJdbcTemplate(dataSource)
-    }
-
     @Bean
     fun transactionManager(dataSource: DataSource): PlatformTransactionManager {
         return DataSourceTransactionManager(dataSource)
     }
 
-    override fun addResourceHandlers(registry: ResourceHandlerRegistry) {
-        registry.addResourceHandler("/libs/katex/**").addResourceLocations("classpath:/katex/")
-    }
-
-    override fun customize(factory: ConfigurableWebServerFactory) {
-        factory.setPort(80)
-    }
-
     @Bean
-    fun jdbcTemplate(): JdbcTemplate {
-        return JdbcTemplate(dataSource())
-    }
-
-    override fun addCorsMappings(registry: CorsRegistry) {
-        registry.addMapping("/**").allowedOrigins("*").allowedHeaders("*").allowedMethods("*")
+    fun namedParameterJdbcOperations(dataSource: DataSource): NamedParameterJdbcOperations {
+        return NamedParameterJdbcTemplate(dataSource)
     }
 }
diff --git a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/database/model/Document.kt b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/database/Document.kt
similarity index 82%
rename from backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/database/model/Document.kt
rename to backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/database/Document.kt
index 2055df4..7816159 100644
--- a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/database/model/Document.kt
+++ b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/database/Document.kt
@@ -1,4 +1,4 @@
-package me.kruemmelspalter.file_spider.backend.database.model
+package me.kruemmelspalter.file_spider.backend.database
 
 import org.springframework.data.annotation.Id
 import java.sql.Timestamp
diff --git a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/database/dao/DocumentRepository.kt b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/database/DocumentRepository.kt
similarity index 84%
rename from backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/database/dao/DocumentRepository.kt
rename to backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/database/DocumentRepository.kt
index 886e67b..f3b1aa5 100644
--- a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/database/dao/DocumentRepository.kt
+++ b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/database/DocumentRepository.kt
@@ -1,6 +1,5 @@
-package me.kruemmelspalter.file_spider.backend.database.dao
+package me.kruemmelspalter.file_spider.backend.database
 
-import me.kruemmelspalter.file_spider.backend.database.model.Document
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.jdbc.core.JdbcTemplate
 import org.springframework.jdbc.core.namedparam.MapSqlParameterSource
@@ -10,7 +9,7 @@ import java.sql.ResultSet
 import java.util.UUID
 
 @Repository
-class DocumentRepository : DocumentDao {
+class DocumentRepository {
 
     @Autowired
     val jdbcTemplate: JdbcTemplate? = null
@@ -18,7 +17,7 @@ class DocumentRepository : DocumentDao {
     @Autowired
     val namedParameterJdbcOperations: NamedParameterJdbcOperations? = null
 
-    override fun getDocument(id: UUID): Document? {
+    fun getDocument(id: UUID): Document? {
         val documents = jdbcTemplate!!.query(
             "select * from Document where id = ?", { rs, _ -> documentFromResultSet(rs) }, id.toString()
         )
@@ -26,18 +25,18 @@ class DocumentRepository : DocumentDao {
         return documents[0]
     }
 
-    override fun getTags(id: UUID): List<String> {
+    fun getTags(id: UUID): List<String> {
         return jdbcTemplate!!.query(
             "select tag from Tag where document = ?", { rs, _ -> rs.getString(1) }, id.toString()
         )
     }
 
-    override fun deleteDocument(id: UUID) {
+    fun deleteDocument(id: UUID) {
         jdbcTemplate!!.update("delete from Document where id=?", id.toString())
         jdbcTemplate!!.update("delete from Tag where document=?", id.toString())
     }
 
-    override fun filterDocuments(posFilter: List<String>, negFilter: List<String>): List<Document> {
+    fun filterDocuments(posFilter: List<String>, negFilter: List<String>): List<Document> {
         if (posFilter.isEmpty()) return ArrayList()
 
         return namedParameterJdbcOperations!!.query(
@@ -53,19 +52,19 @@ class DocumentRepository : DocumentDao {
         ) { rs, _ -> documentFromResultSet(rs) }
     }
 
-    override fun removeTags(id: UUID, removeTags: List<String>) {
+    fun removeTags(id: UUID, removeTags: List<String>) {
         jdbcTemplate!!.batchUpdate("delete from Tag where document=? and tag=?", removeTags, 100) { ps, s ->
             ps.setString(1, id.toString()); ps.setString(2, s)
         }
     }
 
-    override fun addTags(id: UUID, addTags: List<String>) {
+    fun addTags(id: UUID, addTags: List<String>) {
         jdbcTemplate!!.batchUpdate("insert into Tag(document, tag) values (?,?)", addTags, 100) { ps, s ->
             ps.setString(1, id.toString()); ps.setString(2, s)
         }
     }
 
-    override fun setTitle(id: UUID, title: String) {
+    fun setTitle(id: UUID, title: String) {
         jdbcTemplate!!.update("update Document set title=? where id=?", title, id.toString())
     }
 
@@ -79,7 +78,7 @@ class DocumentRepository : DocumentDao {
         rs.getString(7)
     )
 
-    override fun createDocument(
+    fun createDocument(
         uuid: UUID,
         title: String,
         renderer: String,
diff --git a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/database/dao/DocumentDao.kt b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/database/dao/DocumentDao.kt
deleted file mode 100644
index 7b38b5e..0000000
--- a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/database/dao/DocumentDao.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package me.kruemmelspalter.file_spider.backend.database.dao
-
-import me.kruemmelspalter.file_spider.backend.database.model.Document
-import java.util.UUID
-
-interface DocumentDao {
-
-    fun getDocument(id: UUID): Document?
-
-    fun getTags(id: UUID): List<String>
-
-    fun createDocument(
-        uuid: UUID,
-        title: String,
-        renderer: String,
-        editor: String,
-        mimeType: String,
-        tags: List<String>,
-        fileExtension: String?,
-    )
-
-    fun deleteDocument(id: UUID)
-
-    fun filterDocuments(posFilter: List<String>, negFilter: List<String>): List<Document>
-    fun removeTags(id: UUID, removeTags: List<String>)
-    fun addTags(id: UUID, addTags: List<String>)
-
-    fun setTitle(id: UUID, title: String)
-}
diff --git a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/renderer/RenderCache.kt b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/renderer/RenderCache.kt
index 09cfbdb..f756692 100644
--- a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/renderer/RenderCache.kt
+++ b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/renderer/RenderCache.kt
@@ -1,6 +1,6 @@
 package me.kruemmelspalter.file_spider.backend.renderer
 
-import me.kruemmelspalter.file_spider.backend.database.dao.CacheRepository
+import me.kruemmelspalter.file_spider.backend.database.CacheRepository
 import me.kruemmelspalter.file_spider.backend.services.FileSystemService
 import me.kruemmelspalter.file_spider.backend.services.RenderedDocument
 import org.springframework.beans.factory.annotation.Autowired
diff --git a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/renderer/Renderer.kt b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/renderer/Renderer.kt
index c27c48e..a291b9e 100644
--- a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/renderer/Renderer.kt
+++ b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/renderer/Renderer.kt
@@ -1,7 +1,6 @@
 package me.kruemmelspalter.file_spider.backend.renderer
 
-import me.kruemmelspalter.file_spider.backend.RenderingException
-import me.kruemmelspalter.file_spider.backend.database.model.Document
+import me.kruemmelspalter.file_spider.backend.database.Document
 import me.kruemmelspalter.file_spider.backend.services.FileSystemService
 import me.kruemmelspalter.file_spider.backend.services.RenderedDocument
 import org.springframework.util.FileSystemUtils
diff --git a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/RenderingException.kt b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/renderer/RenderingException.kt
similarity index 52%
rename from backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/RenderingException.kt
rename to backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/renderer/RenderingException.kt
index dce7d2c..b388f2c 100644
--- a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/RenderingException.kt
+++ b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/renderer/RenderingException.kt
@@ -1,3 +1,3 @@
-package me.kruemmelspalter.file_spider.backend
+package me.kruemmelspalter.file_spider.backend.renderer
 
 class RenderingException(msg: String) : RuntimeException(msg)
diff --git a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/services/DocumentMeta.kt b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/services/DocumentMeta.kt
index ef71fb0..1d0c0e8 100644
--- a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/services/DocumentMeta.kt
+++ b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/services/DocumentMeta.kt
@@ -1,6 +1,6 @@
 package me.kruemmelspalter.file_spider.backend.services
 
-import me.kruemmelspalter.file_spider.backend.database.model.Document
+import me.kruemmelspalter.file_spider.backend.database.Document
 import java.sql.Timestamp
 import java.util.UUID
 
diff --git a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/services/DocumentService.kt b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/services/DocumentService.kt
index 46ddbb2..44718ae 100644
--- a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/services/DocumentService.kt
+++ b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/services/DocumentService.kt
@@ -1,8 +1,8 @@
 package me.kruemmelspalter.file_spider.backend.services
 
 import com.fasterxml.uuid.Generators
-import me.kruemmelspalter.file_spider.backend.database.dao.DocumentRepository
-import me.kruemmelspalter.file_spider.backend.database.model.Document
+import me.kruemmelspalter.file_spider.backend.database.Document
+import me.kruemmelspalter.file_spider.backend.database.DocumentRepository
 import me.kruemmelspalter.file_spider.backend.renderer.RenderCache
 import me.kruemmelspalter.file_spider.backend.renderer.Renderer
 import org.springframework.beans.factory.annotation.Autowired

From 6f29bdbf85b74b19b44187e309b13e0553d743e7 Mon Sep 17 00:00:00 2001
From: Kruemmelspalter <kruemmelspalter@duck.com>
Date: Sat, 28 Jan 2023 23:45:02 +0100
Subject: [PATCH 02/10] add dockerignore to frontend (just copied gitignore)

---
 frontend/.dockerignore | 90 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 90 insertions(+)
 create mode 100644 frontend/.dockerignore

diff --git a/frontend/.dockerignore b/frontend/.dockerignore
new file mode 100644
index 0000000..cc1629e
--- /dev/null
+++ b/frontend/.dockerignore
@@ -0,0 +1,90 @@
+# Created by .ignore support plugin (hsz.mobi)
+### Node template
+# Logs
+/logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# TypeScript v1 declaration files
+typings/
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variables file
+.env
+
+# parcel-bundler cache (https://parceljs.org/)
+# .cache
+
+# next.js build output
+# .next
+
+# nuxt.js build output
+# .nuxt
+
+# Nuxt generate
+# dist
+
+# vuepress build output
+.vuepress/dist
+
+# Serverless directories
+.serverless
+
+# IDE / Editor
+.idea
+
+# Service worker
+sw.*
+
+# macOS
+.DS_Store
+
+# Vim swap files
+*.swp

From 985c1ac34c9eba30fafe46746470489799c004eb Mon Sep 17 00:00:00 2001
From: Kruemmelspalter <kruemmelspalter@duck.com>
Date: Sat, 28 Jan 2023 23:53:19 +0100
Subject: [PATCH 03/10] extract renderer selection logic to renderer service

---
 .../backend/renderer/RenderService.kt         | 39 +++++++++++++++++
 .../file_spider/backend/renderer/Renderer.kt  | 35 +++-------------
 .../backend/services/DocumentService.kt       | 42 +++++++++----------
 3 files changed, 66 insertions(+), 50 deletions(-)
 create mode 100644 backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/renderer/RenderService.kt

diff --git a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/renderer/RenderService.kt b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/renderer/RenderService.kt
new file mode 100644
index 0000000..98778a0
--- /dev/null
+++ b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/renderer/RenderService.kt
@@ -0,0 +1,39 @@
+package me.kruemmelspalter.file_spider.backend.renderer
+
+import me.kruemmelspalter.file_spider.backend.database.Document
+import me.kruemmelspalter.file_spider.backend.services.FileSystemService
+import me.kruemmelspalter.file_spider.backend.services.RenderedDocument
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.stereotype.Service
+
+@Service
+class RenderService {
+    @Autowired
+    private lateinit var fsService: FileSystemService
+
+    @Autowired
+    private lateinit var renderCache: RenderCache
+
+    fun renderDocument(document: Document): RenderedDocument? {
+        return getRenderer(document).render(document, fsService, renderCache)
+    }
+
+    fun getRenderer(document: Document): Renderer {
+        return when (document.renderer) {
+            "plain" -> Renderer.plainRenderer
+            "markdown", "md" -> Renderer.markdownRenderer
+            "tex", "latex" -> Renderer.latexRenderer
+            "xournal", "xournalpp" -> Renderer.xournalppRenderer
+            "html" -> Renderer.htmlRenderer
+            "renderer" -> Renderer.ebookRenderer
+            else -> when (document.mimeType) {
+                "application/x-tex", "application/x-latex" -> Renderer.latexRenderer
+                "text/markdown" -> Renderer.markdownRenderer
+                "application/x-xopp" -> Renderer.xournalppRenderer
+                "text/html" -> Renderer.htmlRenderer
+                "application/zip+epub" -> Renderer.ebookRenderer
+                else -> Renderer.plainRenderer
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/renderer/Renderer.kt b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/renderer/Renderer.kt
index a291b9e..e67ec6c 100644
--- a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/renderer/Renderer.kt
+++ b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/renderer/Renderer.kt
@@ -17,7 +17,7 @@ class Renderer {
     private val renderSteps: MutableList<(RenderMeta) -> Unit> = mutableListOf()
 
     companion object {
-        private val plainRenderer = Renderer().output {
+        internal val plainRenderer = Renderer().output {
             RenderedDocument(
                 FileInputStream(it.fsService.getFileFromID(it.document.id, it.document.fileExtension)),
                 it.document.mimeType,
@@ -26,10 +26,10 @@ class Renderer {
             )
         }
 
-        private val htmlRenderer =
+        internal val htmlRenderer =
             Renderer().tempDir().resolveLinks().outputFile("text/html", "html") { it.fileName }
 
-        private val markdownRenderer =
+        internal val markdownRenderer =
             Renderer().tempDir()
                 .copy({ it.fileName }, { "tmp0.md" })
                 .command(2) {
@@ -57,7 +57,7 @@ class Renderer {
                 }
                 .resolveLinks { "out.html" }.outputFile("text/html", "html") { "out.html" }
 
-        private val latexRenderer = Renderer().tempDir().command(10) {
+        internal val latexRenderer = Renderer().tempDir().command(10) {
             listOf(
                 "bash",
                 "-c",
@@ -65,7 +65,7 @@ class Renderer {
             )
         }.outputFile("application/pdf", "pdf") { "out.pdf" }
 
-        private val xournalppRenderer =
+        internal val xournalppRenderer =
             Renderer().tempDir().command(2) {
                 listOf(
                     "sh",
@@ -76,34 +76,11 @@ class Renderer {
                 .command(10) { listOf("xournalpp", "-p", "out.pdf", "tmp.xopp") }
                 .outputFile("application/pdf", "pdf") { "out.pdf" }
 
-        private val ebookRenderer = Renderer().tempDir()
+        internal val ebookRenderer = Renderer().tempDir()
             .command(15, mapOf("QTWEBENGINE_CHROMIUM_FLAGS" to "--no-sandbox")) {
                 listOf("ebook-convert", it.fileName, "out.pdf")
             }
             .outputFile("application/pdf", "pdf") { "out.pdf" }
-
-        private val mimeSpecificRenderer = Renderer().useRenderer {
-            when (it.document.mimeType) {
-                "application/x-tex", "application/x-latex" -> latexRenderer
-                "text/markdown" -> markdownRenderer
-                "application/x-xopp" -> xournalppRenderer
-                "text/html" -> htmlRenderer
-                "application/zip+epub" -> ebookRenderer
-                else -> plainRenderer
-            }
-        }
-
-        fun getRenderer(rendererName: String): Renderer {
-            return when (rendererName) {
-                "plain" -> plainRenderer
-                "markdown", "md" -> markdownRenderer
-                "tex", "latex" -> latexRenderer
-                "xournal", "xournalpp" -> xournalppRenderer
-                "html" -> htmlRenderer
-                "renderer" -> ebookRenderer
-                else -> mimeSpecificRenderer
-            }
-        }
     }
 
     fun addStep(step: (RenderMeta) -> Unit): Renderer {
diff --git a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/services/DocumentService.kt b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/services/DocumentService.kt
index 44718ae..0250c78 100644
--- a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/services/DocumentService.kt
+++ b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/services/DocumentService.kt
@@ -4,6 +4,7 @@ import com.fasterxml.uuid.Generators
 import me.kruemmelspalter.file_spider.backend.database.Document
 import me.kruemmelspalter.file_spider.backend.database.DocumentRepository
 import me.kruemmelspalter.file_spider.backend.renderer.RenderCache
+import me.kruemmelspalter.file_spider.backend.renderer.RenderService
 import me.kruemmelspalter.file_spider.backend.renderer.Renderer
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.core.io.Resource
@@ -16,50 +17,49 @@ import javax.servlet.ServletContext
 @Service
 class DocumentService {
 
-    private val uuidGenerator = Generators.timeBasedGenerator()!!
+    private val uuidGenerator = Generators.timeBasedGenerator()
 
     @Autowired
-    val documentRepository: DocumentRepository? = null
+    private lateinit var documentRepository: DocumentRepository
 
     @Autowired
-    val fsService: FileSystemService? = null
+    private lateinit var renderService: RenderService
 
     @Autowired
-    private lateinit var renderCache: RenderCache
+    private lateinit var fsService: FileSystemService
 
     fun getDocumentMeta(id: UUID): DocumentMeta? {
-        val document = documentRepository!!.getDocument(id)
+        val document = documentRepository.getDocument(id)
         return documentToMeta(document ?: return null)
     }
 
     private fun documentToMeta(document: Document): DocumentMeta {
-        val attributes = fsService!!.getFileAttributesFromID(document.id, document.fileExtension)
+        val attributes = fsService.getFileAttributesFromID(document.id, document.fileExtension)
         return DocumentMeta(
             document,
             Timestamp(attributes.creationTime().toMillis()),
             Timestamp(attributes.lastModifiedTime().toMillis()),
             Timestamp(attributes.lastAccessTime().toMillis()),
-            documentRepository!!.getTags(document.id)
+            documentRepository.getTags(document.id)
         )
     }
 
     fun filterDocuments(posFilter: List<String>, negFilter: List<String>): List<DocumentMeta> {
-        return documentRepository!!.filterDocuments(posFilter, negFilter).map { documentToMeta(it) }
+        return documentRepository.filterDocuments(posFilter, negFilter).map { documentToMeta(it) }
     }
 
     fun renderDocument(id: UUID): RenderedDocument? {
-        val document = documentRepository!!.getDocument(id)
-        return if (document == null) null else Renderer.getRenderer(document.renderer).render(document, fsService!!, renderCache)
+        return renderService.renderDocument(documentRepository.getDocument(id) ?: return null)
     }
 
     fun readDocumentLog(id: UUID): InputStream? {
-        documentRepository!!.getDocument(id) ?: return null
+        documentRepository.getDocument(id) ?: return null
 
-        return fsService!!.readLog(id)
+        return fsService.readLog(id)
     }
 
     fun setTitle(id: UUID, title: String) {
-        documentRepository!!.setTitle(id, title)
+        documentRepository.setTitle(id, title)
     }
 
     fun createDocument(
@@ -73,7 +73,7 @@ class DocumentService {
     ): UUID {
         val uuid = uuidGenerator.generate()
 
-        documentRepository!!.createDocument(
+        documentRepository.createDocument(
             uuid,
             title ?: "Untitled",
             renderer ?: "plain",
@@ -83,9 +83,9 @@ class DocumentService {
             fileExtension,
         )
 
-        fsService!!.createDocument(uuid, fileExtension)
+        fsService.createDocument(uuid, fileExtension)
         if (content != null) {
-            fsService!!.writeToDocument(uuid, fileExtension, content)
+            fsService.writeToDocument(uuid, fileExtension, content)
             content.close()
         }
 
@@ -93,19 +93,19 @@ class DocumentService {
     }
 
     fun addTags(id: UUID, addTags: List<String>) {
-        documentRepository!!.addTags(id, addTags)
+        documentRepository.addTags(id, addTags)
     }
 
     fun removeTags(id: UUID, removeTags: List<String>) {
-        documentRepository!!.removeTags(id, removeTags)
+        documentRepository.removeTags(id, removeTags)
     }
 
     fun deleteDocument(id: UUID) {
-        documentRepository!!.deleteDocument(id)
-        fsService!!.deleteDocument(id)
+        documentRepository.deleteDocument(id)
+        fsService.deleteDocument(id)
     }
 
     fun getDocumentResource(id: UUID, fileName: String, servletContext: ServletContext): Resource? {
-        return fsService!!.getDocumentResource(id, fileName, servletContext)
+        return fsService.getDocumentResource(id, fileName, servletContext)
     }
 }

From 8c51df6dc4ddc1819d9732bf3a78ff3b33fe0c81 Mon Sep 17 00:00:00 2001
From: Kruemmelspalter <kruemmelspalter@duck.com>
Date: Sun, 29 Jan 2023 00:18:26 +0100
Subject: [PATCH 04/10] set render log content type to plain text

---
 .../backend/api/DocumentController.kt         | 44 +++++++++----------
 .../backend/database/DocumentRepository.kt    | 24 +++++-----
 .../backend/renderer/RenderService.kt         |  2 +-
 .../backend/services/DocumentService.kt       |  2 -
 4 files changed, 34 insertions(+), 38 deletions(-)

diff --git a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/api/DocumentController.kt b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/api/DocumentController.kt
index 08fd679..a9c1e10 100644
--- a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/api/DocumentController.kt
+++ b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/api/DocumentController.kt
@@ -33,19 +33,16 @@ import javax.servlet.http.HttpServletRequest
 class DocumentController {
 
     @Autowired
-    val documentService: DocumentService? = null
+    private lateinit var documentService: DocumentService
 
     @GetMapping("/")
     fun searchDocuments(@RequestParam("filter") filterString: String): List<DocumentMeta> {
-        if (!Pattern.matches(
-                "^!?\\p{L}+(?:,!?\\p{L}+)*\$",
-                filterString
-            )
-        ) throw ResponseStatusException(HttpStatus.BAD_REQUEST)
+        if (!Pattern.matches("^!?\\p{L}+(?:,!?\\p{L}+)*\$", filterString))
+            throw ResponseStatusException(HttpStatus.BAD_REQUEST)
 
         val filters = filterString.split(",")
 
-        return documentService!!.filterDocuments(
+        return documentService.filterDocuments(
             filters.filter { !it.startsWith("!") },
             filters.filter { it.startsWith("!") }.map { it.substring(1) }
         )
@@ -62,29 +59,30 @@ class DocumentController {
         @RequestParam fileExtension: String?,
     ): String {
         if (mimeType == null && file == null) throw ResponseStatusException(HttpStatus.BAD_REQUEST)
-        val uuid = if (file != null)
-            documentService!!.createDocument(title, renderer, editor, mimeType ?: file.contentType, tags, fileExtension, file.inputStream)
-        else documentService!!.createDocument(title, renderer, editor, mimeType!!, tags, fileExtension, null)
+        val uuid = if (file != null) documentService.createDocument(
+            title, renderer, editor, mimeType ?: file.contentType, tags, fileExtension, file.inputStream
+        )
+        else documentService.createDocument(title, renderer, editor, mimeType!!, tags, fileExtension, null)
         return uuid.toString()
     }
 
     @GetMapping("/{id}")
     fun getDocumentMeta(@PathVariable("id") documentId: UUID): DocumentMeta {
-        return documentService!!.getDocumentMeta(documentId) ?: throw ResponseStatusException(HttpStatus.NOT_FOUND)
+        return documentService.getDocumentMeta(documentId) ?: throw ResponseStatusException(HttpStatus.NOT_FOUND)
     }
 
     data class DocumentChange(val addTags: List<String>?, val removeTags: List<String>?, val title: String?)
 
     @PatchMapping("/{id}")
     fun changeDocumentTags(@PathVariable id: UUID, @RequestBody change: DocumentChange) {
-        if (change.addTags != null) documentService!!.addTags(id, change.addTags)
-        if (change.removeTags != null) documentService!!.removeTags(id, change.removeTags)
-        if (change.title != null) documentService!!.setTitle(id, change.title)
+        if (change.addTags != null) documentService.addTags(id, change.addTags)
+        if (change.removeTags != null) documentService.removeTags(id, change.removeTags)
+        if (change.title != null) documentService.setTitle(id, change.title)
     }
 
     @DeleteMapping("/{id}")
     fun deleteDocument(@PathVariable id: UUID) {
-        documentService!!.deleteDocument(id)
+        documentService.deleteDocument(id)
     }
 
     @GetMapping("/{id}/rendered")
@@ -94,7 +92,7 @@ class DocumentController {
     ): ResponseEntity<Resource> {
 
         val renderedDocument: RenderedDocument =
-            documentService!!.renderDocument(documentId) ?: throw ResponseStatusException(HttpStatus.NOT_FOUND)
+            documentService.renderDocument(documentId) ?: throw ResponseStatusException(HttpStatus.NOT_FOUND)
 
         val headers = HttpHeaders()
         headers.contentType = MediaType.parseMediaType(renderedDocument.contentType)
@@ -102,10 +100,7 @@ class DocumentController {
         if (download == true) headers.contentDisposition =
             ContentDisposition.parse("attachment; filename=" + renderedDocument.fileName)
 
-        return ResponseEntity
-            .status(HttpStatus.OK)
-            .headers(headers)
-            .body(InputStreamResource(renderedDocument.stream))
+        return ResponseEntity.status(HttpStatus.OK).headers(headers).body(InputStreamResource(renderedDocument.stream))
     }
 
     @GetMapping("/{id}/rendered/{file}")
@@ -114,18 +109,21 @@ class DocumentController {
         @PathVariable("file") fileName: String,
         request: HttpServletRequest
     ): Resource? {
-        return documentService!!.getDocumentResource(documentId, fileName, request.servletContext)
+        return documentService.getDocumentResource(documentId, fileName, request.servletContext)
     }
 
     @GetMapping("/{id}/renderlog")
     fun getRenderLog(@PathVariable id: UUID): InputStreamResource {
         return InputStreamResource(
-            documentService!!.readDocumentLog(id) ?: throw ResponseStatusException(HttpStatus.NOT_FOUND)
+            documentService.readDocumentLog(id) ?: throw ResponseStatusException(HttpStatus.NOT_FOUND)
         )
     }
 
     @ExceptionHandler(value = [RenderingException::class])
     fun renderingException(exception: RenderingException?): ResponseEntity<String> {
-        return ResponseEntity(exception!!.message, HttpStatus.INTERNAL_SERVER_ERROR)
+        return ResponseEntity
+            .internalServerError()
+            .contentType(MediaType.TEXT_PLAIN)
+            .body(exception?.message)
     }
 }
diff --git a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/database/DocumentRepository.kt b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/database/DocumentRepository.kt
index f3b1aa5..67c1b34 100644
--- a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/database/DocumentRepository.kt
+++ b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/database/DocumentRepository.kt
@@ -12,13 +12,13 @@ import java.util.UUID
 class DocumentRepository {
 
     @Autowired
-    val jdbcTemplate: JdbcTemplate? = null
+    private lateinit var jdbcTemplate: JdbcTemplate
 
     @Autowired
-    val namedParameterJdbcOperations: NamedParameterJdbcOperations? = null
+    private lateinit var namedParameterJdbcOperations: NamedParameterJdbcOperations
 
     fun getDocument(id: UUID): Document? {
-        val documents = jdbcTemplate!!.query(
+        val documents = jdbcTemplate.query(
             "select * from Document where id = ?", { rs, _ -> documentFromResultSet(rs) }, id.toString()
         )
         if (documents.size != 1) return null
@@ -26,20 +26,20 @@ class DocumentRepository {
     }
 
     fun getTags(id: UUID): List<String> {
-        return jdbcTemplate!!.query(
+        return jdbcTemplate.query(
             "select tag from Tag where document = ?", { rs, _ -> rs.getString(1) }, id.toString()
         )
     }
 
     fun deleteDocument(id: UUID) {
-        jdbcTemplate!!.update("delete from Document where id=?", id.toString())
-        jdbcTemplate!!.update("delete from Tag where document=?", id.toString())
+        jdbcTemplate.update("delete from Document where id=?", id.toString())
+        jdbcTemplate.update("delete from Tag where document=?", id.toString())
     }
 
     fun filterDocuments(posFilter: List<String>, negFilter: List<String>): List<Document> {
         if (posFilter.isEmpty()) return ArrayList()
 
-        return namedParameterJdbcOperations!!.query(
+        return namedParameterJdbcOperations.query(
             "select Document.* from Document left join (select document, count(tag) as tagCount from Tag where " +
                 "tag in (:posTags) group by document) as postags on postags.document = Document.id " +
                 (
@@ -53,19 +53,19 @@ class DocumentRepository {
     }
 
     fun removeTags(id: UUID, removeTags: List<String>) {
-        jdbcTemplate!!.batchUpdate("delete from Tag where document=? and tag=?", removeTags, 100) { ps, s ->
+        jdbcTemplate.batchUpdate("delete from Tag where document=? and tag=?", removeTags, 100) { ps, s ->
             ps.setString(1, id.toString()); ps.setString(2, s)
         }
     }
 
     fun addTags(id: UUID, addTags: List<String>) {
-        jdbcTemplate!!.batchUpdate("insert into Tag(document, tag) values (?,?)", addTags, 100) { ps, s ->
+        jdbcTemplate.batchUpdate("insert into Tag(document, tag) values (?,?)", addTags, 100) { ps, s ->
             ps.setString(1, id.toString()); ps.setString(2, s)
         }
     }
 
     fun setTitle(id: UUID, title: String) {
-        jdbcTemplate!!.update("update Document set title=? where id=?", title, id.toString())
+        jdbcTemplate.update("update Document set title=? where id=?", title, id.toString())
     }
 
     private fun documentFromResultSet(rs: ResultSet) = Document(
@@ -88,7 +88,7 @@ class DocumentRepository {
         fileExtension: String?,
     ) {
 
-        if (jdbcTemplate!!.update(
+        if (jdbcTemplate.update(
                 "insert into Document (id, title, renderer, editor, mimeType, fileExtension) values (?,?,?,?,?,?)",
                 uuid.toString(),
                 title,
@@ -99,7 +99,7 @@ class DocumentRepository {
             ) != 1
         ) throw RuntimeException("document creation did not work / didn't affect one row")
 
-        jdbcTemplate!!.batchUpdate("insert into Tag (tag, document) values (?, ?)", tags, 100) { ps, s ->
+        jdbcTemplate.batchUpdate("insert into Tag (tag, document) values (?, ?)", tags, 100) { ps, s ->
             ps.setString(1, s); ps.setString(2, uuid.toString())
         }
     }
diff --git a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/renderer/RenderService.kt b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/renderer/RenderService.kt
index 98778a0..ed4a81d 100644
--- a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/renderer/RenderService.kt
+++ b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/renderer/RenderService.kt
@@ -36,4 +36,4 @@ class RenderService {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/services/DocumentService.kt b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/services/DocumentService.kt
index 0250c78..0763f73 100644
--- a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/services/DocumentService.kt
+++ b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/services/DocumentService.kt
@@ -3,9 +3,7 @@ package me.kruemmelspalter.file_spider.backend.services
 import com.fasterxml.uuid.Generators
 import me.kruemmelspalter.file_spider.backend.database.Document
 import me.kruemmelspalter.file_spider.backend.database.DocumentRepository
-import me.kruemmelspalter.file_spider.backend.renderer.RenderCache
 import me.kruemmelspalter.file_spider.backend.renderer.RenderService
-import me.kruemmelspalter.file_spider.backend.renderer.Renderer
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.core.io.Resource
 import org.springframework.stereotype.Service

From 1beb87dffff0d7a12d69f40b6a91f88dc241e0dc Mon Sep 17 00:00:00 2001
From: Kruemmelspalter <kruemmelspalter@duck.com>
Date: Sun, 29 Jan 2023 00:28:40 +0100
Subject: [PATCH 05/10] adjust height

---
 frontend/components/DocumentDisplay.vue | 2 +-
 frontend/package.json                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/components/DocumentDisplay.vue b/frontend/components/DocumentDisplay.vue
index 7559ff1..606f859 100644
--- a/frontend/components/DocumentDisplay.vue
+++ b/frontend/components/DocumentDisplay.vue
@@ -156,7 +156,7 @@ export default {
 #document-content {
   width: 100%;
   height: 100%;
-  min-height: 80vh;
+  min-height: 78.3vh;
   border: none;
 }
 
diff --git a/frontend/package.json b/frontend/package.json
index 5640b57..aaa37f7 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "private": true,
   "scripts": {
-    "dev": "NODE_OPTIONS=--openssl-legacy-provider nuxt",
+    "dev": "nuxt",
     "build": "NODE_OPTIONS=--openssl-legacy-provider nuxt build",
     "start": "NODE_OPTIONS=--openssl-legacy-provider nuxt start",
     "generate": "NODE_OPTIONS=--openssl-legacy-provider nuxt generate",

From 1e4d5cb9b681579d486144ce2dfef3b38354318c Mon Sep 17 00:00:00 2001
From: Kruemmelspalter <kruemmelspalter@duck.com>
Date: Sun, 29 Jan 2023 01:16:17 +0100
Subject: [PATCH 06/10] add debug and trace logs, add option to disable caching
 for rendering temporarily

---
 .../backend/FileSpiderApplication.kt          |   1 +
 .../backend/api/DocumentController.kt         |  10 +-
 .../backend/renderer/RenderCache.kt           |  18 ++-
 .../backend/renderer/RenderService.kt         |   9 +-
 .../file_spider/backend/renderer/Renderer.kt  | 126 ++++++++++--------
 .../backend/services/DocumentService.kt       |   4 +-
 6 files changed, 102 insertions(+), 66 deletions(-)

diff --git a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/FileSpiderApplication.kt b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/FileSpiderApplication.kt
index e2683ca..4fcf865 100644
--- a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/FileSpiderApplication.kt
+++ b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/FileSpiderApplication.kt
@@ -32,6 +32,7 @@ class FileSpiderApplication : WebMvcConfigurer, WebServerFactoryCustomizer<Confi
         dispatcherServlet.setDispatchOptionsRequest(true)
         return dispatcherServlet
     }
+
     override fun addResourceHandlers(registry: ResourceHandlerRegistry) {
         registry.addResourceHandler("/libs/katex/**").addResourceLocations("classpath:/katex/")
     }
diff --git a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/api/DocumentController.kt b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/api/DocumentController.kt
index a9c1e10..f153707 100644
--- a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/api/DocumentController.kt
+++ b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/api/DocumentController.kt
@@ -4,6 +4,7 @@ import me.kruemmelspalter.file_spider.backend.renderer.RenderingException
 import me.kruemmelspalter.file_spider.backend.services.DocumentMeta
 import me.kruemmelspalter.file_spider.backend.services.DocumentService
 import me.kruemmelspalter.file_spider.backend.services.RenderedDocument
+import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.core.io.InputStreamResource
 import org.springframework.core.io.Resource
@@ -32,6 +33,8 @@ import javax.servlet.http.HttpServletRequest
 @RequestMapping("/document")
 class DocumentController {
 
+    private val logger = LoggerFactory.getLogger(javaClass)
+
     @Autowired
     private lateinit var documentService: DocumentService
 
@@ -88,11 +91,12 @@ class DocumentController {
     @GetMapping("/{id}/rendered")
     fun getRenderedDocument(
         @PathVariable("id") documentId: UUID,
-        @RequestParam("download") download: Boolean?
+        @RequestParam download: Boolean?,
+        @RequestParam cache: Boolean?,
     ): ResponseEntity<Resource> {
 
-        val renderedDocument: RenderedDocument =
-            documentService.renderDocument(documentId) ?: throw ResponseStatusException(HttpStatus.NOT_FOUND)
+        val renderedDocument: RenderedDocument = documentService.renderDocument(documentId, cache ?: true)
+            ?: throw ResponseStatusException(HttpStatus.NOT_FOUND)
 
         val headers = HttpHeaders()
         headers.contentType = MediaType.parseMediaType(renderedDocument.contentType)
diff --git a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/renderer/RenderCache.kt b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/renderer/RenderCache.kt
index f756692..981ef50 100644
--- a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/renderer/RenderCache.kt
+++ b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/renderer/RenderCache.kt
@@ -3,6 +3,7 @@ package me.kruemmelspalter.file_spider.backend.renderer
 import me.kruemmelspalter.file_spider.backend.database.CacheRepository
 import me.kruemmelspalter.file_spider.backend.services.FileSystemService
 import me.kruemmelspalter.file_spider.backend.services.RenderedDocument
+import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Service
 import java.io.FileInputStream
@@ -17,6 +18,8 @@ import java.util.UUID
 @Service
 class RenderCache {
 
+    private val logger = LoggerFactory.getLogger(javaClass)
+
     @Autowired
     private lateinit var fsService: FileSystemService
 
@@ -24,11 +27,17 @@ class RenderCache {
     private lateinit var cacheRepository: CacheRepository
 
     fun isCacheValid(id: UUID): Boolean {
-        return computeHash(id).contentEquals(cacheRepository.getCacheEntry(id)?.hash)
+        logger.debug("validating cache for id $id")
+        val computedHash = computeHash(id)
+        val cachedHash = cacheRepository.getCacheEntry(id)?.hash
+        val isValid = computedHash.contentEquals(cachedHash)
+        logger.debug("computed: ${computedHash.toHex()} cached: ${cachedHash?.toHex()} valid: $isValid")
+        return isValid
     }
 
     fun getCachedRender(id: UUID): RenderedDocument? {
         val cacheEntry = cacheRepository.getCacheEntry(id) ?: return null
+        logger.trace("serving cached file ${Paths.get(fsService.getCacheDirectory().toString(), id.toString())}")
         return RenderedDocument(
             FileInputStream(Paths.get(fsService.getCacheDirectory().toString(), id.toString()).toFile()),
             cacheEntry.mimeType,
@@ -41,6 +50,7 @@ class RenderCache {
     }
 
     fun cacheRender(id: UUID, renderedDocument: RenderedDocument?): RenderedDocument? {
+        logger.debug("setting cache entry for id $id")
         if (renderedDocument == null) return null
         val cacheFile = Paths.get(fsService.getCacheDirectory().toString(), id.toString()).toFile()
         val outStream = FileOutputStream(cacheFile)
@@ -50,16 +60,18 @@ class RenderCache {
         return RenderedDocument(
             FileInputStream(cacheFile),
             renderedDocument.contentType,
-            renderedDocument.contentLength,
+            Files.readAttributes(cacheFile.toPath(), BasicFileAttributes::class.java).size(),
             renderedDocument.fileName
         )
     }
 
     private fun computeHash(id: UUID): ByteArray {
+        logger.debug("computing hash for id $id")
         val md = MessageDigest.getInstance("MD5")
         val directory = fsService.getDirectoryPathFromID(id)
         val files = Files.find(directory, 5, { _, _ -> true })
         files.forEach { path ->
+            logger.trace("adding file $path")
             md.update(path.toString().toByteArray())
             val attributes = Files.readAttributes(path, BasicFileAttributes::class.java)
             md.update(longToByteArray(attributes.size()))
@@ -73,4 +85,6 @@ class RenderCache {
         ByteBuffer.wrap(bytes).putLong(value)
         return bytes.copyOfRange(4, 8)
     }
+
+    private fun ByteArray.toHex(): String = joinToString(separator = "") { eachByte -> "%02x".format(eachByte) }
 }
diff --git a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/renderer/RenderService.kt b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/renderer/RenderService.kt
index ed4a81d..99ea551 100644
--- a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/renderer/RenderService.kt
+++ b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/renderer/RenderService.kt
@@ -3,22 +3,27 @@ package me.kruemmelspalter.file_spider.backend.renderer
 import me.kruemmelspalter.file_spider.backend.database.Document
 import me.kruemmelspalter.file_spider.backend.services.FileSystemService
 import me.kruemmelspalter.file_spider.backend.services.RenderedDocument
+import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Service
 
 @Service
 class RenderService {
+
+    private val logger = LoggerFactory.getLogger(javaClass)
+
     @Autowired
     private lateinit var fsService: FileSystemService
 
     @Autowired
     private lateinit var renderCache: RenderCache
 
-    fun renderDocument(document: Document): RenderedDocument? {
-        return getRenderer(document).render(document, fsService, renderCache)
+    fun renderDocument(document: Document, useCache: Boolean = true): RenderedDocument? {
+        return getRenderer(document).render(document, fsService, renderCache, useCache)
     }
 
     fun getRenderer(document: Document): Renderer {
+        logger.debug("Getting renderer from renderer ${document.renderer} and mime type ${document.mimeType}")
         return when (document.renderer) {
             "plain" -> Renderer.plainRenderer
             "markdown", "md" -> Renderer.markdownRenderer
diff --git a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/renderer/Renderer.kt b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/renderer/Renderer.kt
index e67ec6c..f253b2e 100644
--- a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/renderer/Renderer.kt
+++ b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/renderer/Renderer.kt
@@ -3,6 +3,7 @@ package me.kruemmelspalter.file_spider.backend.renderer
 import me.kruemmelspalter.file_spider.backend.database.Document
 import me.kruemmelspalter.file_spider.backend.services.FileSystemService
 import me.kruemmelspalter.file_spider.backend.services.RenderedDocument
+import org.slf4j.LoggerFactory
 import org.springframework.util.FileSystemUtils
 import java.io.FileInputStream
 import java.io.InputStream
@@ -13,11 +14,13 @@ import java.nio.file.attribute.BasicFileAttributes
 import java.util.Date
 import java.util.concurrent.TimeUnit
 
-class Renderer {
+class Renderer(private val name: String) {
     private val renderSteps: MutableList<(RenderMeta) -> Unit> = mutableListOf()
 
+    private val logger = LoggerFactory.getLogger(javaClass)
+
     companion object {
-        internal val plainRenderer = Renderer().output {
+        internal val plainRenderer = Renderer("plain").output {
             RenderedDocument(
                 FileInputStream(it.fsService.getFileFromID(it.document.id, it.document.fileExtension)),
                 it.document.mimeType,
@@ -27,37 +30,36 @@ class Renderer {
         }
 
         internal val htmlRenderer =
-            Renderer().tempDir().resolveLinks().outputFile("text/html", "html") { it.fileName }
-
-        internal val markdownRenderer =
-            Renderer().tempDir()
-                .copy({ it.fileName }, { "tmp0.md" })
-                .command(2) {
-                    listOf(
-                        "mmdc",
-                        "-p", "/opt/filespider/mmdc-puppeteer-config.json",
-                        "-i", "tmp0.md",
-                        "-o", "tmp1.md",
-                        "-e", "png",
-                        "-w", "19200px",
-                    )
-                }
-                .replace(mapOf("!\\[diagram\\]\\((\\.\\/tmp1-[0-9]+\\.png)\\)" to "<img src=\"\\1\" style=\"max-width: 100%\" \\/>")) { "tmp1.md" }
-                .command(10) {
-                    listOf(
-                        "pandoc",
-                        "-f", "markdown",
-                        "-o", "out.html",
-                        "-s",
-                        "--katex=http://localhost:80/libs/katex/",
-                        "--metadata", "title=${it.document.title}",
-                        "--self-contained",
-                        "tmp1.md"
-                    )
-                }
-                .resolveLinks { "out.html" }.outputFile("text/html", "html") { "out.html" }
-
-        internal val latexRenderer = Renderer().tempDir().command(10) {
+            Renderer("html").tempDir().resolveLinks().outputFile("text/html", "html") { it.fileName }
+
+        internal val markdownRenderer = Renderer("markdown").tempDir().copy({ it.fileName }, { "tmp0.md" }).command(2) {
+            listOf(
+                "mmdc",
+                "-p", "/opt/filespider/mmdc-puppeteer-config.json",
+                "-i", "tmp0.md",
+                "-o", "tmp1.md",
+                "-e", "png",
+                "-w", "19200px",
+            )
+        }
+            .replace(mapOf("!\\[diagram\\]\\((\\.\\/tmp1-[0-9]+\\.png)\\)" to "<img src=\"\\1\" style=\"max-width: 100%\" \\/>")) { "tmp1.md" }
+            .command(10) {
+                listOf(
+                    "pandoc",
+                    "-f",
+                    "markdown",
+                    "-o",
+                    "out.html",
+                    "-s",
+                    "--katex=http://localhost:80/libs/katex/",
+                    "--metadata",
+                    "title=${it.document.title}",
+                    "--self-contained",
+                    "tmp1.md"
+                )
+            }.resolveLinks { "out.html" }.outputFile("text/html", "html") { "out.html" }
+
+        internal val latexRenderer = Renderer("latex").tempDir().command(10) {
             listOf(
                 "bash",
                 "-c",
@@ -65,22 +67,19 @@ class Renderer {
             )
         }.outputFile("application/pdf", "pdf") { "out.pdf" }
 
-        internal val xournalppRenderer =
-            Renderer().tempDir().command(2) {
-                listOf(
-                    "sh",
-                    "-c",
-                    "gunzip -c -S .${it.document.fileExtension} ${it.fileName} |sed -r -e 's/filename=\".*\\/${it.document.id}\\/(.*)\" /filename=\"\\1\" /g'|gzip>tmp.xopp"
-                )
-            }
-                .command(10) { listOf("xournalpp", "-p", "out.pdf", "tmp.xopp") }
-                .outputFile("application/pdf", "pdf") { "out.pdf" }
+        internal val xournalppRenderer = Renderer("xournalpp").tempDir().command(2) {
+            listOf(
+                "sh",
+                "-c",
+                "gunzip -c -S .${it.document.fileExtension} ${it.fileName} |sed -r -e 's/filename=\".*\\/${it.document.id}\\/(.*)\" /filename=\"\\1\" /g'|gzip>tmp.xopp"
+            )
+        }.command(10) { listOf("xournalpp", "-p", "out.pdf", "tmp.xopp") }
+            .outputFile("application/pdf", "pdf") { "out.pdf" }
 
-        internal val ebookRenderer = Renderer().tempDir()
-            .command(15, mapOf("QTWEBENGINE_CHROMIUM_FLAGS" to "--no-sandbox")) {
+        internal val ebookRenderer =
+            Renderer("ebook").tempDir().command(15, mapOf("QTWEBENGINE_CHROMIUM_FLAGS" to "--no-sandbox")) {
                 listOf("ebook-convert", it.fileName, "out.pdf")
-            }
-            .outputFile("application/pdf", "pdf") { "out.pdf" }
+            }.outputFile("application/pdf", "pdf") { "out.pdf" }
     }
 
     fun addStep(step: (RenderMeta) -> Unit): Renderer {
@@ -103,6 +102,7 @@ class Renderer {
     fun outputFile(mimeType: String, fileExtension: String, filenameProvider: (RenderMeta) -> String): Renderer {
         return output {
             val filename = filenameProvider(it)
+            logger.trace("serving file ${Paths.get(it.workingDirectory.toString(), filename)}")
             RenderedDocument(
                 FileInputStream(Paths.get(it.workingDirectory.toString(), filename).toString()),
                 mimeType,
@@ -126,8 +126,11 @@ class Renderer {
                 .directory(it.workingDirectory.toFile())
             environment.toMap(pb.environment())
             val process = pb.start()
-            if (!process.waitFor(timeout, timeUnit) || process.exitValue() != 0)
-                throw RenderingException(String(it.fsService.readLog(it.document.id)?.readAllBytes() ?: byteArrayOf()))
+            if (!process.waitFor(
+                    timeout,
+                    timeUnit
+                ) || process.exitValue() != 0
+            ) throw RenderingException(String(it.fsService.readLog(it.document.id)?.readAllBytes() ?: byteArrayOf()))
         }
     }
 
@@ -136,6 +139,7 @@ class Renderer {
             val tmpPath = Paths.get(
                 it.fsService.getTemporaryDirectory().toString(), "filespider-${it.document.id}-${Date().time}"
             )
+            logger.trace("establishing temp dir at $tmpPath")
             Files.createDirectories(tmpPath)
             FileSystemUtils.copyRecursively(it.fsService.getDirectoryPathFromID(it.document.id), tmpPath)
             it.workingDirectory = tmpPath
@@ -148,8 +152,8 @@ class Renderer {
         filenameProvider: (RenderMeta) -> String = { it.fileName }
     ): Renderer {
         return command(1) { meta ->
-            listOf("sed", "-i", "-E") + replacements.map { listOf("-e", "s/${it.key}/${it.value}/g") }.flatten() +
-                listOf(Paths.get(meta.workingDirectory.toString(), filenameProvider(meta)).toString())
+            listOf("sed", "-i", "-E") + replacements.map { listOf("-e", "s/${it.key}/${it.value}/g") }
+                .flatten() + listOf(Paths.get(meta.workingDirectory.toString(), filenameProvider(meta)).toString())
         }
     }
 
@@ -163,8 +167,7 @@ class Renderer {
         return replace(
             mapOf(
                 "<a href=\"%5E([0-9a-fA-F]{8}\\b-[0-9a-fA-F]{4}\\b-[0-9a-fA-F]{4}\\b-[0-9a-fA-F]{4}\\b-[0-9a-fA-F]{12})\">(.+)<\\/a>" to "<a href=\"..\\/..\\/\\1\" target=\"_parent\">\\2<\\/a>",
-                "\\\"\\%5E([0-9a-fA-F]{8}\\b-[0-9a-fA-F]{4}\\b-[0-9a-fA-F]{4}\\b-[0-9a-fA-F]{4}\\b-[0-9a-fA-F]{12})(\\/?.*\\\")"
-                    to "\"..\\/\\1\\/rendered\\2"
+                "\\\"\\%5E([0-9a-fA-F]{8}\\b-[0-9a-fA-F]{4}\\b-[0-9a-fA-F]{4}\\b-[0-9a-fA-F]{4}\\b-[0-9a-fA-F]{12})(\\/?.*\\\")" to "\"..\\/\\1\\/rendered\\2"
             ),
             filenameProvider
         )
@@ -179,7 +182,12 @@ class Renderer {
         }
     }
 
-    fun render(document: Document, fsService: FileSystemService, cache: RenderCache): RenderedDocument? {
+    fun render(
+        document: Document,
+        fsService: FileSystemService,
+        cache: RenderCache,
+        useCache: Boolean = true
+    ): RenderedDocument? {
         return render(
             RenderMeta(
                 document,
@@ -188,12 +196,16 @@ class Renderer {
                 document.id.toString() + if (document.fileExtension != null) "." + document.fileExtension else "",
                 cache,
             ),
-            cache
+            cache, useCache
         )
     }
 
-    fun render(meta: RenderMeta, cache: RenderCache): RenderedDocument? {
-        if (cache.isCacheValid(meta.document.id)) return cache.getCachedRender(meta.document.id)
+    private fun render(meta: RenderMeta, cache: RenderCache, useCache: Boolean = true): RenderedDocument? {
+        logger.debug("Rendering using renderer $name")
+        if (useCache) {
+            if (cache.isCacheValid(meta.document.id)) return cache.getCachedRender(meta.document.id)
+            logger.trace("document cache is invalid or nonexistent, rendering")
+        }
         for (step in renderSteps) step(meta)
         for (step in meta.cleanup) step(meta)
         return cache.cacheRender(meta.document.id, meta.output!!)
diff --git a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/services/DocumentService.kt b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/services/DocumentService.kt
index 0763f73..d0933e8 100644
--- a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/services/DocumentService.kt
+++ b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/services/DocumentService.kt
@@ -46,8 +46,8 @@ class DocumentService {
         return documentRepository.filterDocuments(posFilter, negFilter).map { documentToMeta(it) }
     }
 
-    fun renderDocument(id: UUID): RenderedDocument? {
-        return renderService.renderDocument(documentRepository.getDocument(id) ?: return null)
+    fun renderDocument(id: UUID, useCache: Boolean = true): RenderedDocument? {
+        return renderService.renderDocument(documentRepository.getDocument(id) ?: return null, useCache)
     }
 
     fun readDocumentLog(id: UUID): InputStream? {

From 143179fb8029450f52f278a5a18dd02e5fd12968 Mon Sep 17 00:00:00 2001
From: Kruemmelspalter <kruemmelspalter@duck.com>
Date: Sun, 29 Jan 2023 01:28:36 +0100
Subject: [PATCH 07/10] reformat & remove unnecessary methods

---
 .../backend/FileSpiderApplication.kt          |  5 -----
 .../backend/api/DocumentController.kt         |  3 ---
 .../backend/database/DatabaseConfiguration.kt |  2 +-
 .../backend/database/DocumentRepository.kt    | 14 +++++++-------
 .../file_spider/backend/renderer/Renderer.kt  | 14 --------------
 .../backend/services/FileSystemService.kt     | 19 -------------------
 6 files changed, 8 insertions(+), 49 deletions(-)

diff --git a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/FileSpiderApplication.kt b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/FileSpiderApplication.kt
index 4fcf865..e527c3a 100644
--- a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/FileSpiderApplication.kt
+++ b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/FileSpiderApplication.kt
@@ -1,7 +1,5 @@
 package me.kruemmelspalter.file_spider.backend
 
-import com.typesafe.config.ConfigFactory
-import org.slf4j.LoggerFactory
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration
 import org.springframework.boot.builder.SpringApplicationBuilder
@@ -22,9 +20,6 @@ import java.util.Properties
 class FileSpiderApplication : WebMvcConfigurer, WebServerFactoryCustomizer<ConfigurableWebServerFactory>,
     AbstractJdbcConfiguration() {
 
-    private val logger = LoggerFactory.getLogger(javaClass)
-    private val config = ConfigFactory.load()
-
     // enable OPTIONS request
     @Bean(name = [DispatcherServletAutoConfiguration.DEFAULT_DISPATCHER_SERVLET_BEAN_NAME])
     fun dispatcherServlet(): DispatcherServlet? {
diff --git a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/api/DocumentController.kt b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/api/DocumentController.kt
index f153707..ac59650 100644
--- a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/api/DocumentController.kt
+++ b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/api/DocumentController.kt
@@ -4,7 +4,6 @@ import me.kruemmelspalter.file_spider.backend.renderer.RenderingException
 import me.kruemmelspalter.file_spider.backend.services.DocumentMeta
 import me.kruemmelspalter.file_spider.backend.services.DocumentService
 import me.kruemmelspalter.file_spider.backend.services.RenderedDocument
-import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.core.io.InputStreamResource
 import org.springframework.core.io.Resource
@@ -33,8 +32,6 @@ import javax.servlet.http.HttpServletRequest
 @RequestMapping("/document")
 class DocumentController {
 
-    private val logger = LoggerFactory.getLogger(javaClass)
-
     @Autowired
     private lateinit var documentService: DocumentService
 
diff --git a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/database/DatabaseConfiguration.kt b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/database/DatabaseConfiguration.kt
index 4694a89..909e580 100644
--- a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/database/DatabaseConfiguration.kt
+++ b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/database/DatabaseConfiguration.kt
@@ -59,7 +59,7 @@ class DatabaseConfiguration {
         dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver")
         dataSource.url =
             "jdbc:mysql://${config.getString("database.host")}:${config.getString("database.port")}/" +
-            config.getString("database.database")
+                    config.getString("database.database")
         dataSource.username = config.getString("database.username")
         dataSource.password = config.getString("database.password")
         return dataSource
diff --git a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/database/DocumentRepository.kt b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/database/DocumentRepository.kt
index 67c1b34..55798b1 100644
--- a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/database/DocumentRepository.kt
+++ b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/database/DocumentRepository.kt
@@ -41,13 +41,13 @@ class DocumentRepository {
 
         return namedParameterJdbcOperations.query(
             "select Document.* from Document left join (select document, count(tag) as tagCount from Tag where " +
-                "tag in (:posTags) group by document) as postags on postags.document = Document.id " +
-                (
-                    if (negFilter.isEmpty()) "join (select NULL as tagCount) as negtags" else
-                        "left join (select document, count(tag) as tagCount from Tag " +
-                            "where tag in (:negTags) group by document) as negtags on negtags.document = Document.id"
-                    ) +
-                " where postags.tagCount = :ptCount and negtags.tagCount IS NULL",
+                    "tag in (:posTags) group by document) as postags on postags.document = Document.id " +
+                    (
+                            if (negFilter.isEmpty()) "join (select NULL as tagCount) as negtags" else
+                                "left join (select document, count(tag) as tagCount from Tag " +
+                                        "where tag in (:negTags) group by document) as negtags on negtags.document = Document.id"
+                            ) +
+                    " where postags.tagCount = :ptCount and negtags.tagCount IS NULL",
             MapSqlParameterSource(mapOf("posTags" to posFilter, "negTags" to negFilter, "ptCount" to posFilter.size))
         ) { rs, _ -> documentFromResultSet(rs) }
     }
diff --git a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/renderer/Renderer.kt b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/renderer/Renderer.kt
index f253b2e..286a1cd 100644
--- a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/renderer/Renderer.kt
+++ b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/renderer/Renderer.kt
@@ -6,7 +6,6 @@ import me.kruemmelspalter.file_spider.backend.services.RenderedDocument
 import org.slf4j.LoggerFactory
 import org.springframework.util.FileSystemUtils
 import java.io.FileInputStream
-import java.io.InputStream
 import java.nio.file.Files
 import java.nio.file.Path
 import java.nio.file.Paths
@@ -87,14 +86,6 @@ class Renderer(private val name: String) {
         return this
     }
 
-    fun output(stream: InputStream, mimeType: String, contentLength: Long, fileName: String): Renderer {
-        return output { RenderedDocument(stream, mimeType, contentLength, fileName) }
-    }
-
-    fun output(document: RenderedDocument): Renderer {
-        return output { document }
-    }
-
     fun output(documentProvider: (RenderMeta) -> RenderedDocument): Renderer {
         return addStep { it.output = documentProvider(it) }
     }
@@ -157,11 +148,6 @@ class Renderer(private val name: String) {
         }
     }
 
-    fun useRenderer(rendererProvider: (RenderMeta) -> Renderer): Renderer {
-        return addStep {
-            it.output = rendererProvider(it).render(it.document, it.fsService, it.cache)
-        }
-    }
 
     fun resolveLinks(filenameProvider: (RenderMeta) -> String = { it.fileName }): Renderer {
         return replace(
diff --git a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/services/FileSystemService.kt b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/services/FileSystemService.kt
index fd702cb..7b95335 100644
--- a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/services/FileSystemService.kt
+++ b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/services/FileSystemService.kt
@@ -8,11 +8,9 @@ import org.springframework.http.HttpStatus
 import org.springframework.stereotype.Service
 import org.springframework.util.FileSystemUtils
 import org.springframework.web.server.ResponseStatusException
-import java.io.BufferedReader
 import java.io.File
 import java.io.FileInputStream
 import java.io.FileOutputStream
-import java.io.FileReader
 import java.io.InputStream
 import java.nio.file.Files
 import java.nio.file.Path
@@ -60,23 +58,6 @@ class FileSystemService {
         return getDocumentPathFromID(id, fileExtension).toFile()
     }
 
-    fun getInputStreamFromID(id: UUID, fileExtension: String?): InputStream {
-        return FileInputStream(getFileFromID(id, fileExtension))
-    }
-
-    fun getContentFromID(id: UUID, fileExtension: String?): String {
-        val resultBuilder = StringBuilder()
-        val br = BufferedReader(FileReader(getFileFromID(id, fileExtension)))
-        br.use {
-            var line = br.readLine()
-            while (line != null) {
-                resultBuilder.append(line).append("\n")
-                line = br.readLine()
-            }
-        }
-        return resultBuilder.toString()
-    }
-
     fun getFileAttributesFromID(id: UUID, fileExtension: String?): BasicFileAttributes {
         return Files.readAttributes(getDocumentPathFromID(id, fileExtension), BasicFileAttributes::class.java)
     }

From d85b1d678967aaa012a70b0c99220bb21b39fe6e Mon Sep 17 00:00:00 2001
From: Kruemmelspalter <kruemmelspalter@duck.com>
Date: Sun, 29 Jan 2023 01:31:51 +0100
Subject: [PATCH 08/10] add log level options to docker compose

---
 docker-compose.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index cf84601..0e64cf8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -24,7 +24,15 @@ services:
     backend:
         image: ghcr.io/kruemmelspalter/filespider-backend:${FILESPIDER_TAG}
         environment:
-            APP_OPTS: -Ddatabase.host=database -Ddatabase.username=user -Ddatabase.password=password -Ddatabase.database=database
+            APP_OPTS: |
+                -Ddatabase.host=database
+                -Ddatabase.username=user
+                -Ddatabase.password=password
+                -Ddatabase.database=database
+                -Dlogging.level.org.apache.tomcat.util.net.NioEndpoint=INFO
+                -Dlogging.level.org.apache.catalina.session.ManagerBase=INFO
+                -Dlogging.level.org.apache.coyote.http11.Http11Processor=INFO
+                -Dlogging.level.root=INFO # change according to needs
         volumes:
             - ./data/filespider:/var/lib/filespider
         depends_on:

From a8fa5a33864e038d5d59007ee813e0f322584f52 Mon Sep 17 00:00:00 2001
From: Kruemmelspalter <kruemmelspalter@duck.com>
Date: Sun, 29 Jan 2023 01:34:29 +0100
Subject: [PATCH 09/10] increase tag length limit

---
 backend/app/src/main/resources/sql/init.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/app/src/main/resources/sql/init.sql b/backend/app/src/main/resources/sql/init.sql
index 8b3bf1b..213e47d 100644
--- a/backend/app/src/main/resources/sql/init.sql
+++ b/backend/app/src/main/resources/sql/init.sql
@@ -11,7 +11,7 @@ create table Document (
 
 create table Tag (
     document uuid not null,
-    tag varchar(20) not null,
+    tag varchar(50) not null,
     primary key (document, tag)
 );
 
@@ -21,4 +21,4 @@ create table Cache (
     mimeType varchar(64) not null,
     fileName varchar(64) not null,
     primary key (document)
-)
\ No newline at end of file
+)

From 7a5e136a94b27f98ee04ef7ade761ff45e86cf85 Mon Sep 17 00:00:00 2001
From: Kruemmelspalter <kruemmelspalter@duck.com>
Date: Sun, 29 Jan 2023 01:35:25 +0100
Subject: [PATCH 10/10] fix indentation

---
 .../backend/database/DatabaseConfiguration.kt      |  2 +-
 .../backend/database/DocumentRepository.kt         | 14 +++++++-------
 .../file_spider/backend/renderer/Renderer.kt       |  1 -
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/database/DatabaseConfiguration.kt b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/database/DatabaseConfiguration.kt
index 909e580..4694a89 100644
--- a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/database/DatabaseConfiguration.kt
+++ b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/database/DatabaseConfiguration.kt
@@ -59,7 +59,7 @@ class DatabaseConfiguration {
         dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver")
         dataSource.url =
             "jdbc:mysql://${config.getString("database.host")}:${config.getString("database.port")}/" +
-                    config.getString("database.database")
+            config.getString("database.database")
         dataSource.username = config.getString("database.username")
         dataSource.password = config.getString("database.password")
         return dataSource
diff --git a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/database/DocumentRepository.kt b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/database/DocumentRepository.kt
index 55798b1..67c1b34 100644
--- a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/database/DocumentRepository.kt
+++ b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/database/DocumentRepository.kt
@@ -41,13 +41,13 @@ class DocumentRepository {
 
         return namedParameterJdbcOperations.query(
             "select Document.* from Document left join (select document, count(tag) as tagCount from Tag where " +
-                    "tag in (:posTags) group by document) as postags on postags.document = Document.id " +
-                    (
-                            if (negFilter.isEmpty()) "join (select NULL as tagCount) as negtags" else
-                                "left join (select document, count(tag) as tagCount from Tag " +
-                                        "where tag in (:negTags) group by document) as negtags on negtags.document = Document.id"
-                            ) +
-                    " where postags.tagCount = :ptCount and negtags.tagCount IS NULL",
+                "tag in (:posTags) group by document) as postags on postags.document = Document.id " +
+                (
+                    if (negFilter.isEmpty()) "join (select NULL as tagCount) as negtags" else
+                        "left join (select document, count(tag) as tagCount from Tag " +
+                            "where tag in (:negTags) group by document) as negtags on negtags.document = Document.id"
+                    ) +
+                " where postags.tagCount = :ptCount and negtags.tagCount IS NULL",
             MapSqlParameterSource(mapOf("posTags" to posFilter, "negTags" to negFilter, "ptCount" to posFilter.size))
         ) { rs, _ -> documentFromResultSet(rs) }
     }
diff --git a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/renderer/Renderer.kt b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/renderer/Renderer.kt
index 286a1cd..0cac9be 100644
--- a/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/renderer/Renderer.kt
+++ b/backend/app/src/main/kotlin/me/kruemmelspalter/file_spider/backend/renderer/Renderer.kt
@@ -148,7 +148,6 @@ class Renderer(private val name: String) {
         }
     }
 
-
     fun resolveLinks(filenameProvider: (RenderMeta) -> String = { it.fileName }): Renderer {
         return replace(
             mapOf(