From b0a2b6c5a19e0e20d50d29f52d640b5f7d19f841 Mon Sep 17 00:00:00 2001 From: climb Date: Thu, 4 Apr 2019 14:54:28 +0200 Subject: Moved database to own class --- src/main/kotlin/App.kt | 40 +--- src/main/kotlin/DB.kt | 48 +++++ src/main/resources/compiled-views/files.java | 250 ++++++++++++------------ src/main/resources/compiled-views/fileview.java | 47 ++--- src/main/resources/views/files.rocker.html | 1 + 5 files changed, 192 insertions(+), 194 deletions(-) create mode 100644 src/main/kotlin/DB.kt (limited to 'src/main') diff --git a/src/main/kotlin/App.kt b/src/main/kotlin/App.kt index 87055a1..4682e92 100644 --- a/src/main/kotlin/App.kt +++ b/src/main/kotlin/App.kt @@ -5,29 +5,23 @@ import io.javalin.* import io.javalin.core.util.* import io.javalin.rendering.* import io.javalin.rendering.template.TemplateUtil.model -import org.jetbrains.exposed.sql.* -import org.jetbrains.exposed.sql.transactions.* import java.io.* import java.nio.file.* -import java.sql.* + fun main() { val app = Javalin.create().enableStaticFiles("../resources/").start(7000) val fileHome = "files" - // TODO: Move to own database class - val db: Database = Database.connect("jdbc:sqlite:main.db", "org.sqlite.JDBC") - TransactionManager.manager.defaultIsolationLevel = Connection.TRANSACTION_SERIALIZABLE - - transaction { - SchemaUtils.createMissingTablesAndColumns(FileLocation, UserData, General) - } - JavalinRenderer.register( FileRenderer { filepath, model -> Rocker.template(filepath).bind(model).render().toString() }, ".rocker.html" ) + val db = DB() + + // TODO: If not initialUse show setup page + /** * Sends a json object of filenames in [fileHome]s * TODO: Fix possible security issue with "../" @@ -78,31 +72,7 @@ fun main() { } } -/** - * Database table for the file location indexing - */ -object FileLocation : Table() { - val id = integer("id").autoIncrement().primaryKey() - val location = text("location") -} -/** - * Database table to index the users with their regarding passwords - */ -object UserData : Table() { - // only for multiple users: val id = integer("id").autoIncrement().primaryKey() - val username = varchar("username", 24).primaryKey() // remove if ID - val password = varchar("password", 64) -} - -/** - * Database table storing general data/states - */ -object General : Table() { - // redundant: val id = integer("id").autoIncrement().primaryKey() - val initialUse = integer("initialUse").primaryKey() // remove pKey if ID // boolean -> 0:1 - // TODO: If not isSetup show other front page -} diff --git a/src/main/kotlin/DB.kt b/src/main/kotlin/DB.kt new file mode 100644 index 0000000..a01a1e6 --- /dev/null +++ b/src/main/kotlin/DB.kt @@ -0,0 +1,48 @@ +package space.anity + +import org.jetbrains.exposed.sql.* +import org.jetbrains.exposed.sql.transactions.* +import java.sql.* + + +class DB(val dbFileLocation: String = "main.db") { + val db :Database + + /** + * Database table for the file location indexing + */ + object FileLocation : Table() { + val id = integer("id").autoIncrement().primaryKey() + val location = text("location") + } + + /** + * Database table to index the users with their regarding passwords + */ + object UserData : Table() { + // only for multiple users: + // val id = integer("id").autoIncrement().primaryKey() + val username = varchar("username", 24).primaryKey() // remove .primaryKey(), if id column is used + val password = varchar("password", 64) + } + + /** + * Database table storing general data/states + */ + object General : Table() { + val initialUse = integer("initialUse").default(0).primaryKey() // boolean -> 0:1 + } + + init { + // create connection + this.db = Database.connect("jdbc:sqlite:main.db", "org.sqlite.JDBC") + TransactionManager.manager.defaultIsolationLevel = Connection.TRANSACTION_SERIALIZABLE + + // add tables + transaction { + SchemaUtils.createMissingTablesAndColumns(FileLocation, UserData, General) + } + } + + // TODO add functions for database usage +} \ No newline at end of file diff --git a/src/main/resources/compiled-views/files.java b/src/main/resources/compiled-views/files.java index 2643e92..ebd0c58 100644 --- a/src/main/resources/compiled-views/files.java +++ b/src/main/resources/compiled-views/files.java @@ -1,130 +1,120 @@ -import com.fizzed.rocker.RenderingException; -import com.fizzed.rocker.runtime.DefaultRockerTemplate; -import com.fizzed.rocker.runtime.PlainTextUnloadedClassLoader; - -import java.io.IOException; -import java.util.ArrayList; - -/* - * Auto generated code to render template /files.rocker.html - * Do not edit this file. Changes will eventually be overwritten by Rocker parser! - */ -@SuppressWarnings("unused") -public class files extends com.fizzed.rocker.runtime.DefaultRockerModel { - - static public com.fizzed.rocker.ContentType getContentType() { - return com.fizzed.rocker.ContentType.HTML; - } - - static public String getTemplateName() { - return "files.rocker.html"; - } - - static public String getTemplatePackageName() { - return ""; - } - - static public String getHeaderHash() { - return "-1618097059"; - } - - static public String[] getArgumentNames() { - return new String[]{"files"}; - } - - // argument @ [1:2] - private ArrayList files; - - public files files(ArrayList files) { - this.files = files; - return this; - } - - public ArrayList files() { - return this.files; - } - - static public files template(ArrayList files) { - return new files() - .files(files); - } - - @Override - protected DefaultRockerTemplate buildTemplate() throws RenderingException { - // optimized for performance (via rocker.optimize flag; no auto reloading) - return new Template(this); - } - - static public class Template extends com.fizzed.rocker.runtime.DefaultRockerTemplate { - - // - static private final byte[] PLAIN_TEXT_1_0; - //
\n - static private final byte[] PLAIN_TEXT_2_0; - - static { - PlainTextUnloadedClassLoader loader = PlainTextUnloadedClassLoader.tryLoad(files.class.getClassLoader(), files.class.getName() + "$PlainText", "UTF-8"); - PLAIN_TEXT_0_0 = loader.tryGet("PLAIN_TEXT_0_0"); - PLAIN_TEXT_1_0 = loader.tryGet("PLAIN_TEXT_1_0"); - PLAIN_TEXT_2_0 = loader.tryGet("PLAIN_TEXT_2_0"); - } - - // argument @ [1:2] - protected final ArrayList files; - - public Template(files model) { - super(model); - __internal.setCharset("UTF-8"); - __internal.setContentType(getContentType()); - __internal.setTemplateName(getTemplateName()); - __internal.setTemplatePackageName(getTemplatePackageName()); - this.files = model.files(); - } - - @Override - protected void __doRender() throws IOException, RenderingException { - // ForBlockBegin @ [2:1] - __internal.aboutToExecutePosInTemplate(2, 1); - try { - final com.fizzed.rocker.runtime.IterableForIterator __forIterator0 = new com.fizzed.rocker.runtime.IterableForIterator(files); - while (__forIterator0.hasNext()) { - final String file = __forIterator0.next(); - try { - // PlainText @ [2:29] - __internal.aboutToExecutePosInTemplate(2, 29); - __internal.writeValue(PLAIN_TEXT_0_0); - // ValueExpression @ [3:14] - __internal.aboutToExecutePosInTemplate(3, 14); - __internal.renderValue(file, false); - // PlainText @ [3:19] - __internal.aboutToExecutePosInTemplate(3, 19); - __internal.writeValue(PLAIN_TEXT_1_0); - // ValueExpression @ [3:21] - __internal.aboutToExecutePosInTemplate(3, 21); - __internal.renderValue(file, false); - // PlainText @ [3:26] - __internal.aboutToExecutePosInTemplate(3, 26); - __internal.writeValue(PLAIN_TEXT_2_0); - // ForBlockEnd @ [2:1] - __internal.aboutToExecutePosInTemplate(2, 1); - } catch (com.fizzed.rocker.runtime.ContinueException e) { - // support for continuing for loops - } - } // for end @ [2:1] - } catch (com.fizzed.rocker.runtime.BreakException e) { - // support for breaking for loops - } - } - } - - private static class PlainText { - - static private final String PLAIN_TEXT_0_0 = " "; - static private final String PLAIN_TEXT_2_0 = "
\n"; - - } - -} + +import java.io.IOException; +import com.fizzed.rocker.ForIterator; +import com.fizzed.rocker.RenderingException; +import com.fizzed.rocker.RockerContent; +import com.fizzed.rocker.RockerOutput; +import com.fizzed.rocker.runtime.DefaultRockerTemplate; +import com.fizzed.rocker.runtime.PlainTextUnloadedClassLoader; +// import @ [1:1] +import java.util.ArrayList; + +/* + * Auto generated code to render template /files.rocker.html + * Do not edit this file. Changes will eventually be overwritten by Rocker parser! + */ +@SuppressWarnings("unused") +public class files extends com.fizzed.rocker.runtime.DefaultRockerModel { + + static public com.fizzed.rocker.ContentType getContentType() { return com.fizzed.rocker.ContentType.HTML; } + static public String getTemplateName() { return "files.rocker.html"; } + static public String getTemplatePackageName() { return ""; } + static public String getHeaderHash() { return "-1618097059"; } + static public String[] getArgumentNames() { return new String[] { "files" }; } + + // argument @ [2:2] + private ArrayList files; + + public files files(ArrayList files) { + this.files = files; + return this; + } + + public ArrayList files() { + return this.files; + } + + static public files template(ArrayList files) { + return new files() + .files(files); + } + + @Override + protected DefaultRockerTemplate buildTemplate() throws RenderingException { + // optimized for performance (via rocker.optimize flag; no auto reloading) + return new Template(this); + } + + static public class Template extends com.fizzed.rocker.runtime.DefaultRockerTemplate { + + // + static private final byte[] PLAIN_TEXT_1_0; + //
\n + static private final byte[] PLAIN_TEXT_2_0; + + static { + PlainTextUnloadedClassLoader loader = PlainTextUnloadedClassLoader.tryLoad(files.class.getClassLoader(), files.class.getName() + "$PlainText", "UTF-8"); + PLAIN_TEXT_0_0 = loader.tryGet("PLAIN_TEXT_0_0"); + PLAIN_TEXT_1_0 = loader.tryGet("PLAIN_TEXT_1_0"); + PLAIN_TEXT_2_0 = loader.tryGet("PLAIN_TEXT_2_0"); + } + + // argument @ [2:2] + protected final ArrayList files; + + public Template(files model) { + super(model); + __internal.setCharset("UTF-8"); + __internal.setContentType(getContentType()); + __internal.setTemplateName(getTemplateName()); + __internal.setTemplatePackageName(getTemplatePackageName()); + this.files = model.files(); + } + + @Override + protected void __doRender() throws IOException, RenderingException { + // ForBlockBegin @ [3:1] + __internal.aboutToExecutePosInTemplate(3, 1); + try { + final com.fizzed.rocker.runtime.IterableForIterator __forIterator0 = new com.fizzed.rocker.runtime.IterableForIterator(files); + while (__forIterator0.hasNext()) { + final String file = __forIterator0.next(); + try { + // PlainText @ [3:29] + __internal.aboutToExecutePosInTemplate(3, 29); + __internal.writeValue(PLAIN_TEXT_0_0); + // ValueExpression @ [4:10] + __internal.aboutToExecutePosInTemplate(4, 10); + __internal.renderValue(file, false); + // PlainText @ [4:15] + __internal.aboutToExecutePosInTemplate(4, 15); + __internal.writeValue(PLAIN_TEXT_1_0); + // ValueExpression @ [4:17] + __internal.aboutToExecutePosInTemplate(4, 17); + __internal.renderValue(file, false); + // PlainText @ [4:22] + __internal.aboutToExecutePosInTemplate(4, 22); + __internal.writeValue(PLAIN_TEXT_2_0); + // ForBlockEnd @ [3:1] + __internal.aboutToExecutePosInTemplate(3, 1); + } catch (com.fizzed.rocker.runtime.ContinueException e) { + // support for continuing for loops + } + } // for end @ [3:1] + } catch (com.fizzed.rocker.runtime.BreakException e) { + // support for breaking for loops + } + } + } + + private static class PlainText { + + static private final String PLAIN_TEXT_0_0 = ""; + static private final String PLAIN_TEXT_2_0 = "
\n"; + + } + +} diff --git a/src/main/resources/compiled-views/fileview.java b/src/main/resources/compiled-views/fileview.java index d17eae2..e01b7f3 100644 --- a/src/main/resources/compiled-views/fileview.java +++ b/src/main/resources/compiled-views/fileview.java @@ -1,9 +1,12 @@ + +import java.io.IOException; +import com.fizzed.rocker.ForIterator; import com.fizzed.rocker.RenderingException; +import com.fizzed.rocker.RockerContent; +import com.fizzed.rocker.RockerOutput; import com.fizzed.rocker.runtime.DefaultRockerTemplate; import com.fizzed.rocker.runtime.PlainTextUnloadedClassLoader; -import java.io.IOException; - /* * Auto generated code to render template /fileview.rocker.html * Do not edit this file. Changes will eventually be overwritten by Rocker parser! @@ -11,34 +14,15 @@ import java.io.IOException; @SuppressWarnings("unused") public class fileview extends com.fizzed.rocker.runtime.DefaultRockerModel { + static public com.fizzed.rocker.ContentType getContentType() { return com.fizzed.rocker.ContentType.HTML; } + static public String getTemplateName() { return "fileview.rocker.html"; } + static public String getTemplatePackageName() { return ""; } + static public String getHeaderHash() { return "868254209"; } + static public String[] getArgumentNames() { return new String[] { "content" }; } + // argument @ [1:2] private String content; - static public com.fizzed.rocker.ContentType getContentType() { - return com.fizzed.rocker.ContentType.HTML; - } - - static public String getTemplateName() { - return "fileview.rocker.html"; - } - - static public String getTemplatePackageName() { - return ""; - } - - static public String getHeaderHash() { - return "868254209"; - } - - static public String[] getArgumentNames() { - return new String[]{"content"}; - } - - static public fileview template(String content) { - return new fileview() - .content(content); - } - public fileview content(String content) { this.content = content; return this; @@ -48,6 +32,11 @@ public class fileview extends com.fizzed.rocker.runtime.DefaultRockerModel { return this.content; } + static public fileview template(String content) { + return new fileview() + .content(content); + } + @Override protected DefaultRockerTemplate buildTemplate() throws RenderingException { // optimized for performance (via rocker.optimize flag; no auto reloading) @@ -56,7 +45,7 @@ public class fileview extends com.fizzed.rocker.runtime.DefaultRockerModel { static public class Template extends com.fizzed.rocker.runtime.DefaultRockerTemplate { - // \n\n\n \n \n \n Fileview\n\n\n\n\n\n static private final byte[] PLAIN_TEXT_1_0; @@ -95,7 +84,7 @@ public class fileview extends com.fizzed.rocker.runtime.DefaultRockerModel { private static class PlainText { - static private final String PLAIN_TEXT_0_0 = "\n\n\n \n \n \n Fileview\n\n\n\n\n\n"; } diff --git a/src/main/resources/views/files.rocker.html b/src/main/resources/views/files.rocker.html index 16eab38..45a009f 100644 --- a/src/main/resources/views/files.rocker.html +++ b/src/main/resources/views/files.rocker.html @@ -1,3 +1,4 @@ +@import java.util.ArrayList @args (ArrayList files) @for (String file : files) { @file
-- cgit v1.2.3