Merge pull request #38 from amanshuraikwar/refactor

Refactor

Author: amanshuraikwar

project-files/Portfolio/buildWebsite.kts

@@ -8,6 +8,8 @@ File(".") exec "rm -rf build"
 println("Creating build...")
 File(".") exec "mkdir build"
 
+generateEmptyBlogListFile()
+
 generateEmptyDataStoreFile("PageType.PROJECTS")
 buildAndCopyDirectoryContents("projects")
 
@@ -86,9 +88,34 @@ data class BlogListEntry(
     val link: String
 )
 
+fun generateEmptyBlogListFile(): File {
+    val outputFile = File(
+        "shared/src/jsMain/kotlin/io/github/amanshuraikwar/portfolio/GeneratedBlogListDataStore.kt"
+    )
+    if (outputFile.exists()) {
+        outputFile.delete()
+    }
+
+    outputFile.bufferedWriter().use { out ->
+        out.write("package io.github.amanshuraikwar.portfolio\n")
+        out.write("\n")
+        out.write("import io.github.amanshuraikwar.portfolio.blog.BlogListDataItem\n")
+        out.write("\n")
+        out.write("/**\n * Note: generated by buildWebsite.kts, do not edit!\n */\n")
+        out.write("class GeneratedBlogListDataStore {\n")
+        out.write("\n")
+        out.write("\tfun getBlogListData(): List<BlogListDataItem> {\n")
+        out.write("\t\treturn listOf()\n")
+        out.write("\t}\n")
+        out.write("}")
+    }
+
+    return outputFile
+}
+
 fun createBlogListFile(blogListEntryList: List<BlogListEntry>): File {
     val outputFile = File(
-        "shared/src/commonMain/kotlin/io/github/amanshuraikwar/portfolio/BlogListDataStore.kt"
+        "shared/src/jsMain/kotlin/io/github/amanshuraikwar/portfolio/GeneratedBlogListDataStore.kt"
     )
     outputFile.delete()
 
@@ -97,13 +124,13 @@ fun createBlogListFile(blogListEntryList: List<BlogListEntry>): File {
 
         out.write("\n")
 
-        out.write("import io.github.amanshuraikwar.portfolio.markdown.BlogListDataItem\n")
+        out.write("import io.github.amanshuraikwar.portfolio.blog.BlogListDataItem\n")
 
         out.write("\n")
 
         out.write("/**\n * Note: generated by buildWebsite.kts, do not edit!\n */\n")
 
-        out.write("class BlogListDataStore {\n")
+        out.write("class GeneratedBlogListDataStore {\n")
 
         out.write("\n")
 
@@ -168,21 +195,23 @@ fun buildAndCopyDirectoryContents(dirName: String, deleteAssets: Boolean = true)
 
 fun generateEmptyDataStoreFile(pageType: String) {
     val outputFile =
-        File("shared/src/commonMain/kotlin/io/github/amanshuraikwar/portfolio/GeneratedDataStore.kt")
-    outputFile.delete()
+        File("shared/src/jsMain/kotlin/io/github/amanshuraikwar/portfolio/GeneratedWebPageBuildDataStore.kt")
+    if (outputFile.exists()) {
+        outputFile.delete()
+    }
 
     outputFile.bufferedWriter().use { out ->
         out.write("package io.github.amanshuraikwar.portfolio\n")
 
         out.write("\n")
 
-        out.write("import io.github.amanshuraikwar.portfolio.markdown.MdNode\n")
+        out.write("import io.github.amanshuraikwar.portfolio.model.MdNode\n")
 
         out.write("\n")
 
         out.write("/**\n * Note: generated by buildWebsite.kts, do not edit!\n */\n")
 
-        out.write("class GeneratedDataStore : DataStore {\n")
+        out.write("class GeneratedWebPageBuildDataStore : WebPageBuildDataStore {\n")
 
         out.write("\n")
 
@@ -206,21 +235,21 @@ fun generateBlogMdSource(file: File): BlogListEntry {
     var firstParagraph = ""
 
     val outputFile =
-        File("shared/src/commonMain/kotlin/io/github/amanshuraikwar/portfolio/GeneratedDataStore.kt")
+        File("shared/src/jsMain/kotlin/io/github/amanshuraikwar/portfolio/GeneratedWebPageBuildDataStore.kt")
     outputFile.delete()
 
     outputFile.bufferedWriter().use { out ->
         out.write("package io.github.amanshuraikwar.portfolio\n")
 
         out.write("\n")
 
-        out.write("import io.github.amanshuraikwar.portfolio.markdown.MdNode\n")
+        out.write("import io.github.amanshuraikwar.portfolio.model.MdNode\n")
 
         out.write("\n")
 
         out.write("/**\n * Note: generated by buildWebsite.kts, do not edit!\n */\n")
 
-        out.write("class GeneratedDataStore : DataStore {\n")
+        out.write("class GeneratedWebPageBuildDataStore : WebPageBuildDataStore {\n")
 
         out.write("\n")
 

project-files/Portfolio/shared/src/commonMain/kotlin/io/github/amanshuraikwar/portfolio/DataStore.kt

@@ -0,0 +1,46 @@
+package io.github.amanshuraikwar.portfolio
+
+import io.ktor.client.HttpClient
+import io.ktor.client.engine.HttpClientEngine
+import io.ktor.client.features.json.JsonFeature
+import io.ktor.client.features.json.serializer.KotlinxSerializer
+import io.ktor.client.features.logging.DEFAULT
+import io.ktor.client.features.logging.LogLevel
+import io.ktor.client.features.logging.Logger
+import io.ktor.client.features.logging.Logging
+import kotlinx.serialization.json.Json
+
+object Factory {
+    fun createHttpClient(
+        engine: HttpClientEngine,
+        json: Json = createJson(),
+        enableNetworkLogs: Boolean
+    ) = HttpClient(engine) {
+        install(JsonFeature) {
+            serializer = KotlinxSerializer(json)
+        }
+        if (enableNetworkLogs) {
+            install(Logging) {
+                logger = Logger.DEFAULT
+                level = LogLevel.INFO
+            }
+        }
+    }
+
+    fun createHttpClient(
+        json: Json = createJson(),
+        enableNetworkLogs: Boolean
+    ) = HttpClient {
+        install(JsonFeature) {
+            serializer = KotlinxSerializer(json)
+        }
+        if (enableNetworkLogs) {
+            install(Logging) {
+                logger = Logger.DEFAULT
+                level = LogLevel.INFO
+            }
+        }
+    }
+
+    fun createJson() = Json { isLenient = true; ignoreUnknownKeys = true }
+}