[RELEASE CI] bump version

.github/runner-files/ci-gradle.properties

@@ -0,0 +1,7 @@
+org.gradle.daemon=false
+org.gradle.jvmargs=-Xmx5120m
+org.gradle.workers.max=5
+org.gradle.parallel=true
+
+kotlin.incremental=false
+kotlin.compiler.execution.strategy=in-process

.github/scripts/commit-repo.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+cp ../master/repo/* .
+new_build=$(ls | tail -1)
+echo "New build file name: $new_build"
+
+cp -f $new_build Tachidesk-latest.jar
+
+git config --global user.email "github-actions[bot]@users.noreply.github.com"
+git config --global user.name "github-actions[bot]"
+git status
+if [ -n "$(git status --porcelain)" ]; then
+    git add .
+    git commit -m "Update repo"
+    git push
+else
+    echo "No changes to commit"
+fi

.github/scripts/create-repo.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# Get last commit message
+last_commit_log=$(git log -1 --pretty=format:"%s")
+echo "last commit log: $last_commit_log"
+
+filter_count=$(echo "$last_commit_log" | grep -c '\[RELEASE CI\]' )
+echo "count is: $filter_count"
+
+if [ "$filter_count" -gt 0 ]; then
+  mkdir -p repo/
+  cp server/build/Tachidesk-*.jar repo/
+fi

.github/workflows/build.yml

@@ -0,0 +1,84 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  check_wrapper:
+    name: Validate Gradle Wrapper
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Clone repo
+        uses: actions/checkout@v2
+
+      - name: Validate Gradle Wrapper
+        uses: gradle/wrapper-validation-action@v1
+
+  build:
+    name: Build FatJar
+    needs: check_wrapper
+    if: "!startsWith(github.event.head_commit.message, '[SKIP CI]')"
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Cancel previous runs
+        uses: styfle/cancel-workflow-action@0.5.0
+        with:
+          access_token: ${{ github.token }}
+
+      - name: Checkout master branch
+        uses: actions/checkout@v2
+        with:
+          ref: master
+          path: master
+          fetch-depth: 0
+
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+
+      - name: Copy CI gradle.properties
+        run: |
+          cd master
+          mkdir -p ~/.gradle
+          cp .github/runner-files/ci-gradle.properties ~/.gradle/gradle.properties
+
+      - name: Download and process android.jar
+        if: github.event_name == 'push' && github.repository == 'AriaMoradi/Tachidesk'
+        run: |
+          cd master
+          ./scripts/getAndroid.sh
+
+      - name: Build the Jar
+        uses: eskatos/gradle-command-action@v1
+        with:
+          build-root-directory: master
+          wrapper-directory: master
+          arguments: :server:shadowJar --stacktrace
+          wrapper-cache-enabled: true
+          dependencies-cache-enabled: true
+          configuration-cache-enabled: true
+
+      - name: Create repo artifacts
+        if: github.event_name == 'push' && github.repository == 'AriaMoradi/Tachidesk'
+        run: |
+          cd master
+          ./.github/scripts/create-repo.sh
+
+      - name: Checkout repo branch
+        if: github.event_name == 'push' && github.repository == 'AriaMoradi/Tachidesk'
+        uses: actions/checkout@v2
+        with:
+          ref: repo
+          path: repo
+
+      - name: Deploy repo
+        if: github.event_name == 'push' && github.repository == 'AriaMoradi/Tachidesk'
+        run: |
+          cd repo
+          ../master/.github/scripts/commit-repo.sh

README.md

@@ -1,33 +1,66 @@
 # Tachidesk
-A not so much port of [Tachiyomi](https://tachiyomi.org/) to the web (and later Electron for the desktop experience)!
+A free and open source manga reader that runs extensions built for [Tachiyomi](https://tachiyomi.org/). 
 
-This project has two components: 
-1. **server:** contains some of the original Tachiyomi code and serves a REST API
-2. **webUI:** A react project that works with the server to do the presentation
+Tachidesk is as multi-platform as you can get. Any platform that runs java and/or has a modern browser can run it.
+
+Ability to read and write Tachiyomi compatible backups and syncing is a planned feature.
 
 ## How do I run the thing?
-### Get Android stubs jar(do this only once)
+#### Prerequisites
+You should have java 8 or newer and a modern browser installed. Also an internet connection is required as almost everything this app does is downloading stuff. 
+
+#### Running pre-built jar packages
+Download the latest (or a working more stable) release from [the repo branch](https://github.com/AriaMoradi/Tachidesk/tree/repo) or obtain it from [the releases section](https://github.com/AriaMoradi/Tachidesk/releases).
+
+Double click on the jar file or run `java -jar Tachidesk-latest.jar` or `java -jar Tachidesk-vX.Y.Z-rxxx.jar`
+
+The server will be running on `http://localhost:4567` open this url in your browser.
+
+#### Running on Docker
+Check [arbuilder's repo](https://github.com/arbuilder/Tachidesk-docker) out for more details and the dockerfile.
+
+## Building from source
+### Get Android stubs jar
 #### Manual download
 Download [android.jar](https://raw.githubusercontent.com/AriaMoradi/Tachidesk/android-jar/android.jar) and put it under `AndroidCompat/lib`.
 #### Building from source(needs `bash`, `curl`, `base64`, `zip` to work)
-run `scripts/getAndroid.sh` from project's root directory to download and rebuild the jar file from Google's repository.
+Run `scripts/getAndroid.sh` from project's root directory to download and rebuild the jar file from Google's repository.
 ### building the jar
-run `./gradlew :server:fatJar` the resulting jar file will be `server/build/server-1.0-all.jar`. Simply double click on it or run `java -jar server-1.0-all.jar`. The server will be running on `http://localhost:4567` open this url in your browser.
-## running for development purposes
-### The Server
-run `./gradlew :server:run -x :webUI:yarn_build --stacktrace` to run the server
-### the webUI
-how to do it is described in `webUI/react/README.md` but for short,
+Run `./gradlew shadowJar` the resulting built jar file will be `server/build/Tachidesk-vX.Y.Z-rxxx.jar`.
+## Running for development purposes
+### `server` module
+Run `./gradlew :server:run -x :webUI:copyBuild --stacktrace` to run the server
+### `webUI` module
+How to do it is described in `webUI/react/README.md` but for short,
  first cd into `webUI/react` then run `yarn` to install the node modules(do this only once)
  then `yarn start` to start the client if a new browser window doesn't start automatically,
- then open `http://127.0.0.1:3000` in a modern browser.
+ then open `http://127.0.0.1:3000` in a modern browser. This is a `create-react-app` project
+ and supports HMR and all the other goodies you'll need.
 
-## Is the application usable? Should I test it?
-Checkout [the state of project](https://github.com/AriaMoradi/Tachidesk/issues/2) to see what's implemented.
+## Is this application usable? Should I test it?
+If you'd ask me, I'd tell you If you want to read your manga **online** from tachiyomi or in one place and bypass all the ads, you can use Tachidesk.
+
+There are almost no quality of life features, including no library, no downloading for offline enjoyment and sadly no MangaDex search.
+
+Anyways, for more info checkout [finished milestone #1](https://github.com/AriaMoradi/Tachidesk/issues/2) and [milestone #2](https://github.com/AriaMoradi/Tachidesk/projects/1) to see what's implemented.
+
+## How does it work?
+This project has two components: 
+1. **server:** contains the implementation of [tachiyomi's extensions library](https://github.com/tachiyomiorg/extensions-lib) and uses an Android compatibility library to run apk extensions. All this concludes to serving a REST API to `webUI`.
+2. **webUI:** A react SPA project that works with the server to do the presentation.
+
+## Credit
+The `AndroidCompat` module and `scripts/getAndroid.sh` was originally developed by [@null-dev](https://github.com/null-dev) for [TachiWeb-Server](https://github.com/Tachiweb/TachiWeb-server) and is licensed under `Apache License Version 2.0`.
+
+Parts of [tachiyomi](https://github.com/tachiyomiorg/tachiyomi) is adopted into this codebase, also licensed under `Apache License Version 2.0`.
+
+Changes to both codebases is licensed under `MPL v. 2.0` as the rest of this project.
+
+You can obtain a copy of the license from  http://www.apache.org/licenses/LICENSE-2.0
 
 ## License
 
-    Copyright (C) 2020 Aria Moradi
+    Copyright (C) 2020-2021 Aria Moradi and contributors
 
     This Source Code Form is subject to the terms of the Mozilla Public
     License, v. 2.0. If a copy of the MPL was not distributed with this

scripts/getAndroid.sh

@@ -58,9 +58,8 @@ function dedup() {
 
 pushd ..
 dedup AndroidCompat/src/main/java
-dedup TachiServer/src/main/java
-dedup Tachiyomi-App/src/main/java
-dedup Tachiyomi-App/src/compat/java
+dedup server/src/main/java
+dedup server/src/main/kotlin
 popd
 
 popd

server/build.gradle.kts

@@ -1,11 +1,15 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import java.io.BufferedReader
 
 plugins {
 //    id("org.jetbrains.kotlin.jvm") version "1.4.21"
     application
     id("com.github.johnrengelman.shadow") version "6.1.0"
+    id("org.jmailen.kotlinter") version "3.3.0"
 }
 
+val TachideskVersion = "v0.1.2"
+
 
 repositories {
     mavenCentral()
@@ -102,6 +106,19 @@ sourceSets {
     }
 }
 
+val TachideskRevision = Runtime
+        .getRuntime()
+        .exec("git rev-list master --count")
+        .let { process ->
+            process.waitFor()
+            val output = process.inputStream.use {
+                it.bufferedReader().use(BufferedReader::readText)
+            }
+            process.destroy()
+            "r"+output.trim()
+
+        }
+
 tasks {
     jar {
         manifest {
@@ -115,15 +132,24 @@ tasks {
     }
     shadowJar {
         manifest.inheritFrom(jar.get().manifest) //will make your shadowJar (produced by jar task) runnable
+        archiveBaseName.set("Tachidesk")
+        archiveVersion.set(TachideskVersion)
+        archiveClassifier.set(TachideskRevision)
     }
 }
 
 tasks.withType<ShadowJar> {
     destinationDir = File("$rootDir/server/build")
-    //dependsOn(":webUI:copyBuild")
+    dependsOn("lintKotlin")
 }
 
 tasks.named("processResources") {
     dependsOn(":webUI:copyBuild")
 }
 
+tasks.named("run") {
+    dependsOn("formatKotlin", "lintKotlin")
+}
+
+
+

server/src/main/java/ir/armor/tachidesk/APKExtractor.java

@@ -1,5 +1,9 @@
 package ir.armor.tachidesk;
 
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.NodeList;

server/src/main/kotlin/eu/kanade/tachiyomi/App.kt

@@ -2,9 +2,9 @@ package eu.kanade.tachiyomi
 
 import android.app.Application
 import android.content.Context
-//import android.content.res.Configuration
-//import android.support.multidex.MultiDex
-//import timber.log.Timber
+// import android.content.res.Configuration
+// import android.support.multidex.MultiDex
+// import timber.log.Timber
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.InjektScope
 import uy.kohesive.injekt.registry.default.DefaultRegistrar

server/src/main/kotlin/eu/kanade/tachiyomi/AppModule.kt

@@ -2,19 +2,22 @@ package eu.kanade.tachiyomi
 
 import android.app.Application
 import com.google.gson.Gson
-//import eu.kanade.tachiyomi.data.cache.ChapterCache
-//import eu.kanade.tachiyomi.data.cache.CoverCache
-//import eu.kanade.tachiyomi.data.database.DatabaseHelper
-//import eu.kanade.tachiyomi.data.download.DownloadManager
-//import eu.kanade.tachiyomi.data.preference.PreferencesHelper
-//import eu.kanade.tachiyomi.data.sync.LibrarySyncManager
-//import eu.kanade.tachiyomi.data.track.TrackManager
-//import eu.kanade.tachiyomi.extension.ExtensionManager
+// import eu.kanade.tachiyomi.data.cache.ChapterCache
+// import eu.kanade.tachiyomi.data.cache.CoverCache
+// import eu.kanade.tachiyomi.data.database.DatabaseHelper
+// import eu.kanade.tachiyomi.data.download.DownloadManager
+// import eu.kanade.tachiyomi.data.preference.PreferencesHelper
+// import eu.kanade.tachiyomi.data.sync.LibrarySyncManager
+// import eu.kanade.tachiyomi.data.track.TrackManager
+// import eu.kanade.tachiyomi.extension.ExtensionManager
 import eu.kanade.tachiyomi.network.NetworkHelper
-import eu.kanade.tachiyomi.source.SourceManager
 import rx.Observable
 import rx.schedulers.Schedulers
-import uy.kohesive.injekt.api.*
+import uy.kohesive.injekt.api.InjektModule
+import uy.kohesive.injekt.api.InjektRegistrar
+import uy.kohesive.injekt.api.addSingleton
+import uy.kohesive.injekt.api.addSingletonFactory
+import uy.kohesive.injekt.api.get
 
 class AppModule(val app: Application) : InjektModule {
 
@@ -56,11 +59,9 @@ class AppModule(val app: Application) : InjektModule {
         }
 
 //        rxAsync { get<DatabaseHelper>() }
-
     }
 
     private fun rxAsync(block: () -> Unit) {
         Observable.fromCallable { block() }.subscribeOn(Schedulers.computation()).subscribe()
     }
-
 }

server/src/main/kotlin/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt

@@ -1,17 +1,17 @@
 package eu.kanade.tachiyomi.extension.api
 
-//import android.content.Context
-//import eu.kanade.tachiyomi.data.preference.PreferencesHelper
+// import android.content.Context
+// import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.extension.model.Extension
 import eu.kanade.tachiyomi.extension.util.ExtensionLoader
 import ir.armor.tachidesk.database.dataclass.ExtensionDataClass
-//import kotlinx.coroutines.Dispatchers
-//import kotlinx.coroutines.withContext
+// import kotlinx.coroutines.Dispatchers
+// import kotlinx.coroutines.withContext
 import kotlinx.serialization.json.JsonArray
 import kotlinx.serialization.json.int
 import kotlinx.serialization.json.jsonObject
 import kotlinx.serialization.json.jsonPrimitive
-//import uy.kohesive.injekt.injectLazy
+// import uy.kohesive.injekt.injectLazy
 
 internal class ExtensionGithubApi {
 
@@ -27,7 +27,7 @@ internal class ExtensionGithubApi {
 //    suspend fun checkForUpdates(): List<Extension.Installed> {
 //        val extensions = fin   dExtensions()
 //
-////        preferences.lastExtCheck().set(Date().time)
+// //        preferences.lastExtCheck().set(Date().time)
 //
 //        val installedExtensions = ExtensionLoader.loadExtensions(context)
 //            .filterIsInstance<LoadResult.Success>()
@@ -49,23 +49,23 @@ internal class ExtensionGithubApi {
 
     private fun parseResponse(json: JsonArray): List<Extension.Available> {
         return json
-                .filter { element ->
-                    val versionName = element.jsonObject["version"]!!.jsonPrimitive.content
-                    val libVersion = versionName.substringBeforeLast('.').toDouble()
-                    libVersion >= ExtensionLoader.LIB_VERSION_MIN && libVersion <= ExtensionLoader.LIB_VERSION_MAX
-                }
-                .map { element ->
-                    val name = element.jsonObject["name"]!!.jsonPrimitive.content.substringAfter("Tachiyomi: ")
-                    val pkgName = element.jsonObject["pkg"]!!.jsonPrimitive.content
-                    val apkName = element.jsonObject["apk"]!!.jsonPrimitive.content
-                    val versionName = element.jsonObject["version"]!!.jsonPrimitive.content
-                    val versionCode = element.jsonObject["code"]!!.jsonPrimitive.int
-                    val lang = element.jsonObject["lang"]!!.jsonPrimitive.content
-                    val nsfw = element.jsonObject["nsfw"]!!.jsonPrimitive.int == 1
-                    val icon = "$REPO_URL_PREFIX/icon/${apkName.replace(".apk", ".png")}"
+            .filter { element ->
+                val versionName = element.jsonObject["version"]!!.jsonPrimitive.content
+                val libVersion = versionName.substringBeforeLast('.').toDouble()
+                libVersion >= ExtensionLoader.LIB_VERSION_MIN && libVersion <= ExtensionLoader.LIB_VERSION_MAX
+            }
+            .map { element ->
+                val name = element.jsonObject["name"]!!.jsonPrimitive.content.substringAfter("Tachiyomi: ")
+                val pkgName = element.jsonObject["pkg"]!!.jsonPrimitive.content
+                val apkName = element.jsonObject["apk"]!!.jsonPrimitive.content
+                val versionName = element.jsonObject["version"]!!.jsonPrimitive.content
+                val versionCode = element.jsonObject["code"]!!.jsonPrimitive.int
+                val lang = element.jsonObject["lang"]!!.jsonPrimitive.content
+                val nsfw = element.jsonObject["nsfw"]!!.jsonPrimitive.int == 1
+                val icon = "$REPO_URL_PREFIX/icon/${apkName.replace(".apk", ".png")}"
 
-                    Extension.Available(name, pkgName, versionName, versionCode, lang, nsfw, apkName, icon)
-                }
+                Extension.Available(name, pkgName, versionName, versionCode, lang, nsfw, apkName, icon)
+            }
     }
 
     fun getApkUrl(extension: Extension.Available): String {

server/src/main/kotlin/eu/kanade/tachiyomi/extension/api/ExtensionGithubService.kt

@@ -9,7 +9,7 @@ import retrofit2.Retrofit
 import retrofit2.http.GET
 import uy.kohesive.injekt.injectLazy
 
-//import uy.kohesive.injekt.injectLazy
+// import uy.kohesive.injekt.injectLazy
 
 /**
  * Used to get the extension repo listing from GitHub.

server/src/main/kotlin/eu/kanade/tachiyomi/extension/util/ExtensionLoader.kt

@@ -1,28 +1,22 @@
 package eu.kanade.tachiyomi.extension.util
 
-//import android.annotation.SuppressLint
-//import android.content.Context
-//import android.content.pm.PackageInfo
-//import android.content.pm.PackageManager
-//import dalvik.system.PathClassLoader
-import eu.kanade.tachiyomi.annoations.Nsfw
-//import eu.kanade.tachiyomi.data.preference.PreferenceValues
-//import eu.kanade.tachiyomi.data.preference.PreferencesHelper
-import eu.kanade.tachiyomi.extension.model.Extension
-import eu.kanade.tachiyomi.extension.model.LoadResult
-import eu.kanade.tachiyomi.source.CatalogueSource
-import eu.kanade.tachiyomi.source.Source
-import eu.kanade.tachiyomi.source.SourceFactory
-//import eu.kanade.tachiyomi.util.lang.Hash
-//import kotlinx.coroutines.async
-//import kotlinx.coroutines.runBlocking
-//import timber.log.Timber
-//import uy.kohesive.injekt.injectLazy
+// import android.annotation.SuppressLint
+// import android.content.Context
+// import android.content.pm.PackageInfo
+// import android.content.pm.PackageManager
+// import dalvik.system.PathClassLoader
+// import eu.kanade.tachiyomi.data.preference.PreferenceValues
+// import eu.kanade.tachiyomi.data.preference.PreferencesHelper
+// import eu.kanade.tachiyomi.util.lang.Hash
+// import kotlinx.coroutines.async
+// import kotlinx.coroutines.runBlocking
+// import timber.log.Timber
+// import uy.kohesive.injekt.injectLazy
 
 /**
  * Class that handles the loading of the extensions installed in the system.
  */
-//@SuppressLint("PackageManagerGetSignatures")
+// @SuppressLint("PackageManagerGetSignatures")
 internal object ExtensionLoader {
 
 //    private val preferences: PreferencesHelper by injectLazy()

server/src/main/kotlin/eu/kanade/tachiyomi/network/CloudflareInterceptor.kt

@@ -1,30 +1,23 @@
 package eu.kanade.tachiyomi.network
 
-//import android.annotation.SuppressLint
-//import android.content.Context
-//import android.os.Build
-//import android.os.Handler
-//import android.os.Looper
-//import android.webkit.WebSettings
-//import android.webkit.WebView
-//import android.widget.Toast
-//import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.source.online.HttpSource
-//import eu.kanade.tachiyomi.util.lang.launchUI
-//import eu.kanade.tachiyomi.util.system.WebViewClientCompat
-//import eu.kanade.tachiyomi.util.system.WebViewUtil
-//import eu.kanade.tachiyomi.util.system.isOutdated
-//import eu.kanade.tachiyomi.util.system.setDefaultSettings
-//import eu.kanade.tachiyomi.util.system.toast
-import okhttp3.Cookie
-import okhttp3.HttpUrl.Companion.toHttpUrl
+// import android.annotation.SuppressLint
+// import android.content.Context
+// import android.os.Build
+// import android.os.Handler
+// import android.os.Looper
+// import android.webkit.WebSettings
+// import android.webkit.WebView
+// import android.widget.Toast
+// import eu.kanade.tachiyomi.R
+// import eu.kanade.tachiyomi.util.lang.launchUI
+// import eu.kanade.tachiyomi.util.system.WebViewClientCompat
+// import eu.kanade.tachiyomi.util.system.WebViewUtil
+// import eu.kanade.tachiyomi.util.system.isOutdated
+// import eu.kanade.tachiyomi.util.system.setDefaultSettings
+// import eu.kanade.tachiyomi.util.system.toast
 import okhttp3.Interceptor
-import okhttp3.Request
 import okhttp3.Response
-//import uy.kohesive.injekt.injectLazy
-import java.io.IOException
-import java.util.concurrent.CountDownLatch
-import java.util.concurrent.TimeUnit
+// import uy.kohesive.injekt.injectLazy
 
 class CloudflareInterceptor() : Interceptor {
 
@@ -77,7 +70,7 @@ class CloudflareInterceptor() : Interceptor {
 //        }
     }
 //
-////    @SuppressLint("SetJavaScriptEnabled")
+// //    @SuppressLint("SetJavaScriptEnabled")
 //    private fun resolveWithWebView(request: Request, oldCookie: Cookie?) {
 //        // We need to lock this thread until the WebView finds the challenge solution url, because
 //        // OkHttp doesn't support asynchronous interceptors.

server/src/main/kotlin/eu/kanade/tachiyomi/network/NetworkHelper.kt

@@ -1,17 +1,14 @@
 package eu.kanade.tachiyomi.network
 
-//import android.content.Context
-//import eu.kanade.tachiyomi.BuildConfig
-//import eu.kanade.tachiyomi.data.preference.PreferencesHelper
+// import android.content.Context
+// import eu.kanade.tachiyomi.BuildConfig
+// import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import android.content.Context
-import okhttp3.Cache
-//import okhttp3.HttpUrl.Companion.toHttpUrl
+// import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
-//import okhttp3.dnsoverhttps.DnsOverHttps
-//import okhttp3.logging.HttpLoggingInterceptor
-//import uy.kohesive.injekt.injectLazy
-import java.io.File
-import java.net.InetAddress
+// import okhttp3.dnsoverhttps.DnsOverHttps
+// import okhttp3.logging.HttpLoggingInterceptor
+// import uy.kohesive.injekt.injectLazy
 import java.util.concurrent.TimeUnit
 
 class NetworkHelper(context: Context) {

server/src/main/kotlin/eu/kanade/tachiyomi/network/OkHttpExtensions.kt

@@ -1,18 +1,14 @@
 package eu.kanade.tachiyomi.network
 
-//import kotlinx.coroutines.suspendCancellableCoroutine
+// import kotlinx.coroutines.suspendCancellableCoroutine
 import okhttp3.Call
-import okhttp3.Callback
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import rx.Observable
 import rx.Producer
 import rx.Subscription
-import java.io.IOException
 import java.util.concurrent.atomic.AtomicBoolean
-import kotlin.coroutines.resume
-import kotlin.coroutines.resumeWithException
 
 fun Call.asObservable(): Observable<Response> {
     return Observable.unsafeCreate { subscriber ->
@@ -52,7 +48,7 @@ fun Call.asObservable(): Observable<Response> {
 }
 
 // Based on https://github.com/gildor/kotlin-coroutines-okhttp
-//suspend fun Call.await(assertSuccess: Boolean = false): Response {
+// suspend fun Call.await(assertSuccess: Boolean = false): Response {
 //    return suspendCancellableCoroutine { continuation ->
 //        enqueue(
 //            object : Callback {
@@ -81,7 +77,7 @@ fun Call.asObservable(): Observable<Response> {
 //            }
 //        }
 //    }
-//}
+// }
 
 fun Call.asObservableSuccess(): Observable<Response> {
     return asObservable().doOnNext { response ->
@@ -92,7 +88,7 @@ fun Call.asObservableSuccess(): Observable<Response> {
     }
 }
 
-//fun OkHttpClient.newCallWithProgress(request: Request, listener: ProgressListener): Call {
+// fun OkHttpClient.newCallWithProgress(request: Request, listener: ProgressListener): Call {
 //    val progressClient = newBuilder()
 //        .cache(null)
 //        .addNetworkInterceptor { chain ->
@@ -104,7 +100,7 @@ fun Call.asObservableSuccess(): Observable<Response> {
 //        .build()
 //
 //    return progressClient.newCall(request)
-//}
+// }
 
 fun OkHttpClient.newCallWithProgress(request: Request, listener: ProgressListener): Call {
     val progressClient = newBuilder()

server/src/main/kotlin/eu/kanade/tachiyomi/source/ConfigurableSource.kt

@@ -1,6 +1,6 @@
 package eu.kanade.tachiyomi.source
 
-//import androidx.preference.PreferenceScreen
+// import androidx.preference.PreferenceScreen
 
 interface ConfigurableSource : Source {
 

server/src/main/kotlin/eu/kanade/tachiyomi/source/Source.kt

@@ -1,13 +1,13 @@
 package eu.kanade.tachiyomi.source
 
-//import android.graphics.drawable.Drawable
-//import eu.kanade.tachiyomi.extension.ExtensionManager
+// import android.graphics.drawable.Drawable
+// import eu.kanade.tachiyomi.extension.ExtensionManager
 import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import rx.Observable
-//import uy.kohesive.injekt.Injekt
-//import uy.kohesive.injekt.api.get
+// import uy.kohesive.injekt.Injekt
+// import uy.kohesive.injekt.api.get
 
 /**
  * A basic interface for creating a source. It could be an online source, a local source, etc...
@@ -46,6 +46,6 @@ interface Source {
     fun fetchPageList(chapter: SChapter): Observable<List<Page>>
 }
 
-//fun Source.icon(): Drawable? = Injekt.get<ExtensionManager>().getAppIconForSource(this)
+// fun Source.icon(): Drawable? = Injekt.get<ExtensionManager>().getAppIconForSource(this)
 
-//fun Source.getPreferenceKey(): String = "source_$id"
+// fun Source.getPreferenceKey(): String = "source_$id"

server/src/main/kotlin/eu/kanade/tachiyomi/source/SourceManager.kt

@@ -1,7 +1,7 @@
 package eu.kanade.tachiyomi.source
 
-//import android.content.Context
-//import eu.kanade.tachiyomi.R
+// import android.content.Context
+// import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga

server/src/main/kotlin/eu/kanade/tachiyomi/source/model/Page.kt

@@ -9,7 +9,7 @@ open class Page(
     val url: String = "",
     var imageUrl: String? = null,
     @Transient var uri: Uri? = null // Deprecated but can't be deleted due to extensions
-): ProgressListener {
+) : ProgressListener {
 
     val number: Int
         get() = index + 1

server/src/main/kotlin/eu/kanade/tachiyomi/source/model/SChapter.kt

@@ -12,7 +12,7 @@ interface SChapter : Serializable {
 
     var chapter_number: Float
 
-        var scanlator: String?
+    var scanlator: String?
 
     fun copyFrom(other: SChapter) {
         name = other.name

server/src/main/kotlin/eu/kanade/tachiyomi/source/online/HttpSource.kt

@@ -16,7 +16,7 @@ import okhttp3.Request
 import okhttp3.Response
 import rx.Observable
 import uy.kohesive.injekt.injectLazy
-//import uy.kohesive.injekt.injectLazy
+// import uy.kohesive.injekt.injectLazy
 import java.net.URI
 import java.net.URISyntaxException
 import java.security.MessageDigest

server/src/main/kotlin/ir/armor/tachidesk/Config.kt

@@ -1,8 +1,12 @@
 package ir.armor.tachidesk
 
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 import net.harawata.appdirs.AppDirsFactory
 
 object Config {
-    val dataRoot = AppDirsFactory.getInstance().getUserDataDir("Tachidesk",null, null)
+    val dataRoot = AppDirsFactory.getInstance().getUserDataDir("Tachidesk", null, null)
     val extensionsRoot = "$dataRoot/extensions"
-}
+}

server/src/main/kotlin/ir/armor/tachidesk/Main.kt

@@ -1,8 +1,23 @@
 package ir.armor.tachidesk
 
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 import eu.kanade.tachiyomi.App
 import io.javalin.Javalin
-import ir.armor.tachidesk.util.*
+import ir.armor.tachidesk.util.applicationSetup
+import ir.armor.tachidesk.util.getChapterList
+import ir.armor.tachidesk.util.getExtensionList
+import ir.armor.tachidesk.util.getManga
+import ir.armor.tachidesk.util.getMangaList
+import ir.armor.tachidesk.util.getPages
+import ir.armor.tachidesk.util.getSource
+import ir.armor.tachidesk.util.getSourceList
+import ir.armor.tachidesk.util.installAPK
+import ir.armor.tachidesk.util.sourceFilters
+import ir.armor.tachidesk.util.sourceGlobalSearch
+import ir.armor.tachidesk.util.sourceSearch
 import org.kodein.di.DI
 import org.kodein.di.conf.global
 import xyz.nulldev.androidcompat.AndroidCompat
@@ -23,27 +38,32 @@ class Main {
 
         @JvmStatic
         fun main(args: Array<String>) {
+//            System.getProperties()["proxySet"] = "true"
+//            System.getProperties()["socksProxyHost"] = "127.0.0.1"
+//            System.getProperties()["socksProxyPort"] = "2020"
+
             // make sure everything we need exists
             applicationSetup()
 
             registerConfigModules()
 
-            //Load config API
+            // Load config API
             DI.global.addImport(ConfigKodeinModule().create())
-            //Load Android compatibility dependencies
+            // Load Android compatibility dependencies
             AndroidCompatInitializer().init()
             // start app
             androidCompat.startApp(App())
 
-
-
             val app = Javalin.create { config ->
-    //                config.addSinglePageRoot("/", "")
-                config.addStaticFiles("/react")
+                try {
+                    this::class.java.classLoader.getResource("/react/index.html")
+                    config.addStaticFiles("/react")
+                    config.addSinglePageRoot("/", "/react/index.html")
+                } catch (e: RuntimeException) {
+                    println("Warning: react build files are missing.")
+                }
             }.start(4567)
 
-
-
             app.before() { ctx ->
                 // allow the client which is running on another port
                 ctx.header("Access-Control-Allow-Origin", "*")
@@ -53,27 +73,31 @@ class Main {
                 ctx.json(getExtensionList())
             }
 
-
             app.get("/api/v1/extension/install/:apkName") { ctx ->
                 val apkName = ctx.pathParam("apkName")
                 println(apkName)
                 ctx.status(
-                        installAPK(apkName)
+                    installAPK(apkName)
                 )
             }
             app.get("/api/v1/source/list") { ctx ->
                 ctx.json(getSourceList())
             }
 
+            app.get("/api/v1/source/:sourceId") { ctx ->
+                val sourceId = ctx.pathParam("sourceId").toLong()
+                ctx.json(getSource(sourceId))
+            }
+
             app.get("/api/v1/source/:sourceId/popular/:pageNum") { ctx ->
                 val sourceId = ctx.pathParam("sourceId").toLong()
                 val pageNum = ctx.pathParam("pageNum").toInt()
-                ctx.json(getMangaList(sourceId,pageNum,popular = true))
+                ctx.json(getMangaList(sourceId, pageNum, popular = true))
             }
             app.get("/api/v1/source/:sourceId/latest/:pageNum") { ctx ->
                 val sourceId = ctx.pathParam("sourceId").toLong()
                 val pageNum = ctx.pathParam("pageNum").toInt()
-                ctx.json(getMangaList(sourceId,pageNum,popular = false))
+                ctx.json(getMangaList(sourceId, pageNum, popular = false))
             }
 
             app.get("/api/v1/manga/:mangaId/") { ctx ->
@@ -89,11 +113,28 @@ class Main {
             app.get("/api/v1/manga/:mangaId/chapter/:chapterId") { ctx ->
                 val chapterId = ctx.pathParam("chapterId").toInt()
                 val mangaId = ctx.pathParam("mangaId").toInt()
-                ctx.json(getPages(chapterId,mangaId))
+                ctx.json(getPages(chapterId, mangaId))
+            }
+
+            // global search
+            app.get("/api/v1/search/:searchTerm") { ctx ->
+                val searchTerm = ctx.pathParam("searchTerm")
+                ctx.json(sourceGlobalSearch(searchTerm))
+            }
+
+            // single source search
+            app.get("/api/v1/source/:sourceId/search/:searchTerm/:pageNum") { ctx ->
+                val sourceId = ctx.pathParam("sourceId").toLong()
+                val searchTerm = ctx.pathParam("searchTerm")
+                val pageNum = ctx.pathParam("pageNum").toInt()
+                ctx.json(sourceSearch(sourceId, searchTerm, pageNum))
+            }
+
+            // source filter list
+            app.get("/api/v1/source/:sourceId/filters/") { ctx ->
+                val sourceId = ctx.pathParam("sourceId").toLong()
+                ctx.json(sourceFilters(sourceId))
             }
         }
-
-
     }
 }
-

server/src/main/kotlin/ir/armor/tachidesk/database/DBMangaer.kt

@@ -1,5 +1,9 @@
 package ir.armor.tachidesk.database
 
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 import ir.armor.tachidesk.Config
 import ir.armor.tachidesk.database.table.ChapterTable
 import ir.armor.tachidesk.database.table.ExtensionsTable
@@ -25,4 +29,4 @@ fun makeDataBaseTables() {
         SchemaUtils.create(MangaTable)
         SchemaUtils.create(ChapterTable)
     }
-}
+}

server/src/main/kotlin/ir/armor/tachidesk/database/dataclass/ChapterDataClass.kt

@@ -1,11 +1,15 @@
 package ir.armor.tachidesk.database.dataclass
 
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 data class ChapterDataClass(
-        val id: Int,
-        val url: String,
-        val name: String,
-        val date_upload: Long,
-        val chapter_number: Float,
-        val scanlator: String?,
-        val mangaId: Int,
-)
+    val id: Int,
+    val url: String,
+    val name: String,
+    val date_upload: Long,
+    val chapter_number: Float,
+    val scanlator: String?,
+    val mangaId: Int,
+)

server/src/main/kotlin/ir/armor/tachidesk/database/dataclass/ExtensionDataClass.kt

@@ -1,14 +1,18 @@
 package ir.armor.tachidesk.database.dataclass
 
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 data class ExtensionDataClass(
-        val name: String,
-        val pkgName: String,
-        val versionName: String,
-        val versionCode: Int,
-        val lang: String,
-        val isNsfw: Boolean,
-        val apkName: String,
-        val iconUrl: String,
-        val installed: Boolean,
-        val classFQName: String,
-)
+    val name: String,
+    val pkgName: String,
+    val versionName: String,
+    val versionCode: Int,
+    val lang: String,
+    val isNsfw: Boolean,
+    val apkName: String,
+    val iconUrl: String,
+    val installed: Boolean,
+    val classFQName: String,
+)

server/src/main/kotlin/ir/armor/tachidesk/database/dataclass/MangaDataClass.kt

@@ -1,20 +1,29 @@
 package ir.armor.tachidesk.database.dataclass
 
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 import ir.armor.tachidesk.database.table.MangaStatus
 
 data class MangaDataClass(
-        val id: Int,
-        val sourceId: Long,
+    val id: Int,
+    val sourceId: Long,
 
-        val url: String,
-        val title: String,
-        val thumbnail_url: String? = null,
+    val url: String,
+    val title: String,
+    val thumbnailUrl: String? = null,
 
-        val initialized: Boolean = false,
+    val initialized: Boolean = false,
 
-        val artist: String? = null,
-        val author: String? = null,
-        val description: String? = null,
-        val genre: String? = null,
-        val status: String = MangaStatus.UNKNOWN.name
-)
+    val artist: String? = null,
+    val author: String? = null,
+    val description: String? = null,
+    val genre: String? = null,
+    val status: String = MangaStatus.UNKNOWN.name
+)
+
+data class PagedMangaListDataClass(
+    val mangaList: List<MangaDataClass>,
+    val hasNextPage: Boolean
+)

server/src/main/kotlin/ir/armor/tachidesk/database/dataclass/PageDataClass.kt

@@ -1,6 +1,10 @@
 package ir.armor.tachidesk.database.dataclass
 
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 data class PageDataClass(
-        val index: Int,
-        var imageUrl: String,
-)
+    val index: Int,
+    var imageUrl: String,
+)

server/src/main/kotlin/ir/armor/tachidesk/database/dataclass/SourceDataClass.kt

@@ -1,9 +1,13 @@
 package ir.armor.tachidesk.database.dataclass
 
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 data class SourceDataClass(
-        val id: String,
-        val name: String,
-        val lang: String,
-        val iconUrl: String,
-        val supportsLatest: Boolean
-)
+    val id: String,
+    val name: String,
+    val lang: String,
+    val iconUrl: String,
+    val supportsLatest: Boolean
+)

server/src/main/kotlin/ir/armor/tachidesk/database/entity/ExtensionEntity.kt

@@ -1,5 +1,9 @@
 package ir.armor.tachidesk.database.entity
 
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 import ir.armor.tachidesk.database.table.ExtensionsTable
 import org.jetbrains.exposed.dao.IntEntity
 import org.jetbrains.exposed.dao.IntEntityClass
@@ -18,4 +22,4 @@ class ExtensionEntity(id: EntityID<Int>) : IntEntity(id) {
     var iconUrl by ExtensionsTable.iconUrl
     var installed by ExtensionsTable.installed
     var classFQName by ExtensionsTable.classFQName
-}
+}

server/src/main/kotlin/ir/armor/tachidesk/database/entity/MangaEntity.kt

@@ -1,5 +1,9 @@
 package ir.armor.tachidesk.database.entity
 
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 import ir.armor.tachidesk.database.table.MangaTable
 import org.jetbrains.exposed.dao.IntEntity
 import org.jetbrains.exposed.dao.IntEntityClass
@@ -20,4 +24,4 @@ class MangaEntity(id: EntityID<Int>) : IntEntity(id) {
     var thumbnail_url by MangaTable.thumbnail_url
 
     var sourceReference by MangaEntity referencedOn MangaTable.sourceReference
-}
+}

server/src/main/kotlin/ir/armor/tachidesk/database/entity/SourceEntity.kt

@@ -1,7 +1,12 @@
 package ir.armor.tachidesk.database.entity
 
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 import ir.armor.tachidesk.database.table.SourceTable
-import org.jetbrains.exposed.dao.*
+import org.jetbrains.exposed.dao.EntityClass
+import org.jetbrains.exposed.dao.LongEntity
 import org.jetbrains.exposed.dao.id.EntityID
 
 class SourceEntity(id: EntityID<Long>) : LongEntity(id) {
@@ -13,4 +18,4 @@ class SourceEntity(id: EntityID<Long>) : LongEntity(id) {
     var extension by ExtensionEntity referencedOn SourceTable.extension
     var partOfFactorySource by SourceTable.partOfFactorySource
     var positionInFactorySource by SourceTable.positionInFactorySource
-}
+}

server/src/main/kotlin/ir/armor/tachidesk/database/table/ChapterTable.kt

@@ -1,6 +1,5 @@
 package ir.armor.tachidesk.database.table
 
-import eu.kanade.tachiyomi.source.model.SManga
 import org.jetbrains.exposed.dao.id.IntIdTable
 
 object ChapterTable : IntIdTable() {
@@ -8,7 +7,7 @@ object ChapterTable : IntIdTable() {
     val name = varchar("name", 512)
     val date_upload = long("date_upload").default(0)
     val chapter_number = float("chapter_number").default(-1f)
-    val scanlator = varchar("scanlator",128).nullable()
+    val scanlator = varchar("scanlator", 128).nullable()
 
     val manga = reference("manga", MangaTable)
-}
+}

server/src/main/kotlin/ir/armor/tachidesk/database/table/ExtensionTable.kt

@@ -2,7 +2,6 @@ package ir.armor.tachidesk.database.table
 
 import org.jetbrains.exposed.dao.id.IntIdTable
 
-
 object ExtensionsTable : IntIdTable() {
     val name = varchar("name", 128)
     val pkgName = varchar("pkg_name", 128)
@@ -15,4 +14,4 @@ object ExtensionsTable : IntIdTable() {
 
     val installed = bool("installed").default(false)
     val classFQName = varchar("class_name", 256).default("") // fully qualified name
-}
+}

server/src/main/kotlin/ir/armor/tachidesk/database/table/MangaTable.kt

@@ -30,4 +30,4 @@ enum class MangaStatus(val status: Int) {
     companion object {
         fun valueOf(value: Int): MangaStatus = values().find { it.status == value } ?: UNKNOWN
     }
-}
+}

server/src/main/kotlin/ir/armor/tachidesk/database/table/SourceTable.kt

@@ -4,9 +4,9 @@ import org.jetbrains.exposed.dao.id.IdTable
 
 object SourceTable : IdTable<Long>() {
     override val id = long("id").entityId()
-    val name= varchar("name", 128)
+    val name = varchar("name", 128)
     val lang = varchar("lang", 10)
     val extension = reference("extension", ExtensionsTable)
     val partOfFactorySource = bool("part_of_factory_source").default(false)
     val positionInFactorySource = integer("position_in_factory_source").nullable()
-}
+}

server/src/main/kotlin/ir/armor/tachidesk/util/APK.kt

@@ -1,5 +1,9 @@
 package ir.armor.tachidesk.util
 
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 import com.googlecode.dex2jar.tools.Dex2jarCmd
 import eu.kanade.tachiyomi.extension.api.ExtensionGithubApi
 import eu.kanade.tachiyomi.network.NetworkHelper
@@ -41,7 +45,6 @@ fun installAPK(apkName: String): Int {
             // download apk file
             downloadAPKFile(apkToDownload, apkFilePath)
 
-
             val className: String = APKExtractor.extract_dex_and_read_className(apkFilePath, dexFilePath)
             println(className)
             // dex -> jar
@@ -60,7 +63,7 @@ fun installAPK(apkName: String): Int {
                 return@transaction ExtensionsTable.select { ExtensionsTable.name eq extensionRecord.name }.first()[ExtensionsTable.id]
             }
 
-            if (instance is HttpSource) {// single source
+            if (instance is HttpSource) { // single source
                 val httpSource = instance as HttpSource
                 transaction {
 //                            SourceEntity.new  {
@@ -80,7 +83,6 @@ fun installAPK(apkName: String): Int {
 //                            println(httpSource.name)
 //                            println()
                 }
-
             } else { // multi source
                 val sourceFactory = instance as SourceFactory
                 transaction {
@@ -110,7 +112,6 @@ fun installAPK(apkName: String): Int {
                     it[classFQName] = className
                 }
             }
-
         }
         return 201 // we downloaded successfully
     } else {
@@ -122,7 +123,7 @@ val networkHelper: NetworkHelper by injectLazy()
 
 private fun downloadAPKFile(url: String, apkPath: String) {
     val request = Request.Builder().url(url).build()
-    val response =  networkHelper.client.newCall(request).execute()
+    val response = networkHelper.client.newCall(request).execute()
 
     val downloadedFile = File(apkPath)
     val sink = downloadedFile.sink().buffer()

server/src/main/kotlin/ir/armor/tachidesk/util/Chapter.kt

@@ -1,28 +1,30 @@
 package ir.armor.tachidesk.util
 
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 import eu.kanade.tachiyomi.source.model.Page
 import eu.kanade.tachiyomi.source.model.SChapter
 import eu.kanade.tachiyomi.source.model.SManga
 import eu.kanade.tachiyomi.source.online.HttpSource
 import ir.armor.tachidesk.database.dataclass.ChapterDataClass
 import ir.armor.tachidesk.database.dataclass.PageDataClass
-import ir.armor.tachidesk.database.entity.MangaEntity
 import ir.armor.tachidesk.database.table.ChapterTable
 import ir.armor.tachidesk.database.table.MangaTable
 import org.jetbrains.exposed.sql.insertAndGetId
 import org.jetbrains.exposed.sql.select
 import org.jetbrains.exposed.sql.transactions.transaction
 
-
 fun getChapterList(mangaId: Int): List<ChapterDataClass> {
     val mangaDetails = getManga(mangaId)
     val source = getHttpSource(mangaDetails.sourceId)
 
     val chapterList = source.fetchChapterList(
-            SManga.create().apply {
-                title = mangaDetails.title
-                url = mangaDetails.url
-            }
+        SManga.create().apply {
+            title = mangaDetails.title
+            url = mangaDetails.url
+        }
     ).toBlocking().first()
 
     return transaction {
@@ -41,22 +43,21 @@ fun getChapterList(mangaId: Int): List<ChapterDataClass> {
             }
         }
 
-
         return@transaction chapterList.map {
             ChapterDataClass(
-                    ChapterTable.select { ChapterTable.url eq it.url }.firstOrNull()!![ChapterTable.id].value,
-                    it.url,
-                    it.name,
-                    it.date_upload,
-                    it.chapter_number,
-                    it.scanlator,
-                    mangaId
+                ChapterTable.select { ChapterTable.url eq it.url }.firstOrNull()!![ChapterTable.id].value,
+                it.url,
+                it.name,
+                it.date_upload,
+                it.chapter_number,
+                it.scanlator,
+                mangaId
             )
         }
     }
 }
 
-fun getPages(chapterId: Int, mangaId: Int): List<PageDataClass> {
+fun getPages(chapterId: Int, mangaId: Int): Pair<ChapterDataClass, List<PageDataClass>> {
     return transaction {
         val chapterEntry = ChapterTable.select { ChapterTable.id eq chapterId }.firstOrNull()!!
         assert(mangaId == chapterEntry[ChapterTable.manga].value) // sanity check
@@ -64,24 +65,35 @@ fun getPages(chapterId: Int, mangaId: Int): List<PageDataClass> {
         val source = getHttpSource(mangaEntry[MangaTable.sourceReference].value)
 
         val pagesList = source.fetchPageList(
-                SChapter.create().apply {
-                    url = chapterEntry[ChapterTable.url]
-                    name = chapterEntry[ChapterTable.name]
-                }
+            SChapter.create().apply {
+                url = chapterEntry[ChapterTable.url]
+                name = chapterEntry[ChapterTable.name]
+            }
         ).toBlocking().first()
 
-        return@transaction pagesList.map {
+        val chapter = ChapterDataClass(
+            chapterEntry[ChapterTable.id].value,
+            chapterEntry[ChapterTable.url],
+            chapterEntry[ChapterTable.name],
+            chapterEntry[ChapterTable.date_upload],
+            chapterEntry[ChapterTable.chapter_number],
+            chapterEntry[ChapterTable.scanlator],
+            mangaId
+        )
+
+        val pages = pagesList.map {
             PageDataClass(
-                    it.index,
-                    getTrueImageUrl(it,source)
+                it.index,
+                getTrueImageUrl(it, source)
             )
         }
-    }
 
+        return@transaction Pair(chapter, pages)
+    }
 }
 
 fun getTrueImageUrl(page: Page, source: HttpSource): String {
-    return if ( page.imageUrl == null){
+    return if (page.imageUrl == null) {
         source.fetchImageUrl(page).toBlocking().first()!!
     } else page.imageUrl!!
 }

server/src/main/kotlin/ir/armor/tachidesk/util/ExtensionsList.kt

@@ -1,5 +1,9 @@
 package ir.armor.tachidesk.util
 
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 import eu.kanade.tachiyomi.extension.api.ExtensionGithubApi
 import eu.kanade.tachiyomi.extension.model.Extension
 import ir.armor.tachidesk.database.dataclass.ExtensionDataClass
@@ -67,18 +71,17 @@ fun getExtensionList(offline: Boolean = false): List<ExtensionDataClass> {
     return transaction {
         return@transaction ExtensionsTable.selectAll().map {
             ExtensionDataClass(
-                    it[ExtensionsTable.name],
-                    it[ExtensionsTable.pkgName],
-                    it[ExtensionsTable.versionName],
-                    it[ExtensionsTable.versionCode],
-                    it[ExtensionsTable.lang],
-                    it[ExtensionsTable.isNsfw],
-                    it[ExtensionsTable.apkName],
-                    it[ExtensionsTable.iconUrl],
-                    it[ExtensionsTable.installed],
-                    it[ExtensionsTable.classFQName]
+                it[ExtensionsTable.name],
+                it[ExtensionsTable.pkgName],
+                it[ExtensionsTable.versionName],
+                it[ExtensionsTable.versionCode],
+                it[ExtensionsTable.lang],
+                it[ExtensionsTable.isNsfw],
+                it[ExtensionsTable.apkName],
+                it[ExtensionsTable.iconUrl],
+                it[ExtensionsTable.installed],
+                it[ExtensionsTable.classFQName]
             )
         }
-
     }
 }

server/src/main/kotlin/ir/armor/tachidesk/util/Manga.kt

@@ -1,5 +1,9 @@
 package ir.armor.tachidesk.util
 
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 import eu.kanade.tachiyomi.source.model.SManga
 import ir.armor.tachidesk.database.dataclass.MangaDataClass
 import ir.armor.tachidesk.database.table.MangaStatus
@@ -14,28 +18,28 @@ fun getManga(mangaId: Int): MangaDataClass {
 
         return@transaction if (mangaEntry[MangaTable.initialized]) {
             MangaDataClass(
-                    mangaId,
-                    mangaEntry[MangaTable.sourceReference].value,
+                mangaId,
+                mangaEntry[MangaTable.sourceReference].value,
 
-                    mangaEntry[MangaTable.url],
-                    mangaEntry[MangaTable.title],
-                    mangaEntry[MangaTable.thumbnail_url],
+                mangaEntry[MangaTable.url],
+                mangaEntry[MangaTable.title],
+                mangaEntry[MangaTable.thumbnail_url],
 
-                    true,
+                true,
 
-                    mangaEntry[MangaTable.artist],
-                    mangaEntry[MangaTable.author],
-                    mangaEntry[MangaTable.description],
-                    mangaEntry[MangaTable.genre],
-                    MangaStatus.valueOf(mangaEntry[MangaTable.status]).name,
+                mangaEntry[MangaTable.artist],
+                mangaEntry[MangaTable.author],
+                mangaEntry[MangaTable.description],
+                mangaEntry[MangaTable.genre],
+                MangaStatus.valueOf(mangaEntry[MangaTable.status]).name,
             )
         } else { // initialize manga
             val source = getHttpSource(mangaEntry[MangaTable.sourceReference].value)
             val fetchedManga = source.fetchMangaDetails(
-                    SManga.create().apply {
-                        url = mangaEntry[MangaTable.url]
-                        title = mangaEntry[MangaTable.title]
-                    }
+                SManga.create().apply {
+                    url = mangaEntry[MangaTable.url]
+                    title = mangaEntry[MangaTable.title]
+                }
             ).toBlocking().first()
 
             // update database
@@ -56,23 +60,21 @@ fun getManga(mangaId: Int): MangaDataClass {
             mangaEntry = MangaTable.select { MangaTable.id eq mangaId }.firstOrNull()!!
 
             MangaDataClass(
-                    mangaId,
-                    mangaEntry[MangaTable.sourceReference].value,
+                mangaId,
+                mangaEntry[MangaTable.sourceReference].value,
 
+                mangaEntry[MangaTable.url],
+                mangaEntry[MangaTable.title],
+                mangaEntry[MangaTable.thumbnail_url],
 
-                    mangaEntry[MangaTable.url],
-                    mangaEntry[MangaTable.title],
-                    mangaEntry[MangaTable.thumbnail_url],
+                true,
 
-                    true,
-
-                    mangaEntry[MangaTable.artist],
-                    mangaEntry[MangaTable.author],
-                    mangaEntry[MangaTable.description],
-                    mangaEntry[MangaTable.genre],
-                    MangaStatus.valueOf(mangaEntry[MangaTable.status]).name,
+                mangaEntry[MangaTable.artist],
+                mangaEntry[MangaTable.author],
+                mangaEntry[MangaTable.description],
+                mangaEntry[MangaTable.genre],
+                MangaStatus.valueOf(mangaEntry[MangaTable.status]).name,
             )
         }
     }
 }
-

server/src/main/kotlin/ir/armor/tachidesk/util/MangaList.kt

@@ -1,15 +1,19 @@
 package ir.armor.tachidesk.util
 
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import eu.kanade.tachiyomi.source.model.MangasPage
 import ir.armor.tachidesk.database.dataclass.MangaDataClass
+import ir.armor.tachidesk.database.dataclass.PagedMangaListDataClass
 import ir.armor.tachidesk.database.table.MangaStatus
 import ir.armor.tachidesk.database.table.MangaTable
-import ir.armor.tachidesk.database.table.SourceTable
-import org.jetbrains.exposed.sql.insert
 import org.jetbrains.exposed.sql.insertAndGetId
 import org.jetbrains.exposed.sql.select
 import org.jetbrains.exposed.sql.transactions.transaction
 
-fun getMangaList(sourceId: Long, pageNum: Int = 1, popular: Boolean): List<MangaDataClass> {
+fun getMangaList(sourceId: Long, pageNum: Int = 1, popular: Boolean): PagedMangaListDataClass {
     val source = getHttpSource(sourceId.toLong())
     val mangasPage = if (popular) {
         source.fetchPopularManga(pageNum).toBlocking().first()
@@ -19,7 +23,12 @@ fun getMangaList(sourceId: Long, pageNum: Int = 1, popular: Boolean): List<Manga
         else
             throw Exception("Source $source doesn't support latest")
     }
-    return transaction {
+    return mangasPage.processEntries(sourceId)
+}
+
+fun MangasPage.processEntries(sourceId: Long): PagedMangaListDataClass {
+    val mangasPage = this
+    val mangaList = transaction {
         return@transaction mangasPage.mangas.map { manga ->
             var mangaEntry = MangaTable.select { MangaTable.url eq manga.url }.firstOrNull()
             var mangaEntityId = if (mangaEntry == null) { // create manga entry
@@ -41,21 +50,25 @@ fun getMangaList(sourceId: Long, pageNum: Int = 1, popular: Boolean): List<Manga
             }
 
             MangaDataClass(
-                    mangaEntityId,
-                    sourceId.toLong(),
+                mangaEntityId,
+                sourceId,
 
-                    manga.url,
-                    manga.title,
-                    manga.thumbnail_url,
+                manga.url,
+                manga.title,
+                manga.thumbnail_url,
 
-                    manga.initialized,
+                manga.initialized,
 
-                    manga.artist,
-                    manga.author,
-                    manga.description,
-                    manga.genre,
-                    MangaStatus.valueOf(manga.status).name,
+                manga.artist,
+                manga.author,
+                manga.description,
+                manga.genre,
+                MangaStatus.valueOf(manga.status).name,
             )
         }
     }
-}
+    return PagedMangaListDataClass(
+        mangaList,
+        mangasPage.hasNextPage
+    )
+}

server/src/main/kotlin/ir/armor/tachidesk/util/Search.kt

@@ -0,0 +1,62 @@
+package ir.armor.tachidesk.util
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import ir.armor.tachidesk.database.dataclass.PagedMangaListDataClass
+
+fun sourceFilters(sourceId: Long) {
+    val source = getHttpSource(sourceId)
+    // source.getFilterList().toItems()
+}
+
+fun sourceSearch(sourceId: Long, searchTerm: String, pageNum: Int): PagedMangaListDataClass {
+    val source = getHttpSource(sourceId)
+    val searchManga = source.fetchSearchManga(pageNum, searchTerm, source.getFilterList()).toBlocking().first()
+    return searchManga.processEntries(sourceId)
+}
+
+fun sourceGlobalSearch(searchTerm: String) {
+}
+
+data class FilterWrapper(
+    val type: String,
+    val filter: Any
+)
+
+// private fun FilterList.toFilterWrapper(): List<FilterWrapper> {
+//    return mapNotNull { filter ->
+//        when (filter) {
+//            is Filter.Header -> FilterWrapper("Header",filter)
+//            is Filter.Separator -> FilterWrapper("Separator",filter)
+//            is Filter.CheckBox -> FilterWrapper("CheckBox",filter)
+//            is Filter.TriState -> FilterWrapper("TriState",filter)
+//            is Filter.Text -> FilterWrapper("Text",filter)
+//            is Filter.Select<*> -> FilterWrapper("Select",filter)
+//            is Filter.Group<*> -> {
+//                val group = GroupItem(filter)
+//                val subItems = filter.state.mapNotNull {
+//                    when (it) {
+//                        is Filter.CheckBox -> FilterWrapper("CheckBox",filter)
+//                        is Filter.TriState -> FilterWrapper("TriState",filter)
+//                        is Filter.Text -> FilterWrapper("Text",filter)
+//                        is Filter.Select<*> -> FilterWrapper("Select",filter)
+//                        else -> null
+//                    } as? ISectionable<*, *>
+//                }
+//                subItems.forEach { it.header = group }
+//                group.subItems = subItems
+//                group
+//            }
+//            is Filter.Sort -> {
+//                val group = SortGroup(filter)
+//                val subItems = filter.values.map {
+//                    SortItem(it, group)
+//                }
+//                group.subItems = subItems
+//                group
+//            }
+//        }
+//    }
+// }

server/src/main/kotlin/ir/armor/tachidesk/util/SourceList.kt

@@ -1,5 +1,9 @@
 package ir.armor.tachidesk.util
 
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 import eu.kanade.tachiyomi.source.SourceFactory
 import eu.kanade.tachiyomi.source.online.HttpSource
 import ir.armor.tachidesk.Config
@@ -13,7 +17,7 @@ import org.jetbrains.exposed.sql.selectAll
 import org.jetbrains.exposed.sql.transactions.transaction
 import java.net.URL
 import java.net.URLClassLoader
-import java.util.*
+import java.util.Locale
 
 private val sourceCache = mutableListOf<Pair<Long, HttpSource>>()
 private val extensionCache = mutableListOf<Pair<String, Any>>()
@@ -39,16 +43,16 @@ fun getHttpSource(sourceId: Long): HttpSource {
         val cachedExtensionPair = extensionCache.firstOrNull { it.first == jarPath }
         var usedCached = false
         val instance =
-                if (cachedExtensionPair != null) {
-                    usedCached = true
-                    println("Used cached Extension")
-                    cachedExtensionPair.second
-                } else {
-                    println("No Extension cache")
-                    val child = URLClassLoader(arrayOf<URL>(URL("file:$jarPath")), this::class.java.classLoader)
-                    val classToLoad = Class.forName(className, true, child)
-                    classToLoad.newInstance()
-                }
+            if (cachedExtensionPair != null) {
+                usedCached = true
+                println("Used cached Extension")
+                cachedExtensionPair.second
+            } else {
+                println("No Extension cache")
+                val child = URLClassLoader(arrayOf<URL>(URL("file:$jarPath")), this::class.java.classLoader)
+                val classToLoad = Class.forName(className, true, child)
+                classToLoad.newInstance()
+            }
         if (sourceRecord.partOfFactorySource) {
             return@transaction if (usedCached) {
                 (instance as List<HttpSource>)[sourceRecord.positionInFactorySource!!]
@@ -71,12 +75,26 @@ fun getSourceList(): List<SourceDataClass> {
     return transaction {
         return@transaction SourceTable.selectAll().map {
             SourceDataClass(
-                    it[SourceTable.id].value.toString(),
-                    it[SourceTable.name],
-                    Locale(it[SourceTable.lang]).getDisplayLanguage(Locale(it[SourceTable.lang])),
-                    ExtensionsTable.select { ExtensionsTable.id eq it[SourceTable.extension] }.first()[ExtensionsTable.iconUrl],
-                    getHttpSource(it[SourceTable.id].value).supportsLatest
+                it[SourceTable.id].value.toString(),
+                it[SourceTable.name],
+                Locale(it[SourceTable.lang]).getDisplayLanguage(Locale(it[SourceTable.lang])),
+                ExtensionsTable.select { ExtensionsTable.id eq it[SourceTable.extension] }.first()[ExtensionsTable.iconUrl],
+                getHttpSource(it[SourceTable.id].value).supportsLatest
             )
         }
     }
-}
+}
+
+fun getSource(sourceId: Long): SourceDataClass {
+    return transaction {
+        val source = SourceTable.select { SourceTable.id eq sourceId }.firstOrNull()!!
+
+        return@transaction SourceDataClass(
+            source[SourceTable.id].value.toString(),
+            source[SourceTable.name],
+            Locale(source[SourceTable.lang]).getDisplayLanguage(Locale(source[SourceTable.lang])),
+            ExtensionsTable.select { ExtensionsTable.id eq source[SourceTable.extension] }.first()[ExtensionsTable.iconUrl],
+            getHttpSource(source[SourceTable.id].value).supportsLatest
+        )
+    }
+}

server/src/main/kotlin/ir/armor/tachidesk/util/Util.kt

@@ -1,5 +1,9 @@
 package ir.armor.tachidesk.util
 
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 import ir.armor.tachidesk.Config
 import ir.armor.tachidesk.database.makeDataBaseTables
 import java.io.File
@@ -9,6 +13,5 @@ fun applicationSetup() {
     File(Config.dataRoot).mkdirs()
     File(Config.extensionsRoot).mkdirs()
 
-
     makeDataBaseTables()
-}
+}

webUI/build.gradle.kts

@@ -4,11 +4,11 @@ plugins {
 
 node {
     workDir = file("${project.projectDir}/react/")
-    nodeModulesDir = file("${project.projectDir}/react/node_modules")
+    nodeModulesDir = file("${project.projectDir}/react/")
 }
 
 tasks.named("yarn_build") {
-    dependsOn("yarn_install")
+    dependsOn("yarn") // install node_moduels
 }
 
 tasks.register<Copy>("copyBuild") {

webUI/react/package.json

@@ -47,4 +47,4 @@
     "eslint-plugin-react-hooks": "^4.2.0",
     "typescript": "^4.1.0"
   }
-}
+}

webUI/react/src/App.tsx

@@ -1,7 +1,15 @@
-import React from 'react';
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import React, { useState } from 'react';
 import {
     BrowserRouter as Router, Route, Switch,
 } from 'react-router-dom';
+import { Container } from '@material-ui/core';
+import CssBaseline from '@material-ui/core/CssBaseline';
+import { createMuiTheme, ThemeProvider } from '@material-ui/core/styles';
+
 import NavBar from './components/NavBar';
 import Home from './screens/Home';
 import Sources from './screens/Sources';
@@ -9,35 +17,79 @@ import Extensions from './screens/Extensions';
 import MangaList from './screens/MangaList';
 import Manga from './screens/Manga';
 import Reader from './screens/Reader';
+import Search from './screens/SearchSingle';
+import NavBarTitle from './context/NavbarTitle';
+import DarkTheme from './context/DarkTheme';
 
 export default function App() {
+    const [title, setTitle] = useState<string>('Tachidesk');
+    const [darkTheme, setDarkTheme] = useState<boolean>(true);
+    const navTitleContext = { title, setTitle };
+    const darkThemeContext = { darkTheme, setDarkTheme };
+
+    const theme = React.useMemo(
+        () => createMuiTheme({
+            palette: {
+                type: darkTheme ? 'dark' : 'light',
+            },
+            overrides: {
+                MuiCssBaseline: {
+                    '@global': {
+                        '*::-webkit-scrollbar': {
+                            width: '10px',
+                            background: darkTheme ? '#222' : '#e1e1e1',
+
+                        },
+                        '*::-webkit-scrollbar-thumb': {
+                            background: darkTheme ? '#111' : '#aaa',
+                            borderRadius: '5px',
+                        },
+                    },
+                },
+            },
+        }),
+        [darkTheme],
+    );
+
     return (
         <Router>
-            <NavBar />
 
-            <Switch>
-                <Route path="/extensions">
-                    <Extensions />
-                </Route>
-                <Route path="/sources/:sourceId/popular/">
-                    <MangaList popular />
-                </Route>
-                <Route path="/sources/:sourceId/latest/">
-                    <MangaList popular={false} />
-                </Route>
-                <Route path="/sources">
-                    <Sources />
-                </Route>
-                <Route path="/manga/:mangaId/chapter/:chapterId">
-                    <Reader />
-                </Route>
-                <Route path="/manga/:id">
-                    <Manga />
-                </Route>
-                <Route path="/">
-                    <Home />
-                </Route>
-            </Switch>
+            <ThemeProvider theme={theme}>
+                <NavBarTitle.Provider value={navTitleContext}>
+                    <CssBaseline />
+                    <DarkTheme.Provider value={darkThemeContext}>
+                        <NavBar />
+                    </DarkTheme.Provider>
+                    <Container maxWidth={false} disableGutters>
+                        <Switch>
+                            <Route path="/sources/:sourceId/search/">
+                                <Search />
+                            </Route>
+                            <Route path="/extensions">
+                                <Extensions />
+                            </Route>
+                            <Route path="/sources/:sourceId/popular/">
+                                <MangaList popular />
+                            </Route>
+                            <Route path="/sources/:sourceId/latest/">
+                                <MangaList popular={false} />
+                            </Route>
+                            <Route path="/sources">
+                                <Sources />
+                            </Route>
+                            <Route path="/manga/:mangaId/chapter/:chapterId">
+                                <Reader />
+                            </Route>
+                            <Route path="/manga/:id">
+                                <Manga />
+                            </Route>
+                            <Route path="/">
+                                <Home />
+                            </Route>
+                        </Switch>
+                    </Container>
+                </NavBarTitle.Provider>
+            </ThemeProvider>
         </Router>
     );
 }

webUI/react/src/components/ChapterCard.tsx

@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 import React from 'react';
 import { makeStyles } from '@material-ui/core/styles';
 import Card from '@material-ui/core/Card';

webUI/react/src/components/ExtensionCard.tsx

@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 import React, { useState } from 'react';
 import { makeStyles } from '@material-ui/core/styles';
 import Card from '@material-ui/core/Card';

webUI/react/src/components/MangaCard.tsx

@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 import React from 'react';
 import { makeStyles } from '@material-ui/core/styles';
 import Card from '@material-ui/core/Card';
@@ -5,6 +9,7 @@ import CardActionArea from '@material-ui/core/CardActionArea';
 import CardMedia from '@material-ui/core/CardMedia';
 import Typography from '@material-ui/core/Typography';
 import { Link } from 'react-router-dom';
+import { Grid } from '@material-ui/core';
 
 const useStyles = makeStyles({
     root: {
@@ -39,7 +44,7 @@ const useStyles = makeStyles({
 interface IProps {
     manga: IManga
 }
-export default function MangaCard(props: IProps) {
+const MangaCard = React.forwardRef((props: IProps, ref) => {
     const {
         manga: {
             id, title, thumbnailUrl,
@@ -48,22 +53,26 @@ export default function MangaCard(props: IProps) {
     const classes = useStyles();
 
     return (
-        <Link to={`/manga/${id}/`}>
-            <Card className={classes.root}>
-                <CardActionArea>
-                    <div className={classes.wrapper}>
-                        <CardMedia
-                            className={classes.image}
-                            component="img"
-                            alt={title}
-                            image={thumbnailUrl}
-                            title={title}
-                        />
-                        <div className={classes.gradient} />
-                        <Typography className={classes.title} variant="h5" component="h2">{title}</Typography>
-                    </div>
-                </CardActionArea>
-            </Card>
-        </Link>
+        <Grid item xs={6} sm={4} md={3} lg={2}>
+            <Link to={`/manga/${id}/`}>
+                <Card className={classes.root} ref={ref}>
+                    <CardActionArea>
+                        <div className={classes.wrapper}>
+                            <CardMedia
+                                className={classes.image}
+                                component="img"
+                                alt={title}
+                                image={thumbnailUrl}
+                                title={title}
+                            />
+                            <div className={classes.gradient} />
+                            <Typography className={classes.title} variant="h5" component="h2">{title}</Typography>
+                        </div>
+                    </CardActionArea>
+                </Card>
+            </Link>
+        </Grid>
     );
-}
+});
+
+export default MangaCard;

webUI/react/src/components/MangaDetails.tsx

@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 import React from 'react';
 
 interface IProps{

webUI/react/src/components/MangaGrid.tsx

@@ -0,0 +1,59 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import React, { useEffect, useRef } from 'react';
+import Grid from '@material-ui/core/Grid';
+import MangaCard from './MangaCard';
+
+interface IProps{
+    mangas: IManga[]
+    message?: string
+    hasNextPage: boolean
+    lastPageNum: number
+    setLastPageNum: (lastPageNum: number) => void
+}
+
+export default function MangaGrid(props: IProps) {
+    const {
+        mangas, message, hasNextPage, lastPageNum, setLastPageNum,
+    } = props;
+    let mapped;
+    const lastManga = useRef<HTMLInputElement>();
+
+    const scrollHandler = () => {
+        if (lastManga.current) {
+            const rect = lastManga.current.getBoundingClientRect();
+            if (((rect.y + rect.height) / window.innerHeight < 2) && hasNextPage) {
+                setLastPageNum(lastPageNum + 1);
+            }
+        }
+    };
+    useEffect(() => {
+        window.addEventListener('scroll', scrollHandler, true);
+        return () => {
+            window.removeEventListener('scroll', scrollHandler, true);
+        };
+    }, [hasNextPage, mangas]);
+
+    if (mangas.length === 0) {
+        mapped = <h3>{message}</h3>;
+    } else {
+        mapped = mangas.map((it, idx) => {
+            if (idx === mangas.length - 1) {
+                return <MangaCard manga={it} ref={lastManga} />;
+            }
+            return <MangaCard manga={it} />;
+        });
+    }
+
+    return (
+        <Grid container spacing={1} xs={12} style={{ margin: 0, padding: '5px' }}>
+            {mapped}
+        </Grid>
+    );
+}
+
+MangaGrid.defaultProps = {
+    message: 'loading...',
+};

webUI/react/src/components/NavBar.tsx

@@ -1,11 +1,21 @@
-import React, { useState } from 'react';
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import React, { useContext, useState } from 'react';
 import { makeStyles } from '@material-ui/core/styles';
+import MoreIcon from '@material-ui/icons/MoreVert';
 import AppBar from '@material-ui/core/AppBar';
 import Toolbar from '@material-ui/core/Toolbar';
 import Typography from '@material-ui/core/Typography';
 import IconButton from '@material-ui/core/IconButton';
 import MenuIcon from '@material-ui/icons/Menu';
+import MenuItem from '@material-ui/core/MenuItem';
+import Menu from '@material-ui/core/Menu';
+
 import TemporaryDrawer from './TemporaryDrawer';
+import NavBarTitle from '../context/NavbarTitle';
+import DarkTheme from '../context/DarkTheme';
 
 const useStyles = makeStyles((theme) => ({
     root: {
@@ -19,13 +29,35 @@ const useStyles = makeStyles((theme) => ({
     },
 }));
 
+// const theme = createMuiTheme({
+//     overrides: {
+//         MuiAppBar: {
+//             colorPrimary: { backgroundColor: '#FFC0CB' },
+//         },
+//     },
+//     palette: { type: 'dark' },
+// });
+
 export default function NavBar() {
     const classes = useStyles();
     const [drawerOpen, setDrawerOpen] = useState(false);
+    const [anchorEl, setAnchorEl] = React.useState<null | HTMLElement>(null);
+    const { title } = useContext(NavBarTitle);
+    const open = Boolean(anchorEl);
+
+    const { darkTheme, setDarkTheme } = useContext(DarkTheme);
+
+    const handleMenu = (event: React.MouseEvent<HTMLElement>) => {
+        setAnchorEl(event.currentTarget);
+    };
+
+    const handleClose = () => {
+        setAnchorEl(null);
+    };
 
     return (
         <div className={classes.root}>
-            <AppBar position="static">
+            <AppBar position="static" color={darkTheme ? 'default' : 'primary'}>
                 <Toolbar>
                     <IconButton
                         edge="start"
@@ -38,8 +70,44 @@ export default function NavBar() {
                         <MenuIcon />
                     </IconButton>
                     <Typography variant="h6" className={classes.title}>
-                        Tachidesk
+                        {title}
                     </Typography>
+                    <IconButton
+                        onClick={handleMenu}
+                        aria-label="display more actions"
+                        edge="end"
+                        color="inherit"
+                    >
+                        <MoreIcon />
+                    </IconButton>
+                    <Menu
+                        id="menu-appbar"
+                        anchorEl={anchorEl}
+                        anchorOrigin={{
+                            vertical: 'top',
+                            horizontal: 'right',
+                        }}
+                        keepMounted
+                        transformOrigin={{
+                            vertical: 'top',
+                            horizontal: 'right',
+                        }}
+                        open={open}
+                        onClose={handleClose}
+                    >
+                        <MenuItem
+                            onClick={() => { setDarkTheme(true); handleClose(); }}
+                        >
+                            Dark Theme
+
+                        </MenuItem>
+                        <MenuItem
+                            onClick={() => { setDarkTheme(false); handleClose(); }}
+                        >
+                            Light Theme
+
+                        </MenuItem>
+                    </Menu>
                 </Toolbar>
             </AppBar>
             <TemporaryDrawer drawerOpen={drawerOpen} setDrawerOpen={setDrawerOpen} />

webUI/react/src/components/SourceCard.tsx

@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 import React from 'react';
 import { makeStyles } from '@material-ui/core/styles';
 import Card from '@material-ui/core/Card';
@@ -65,8 +69,9 @@ export default function SourceCard(props: IProps) {
                     </div>
                 </div>
                 <div style={{ display: 'flex' }}>
-                    {supportsLatest && <Button variant="outlined" style={{ marginLeft: 20 }} onClick={() => { window.location.href = `sources/${id}/latest/`; }}>Latest</Button>}
-                    <Button variant="outlined" style={{ marginLeft: 20 }} onClick={() => { window.location.href = `sources/${id}/popular/`; }}>Browse</Button>
+                    <Button variant="outlined" style={{ marginLeft: 20 }} onClick={() => { window.location.href = `/sources/${id}/search/`; }}>Search</Button>
+                    {supportsLatest && <Button variant="outlined" style={{ marginLeft: 20 }} onClick={() => { window.location.href = `/sources/${id}/latest/`; }}>Latest</Button>}
+                    <Button variant="outlined" style={{ marginLeft: 20 }} onClick={() => { window.location.href = `/sources/${id}/popular/`; }}>Browse</Button>
                 </div>
             </CardContent>
         </Card>

webUI/react/src/components/TemporaryDrawer.tsx

@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 import React from 'react';
 import { makeStyles } from '@material-ui/core/styles';
 import Drawer from '@material-ui/core/Drawer';
@@ -48,6 +52,14 @@ export default function TemporaryDrawer({ drawerOpen, setDrawerOpen }: IProps) {
                         <ListItemText primary="Sources" />
                     </ListItem>
                 </Link>
+                {/* <Link to="/search" style={{ color: 'inherit', textDecoration: 'none' }}>
+                    <ListItem button key="Search">
+                        <ListItemIcon>
+                            <InboxIcon />
+                        </ListItemIcon>
+                        <ListItemText primary="Global Search" />
+                    </ListItem>
+                </Link> */}
             </List>
         </div>
     );

webUI/react/src/context/DarkTheme.tsx

@@ -0,0 +1,17 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import React from 'react';
+
+type ContextType = {
+    darkTheme: boolean
+    setDarkTheme: React.Dispatch<React.SetStateAction<boolean>>
+};
+
+const DarkTheme = React.createContext<ContextType>({
+    darkTheme: true,
+    setDarkTheme: ():void => {},
+});
+
+export default DarkTheme;

webUI/react/src/context/NavbarTitle.tsx

@@ -0,0 +1,17 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import React from 'react';
+
+type ContextType = {
+    title: string
+    setTitle: React.Dispatch<React.SetStateAction<string>>
+};
+
+const NavBarTitle = React.createContext<ContextType>({
+    title: 'Tachidesk',
+    setTitle: ():void => {},
+});
+
+export default NavBarTitle;

webUI/react/src/index.css

@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 body {
     margin: 0;
 }

webUI/react/src/index.tsx

@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 import React from 'react';
 import ReactDOM from 'react-dom';
 import App from './App';

webUI/react/src/react-app-env.d.ts

@@ -1 +1,5 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 /// <reference types="react-scripts" />

webUI/react/src/reportWebVitals.ts

@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 import { ReportHandler } from 'web-vitals';
 
 const reportWebVitals = (onPerfEntry?: ReportHandler) => {

webUI/react/src/screens/Extensions.tsx

@@ -1,8 +1,14 @@
-import React, { useEffect, useState } from 'react';
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import React, { useContext, useEffect, useState } from 'react';
 import ExtensionCard from '../components/ExtensionCard';
+import NavBarTitle from '../context/NavbarTitle';
 
 export default function Extensions() {
-    let mapped;
+    const { setTitle } = useContext(NavBarTitle);
+    setTitle('Extensions');
     const [extensions, setExtensions] = useState<IExtension[]>([]);
 
     useEffect(() => {
@@ -12,10 +18,7 @@ export default function Extensions() {
     }, []);
 
     if (extensions.length === 0) {
-        mapped = <h3>wait</h3>;
-    } else {
-        mapped = extensions.map((it) => <ExtensionCard extension={it} />);
+        return <h3>wait</h3>;
     }
-
-    return <h2>{mapped}</h2>;
+    return <>{extensions.map((it) => <ExtensionCard extension={it} />)}</>;
 }

webUI/react/src/screens/Home.tsx

@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 import React from 'react';
 
 export default function Home() {

webUI/react/src/screens/Manga.tsx

@@ -1,10 +1,16 @@
-import React, { useEffect, useState } from 'react';
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import React, { useEffect, useState, useContext } from 'react';
 import { useParams } from 'react-router-dom';
 import ChapterCard from '../components/ChapterCard';
 import MangaDetails from '../components/MangaDetails';
+import NavBarTitle from '../context/NavbarTitle';
 
 export default function Manga() {
     const { id } = useParams<{id: string}>();
+    const { setTitle } = useContext(NavBarTitle);
 
     const [manga, setManga] = useState<IManga>();
     const [chapters, setChapters] = useState<IChapter[]>([]);
@@ -12,7 +18,10 @@ export default function Manga() {
     useEffect(() => {
         fetch(`http://127.0.0.1:4567/api/v1/manga/${id}/`)
             .then((response) => response.json())
-            .then((data) => setManga(data));
+            .then((data: IManga) => {
+                setManga(data);
+                setTitle(data.title);
+            });
     }, []);
 
     useEffect(() => {

webUI/react/src/screens/MangaList.tsx

@@ -1,33 +1,45 @@
-import React, { useEffect, useState } from 'react';
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import React, { useContext, useEffect, useState } from 'react';
 import { useParams } from 'react-router-dom';
-import MangaCard from '../components/MangaCard';
+import MangaGrid from '../components/MangaGrid';
+import NavBarTitle from '../context/NavbarTitle';
 
 export default function MangaList(props: { popular: boolean }) {
     const { sourceId } = useParams<{sourceId: string}>();
-    let mapped;
+    const { setTitle } = useContext(NavBarTitle);
     const [mangas, setMangas] = useState<IManga[]>([]);
-    const [lastPageNum] = useState<number>(1);
+    const [hasNextPage, setHasNextPage] = useState<boolean>(false);
+    const [lastPageNum, setLastPageNum] = useState<number>(1);
+
+    useEffect(() => {
+        fetch(`http://127.0.0.1:4567/api/v1/source/${sourceId}`)
+            .then((response) => response.json())
+            .then((data: { name: string }) => setTitle(data.name));
+    }, []);
 
     useEffect(() => {
         const sourceType = props.popular ? 'popular' : 'latest';
         fetch(`http://127.0.0.1:4567/api/v1/source/${sourceId}/${sourceType}/${lastPageNum}`)
             .then((response) => response.json())
-            .then((data: { title: string, thumbnail_url: string, id:number }[]) => setMangas(
-                data.map((it) => ({ title: it.title, thumbnailUrl: it.thumbnail_url, id: it.id })),
-            ));
-    }, []);
+            .then((data: { mangaList: IManga[], hasNextPage: boolean }) => {
+                setMangas([
+                    ...mangas,
+                    ...data.mangaList.map((it) => ({
+                        title: it.title, thumbnailUrl: it.thumbnailUrl, id: it.id,
+                    }))]);
+                setHasNextPage(data.hasNextPage);
+            });
+    }, [lastPageNum]);
 
-    if (mangas.length === 0) {
-        mapped = <h3>wait</h3>;
-    } else {
-        mapped = (
-            <div style={{ display: 'grid', gridTemplateColumns: 'repeat(5, auto)', gridGap: '1em' }}>
-                {mangas.map((it) => (
-                    <MangaCard manga={it} />
-                ))}
-            </div>
-        );
-    }
-
-    return mapped;
+    return (
+        <MangaGrid
+            mangas={mangas}
+            hasNextPage={hasNextPage}
+            lastPageNum={lastPageNum}
+            setLastPageNum={setLastPageNum}
+        />
+    );
 }

webUI/react/src/screens/Reader.tsx

@@ -1,5 +1,10 @@
-import React, { useEffect, useState } from 'react';
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import React, { useContext, useEffect, useState } from 'react';
 import { useParams } from 'react-router-dom';
+import NavBarTitle from '../context/NavbarTitle';
 
 const style = {
     display: 'flex',
@@ -14,14 +19,24 @@ interface IPage {
     imageUrl: string
 }
 
+interface IData {
+    first: IChapter
+    second: IPage[]
+}
+
 export default function Reader() {
+    const { setTitle } = useContext(NavBarTitle);
+
     const [pages, setPages] = useState<IPage[]>([]);
     const { chapterId, mangaId } = useParams<{chapterId: string, mangaId: string}>();
 
     useEffect(() => {
         fetch(`http://127.0.0.1:4567/api/v1/manga/${mangaId}/chapter/${chapterId}`)
             .then((response) => response.json())
-            .then((data) => setPages(data));
+            .then((data:IData) => {
+                setTitle(data.first.name);
+                setPages(data.second);
+            });
     }, []);
 
     pages.sort((a, b) => (a.index - b.index));

webUI/react/src/screens/SearchSingle.tsx

@@ -0,0 +1,95 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import React, { useContext, useEffect, useState } from 'react';
+import { makeStyles } from '@material-ui/core/styles';
+import TextField from '@material-ui/core/TextField';
+import Button from '@material-ui/core/Button';
+import { useParams } from 'react-router-dom';
+import MangaGrid from '../components/MangaGrid';
+import NavBarTitle from '../context/NavbarTitle';
+
+const useStyles = makeStyles((theme) => ({
+    root: {
+        TextField: {
+            margin: theme.spacing(1),
+            width: '25ch',
+        },
+    },
+}));
+
+export default function SearchSingle() {
+    const { setTitle } = useContext(NavBarTitle);
+    const { sourceId } = useParams<{sourceId: string}>();
+    const classes = useStyles();
+    const [error, setError] = useState<boolean>(false);
+    const [mangas, setMangas] = useState<IManga[]>([]);
+    const [message, setMessage] = useState<string>('');
+    const [searchTerm, setSearchTerm] = useState<string>('');
+    const [hasNextPage, setHasNextPage] = useState<boolean>(false);
+    const [lastPageNum, setLastPageNum] = useState<number>(1);
+
+    const textInput = React.createRef<HTMLInputElement>();
+
+    useEffect(() => {
+        fetch(`http://127.0.0.1:4567/api/v1/source/${sourceId}`)
+            .then((response) => response.json())
+            .then((data: { name: string }) => setTitle(`Search: ${data.name}`));
+    }, []);
+
+    function processInput() {
+        if (textInput.current) {
+            const { value } = textInput.current;
+            if (value === '') {
+                setError(true);
+                setMessage('Type something to search');
+            } else {
+                setError(false);
+                setSearchTerm(value);
+                setMessage('');
+            }
+        }
+    }
+
+    useEffect(() => {
+        if (searchTerm.length > 0) {
+            fetch(`http://127.0.0.1:4567/api/v1/source/${sourceId}/search/${searchTerm}/${lastPageNum}`)
+                .then((response) => response.json())
+                .then((data: { mangaList: IManga[], hasNextPage: boolean }) => {
+                    if (data.mangaList.length > 0) {
+                        setMangas([
+                            ...mangas,
+                            ...data.mangaList.map((it) => ({
+                                title: it.title, thumbnailUrl: it.thumbnailUrl, id: it.id,
+                            }))]);
+                        setHasNextPage(data.hasNextPage);
+                    } else {
+                        setMessage('search qeury returned nothing.');
+                    }
+                });
+        }
+    }, [searchTerm]);
+
+    const mangaGrid = (
+        <MangaGrid
+            mangas={mangas}
+            message={message}
+            hasNextPage={hasNextPage}
+            lastPageNum={lastPageNum}
+            setLastPageNum={setLastPageNum}
+        />
+    );
+
+    return (
+        <>
+            <form className={classes.root} noValidate autoComplete="off">
+                <TextField inputRef={textInput} error={error} id="standard-basic" label="Search text.." />
+                <Button variant="contained" color="primary" onClick={() => processInput()}>
+                    Search
+                </Button>
+            </form>
+            {mangaGrid}
+        </>
+    );
+}

webUI/react/src/screens/Sources.tsx

@@ -1,8 +1,14 @@
-import React, { useEffect, useState } from 'react';
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import React, { useContext, useEffect, useState } from 'react';
 import SourceCard from '../components/SourceCard';
+import NavBarTitle from '../context/NavbarTitle';
 
 export default function Sources() {
-    let mapped;
+    const { setTitle } = useContext(NavBarTitle);
+    setTitle('Sources');
     const [sources, setSources] = useState<ISource[]>([]);
 
     useEffect(() => {
@@ -12,10 +18,7 @@ export default function Sources() {
     }, []);
 
     if (sources.length === 0) {
-        mapped = <h3>wait</h3>;
-    } else {
-        mapped = sources.map((it) => <SourceCard source={it} />);
+        return (<h3>wait</h3>);
     }
-
-    return <h2>{mapped}</h2>;
+    return <>{sources.map((it) => <SourceCard source={it} />)}</>;
 }

webUI/react/src/typings.d.ts

@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 interface IExtension {
     name: string
     lang: string