feat: rokahon extension x.y.1 (#2)

* feat: impl all core feat

* feat: implement all core feat

* feat: implement all core feat

* uncomment compile

* fix: version

* fix: rename to default

* fix: order

* chore: workflows

* test: account diff env

* test: account diff env

Author: michael-0acf4

.github/workflows/auto-build.yml

@@ -0,0 +1,45 @@
+# git tag
+# git tag vx.y.z
+# git push --tag
+
+on:
+ push:
+   tags:
+     - v*
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        include:
+          - os: ubuntu-latest
+            extension: ""
+          - os: windows-latest
+            extension: ".exe"
+
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Setup repo
+        uses: actions/checkout@v3
+      - name: Setup Deno
+        uses: denoland/setup-deno@v1
+        with:
+          deno-version: v1.43.6
+
+      - name: Building rokahon on ${{ matrix.os }}
+        run: |
+          cd rokahon-server
+          make compile
+
+      - name: Archive build for ${{ matrix.os }}
+        run: |
+          cd rokahon-server
+          tar -czvf ../rokahon-${{ github.ref_name }}-${{ matrix.os }}.tar.gz *
+
+      - name: Release ${{ matrix.os }}
+        uses: svenstaro/upload-release-action@v2
+        with:
+          tag: ${{ github.ref }}
+          file: "rokahon-${{ github.ref_name }}-${{ matrix.os }}.tar.gz"
+          asset_name: "rokahon-${{ github.ref_name }}-${{ matrix.os }}.tar.gz"
+          overwrite: true

.github/workflows/tests.yml

@@ -0,0 +1,31 @@
+name: rokahon tests
+
+on:
+  push:
+    branches: ["main"]
+  pull_request:
+    branches: ["main"]
+
+jobs:
+  test:
+    strategy:
+      matrix:
+        include:
+          - os: ubuntu-latest
+          - os: windows-latest
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Setup repo
+        uses: actions/checkout@v3
+      - name: Setup Deno
+        uses: denoland/setup-deno@v1
+        with:
+          deno-version: v1.43.6
+      # - name: Verify formatting
+      #   run: deno fmt --check
+      # - name: Run linter
+      #   run: deno lint
+      - name: Run rokahon tests
+        run: |
+          cd rokahon-server
+          make test

.gitignore

@@ -13,3 +13,39 @@ repo/
 apk/
 gen
 generated-src/
+
+# https://raw.githubusercontent.com/github/gitignore/main/Android.gitignore
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Log/OS Files
+*.log
+
+# Android Studio generated files and folders
+captures/
+.externalNativeBuild/
+.cxx/
+*.apk
+output.json
+
+# IntelliJ
+*.iml
+.idea/
+misc.xml
+deploymentTargetDropDown.xml
+render.experimental.xml
+
+# Keystore files
+*.jks
+*.keystore
+
+# Google Services (e.g. APIs or Firebase)
+google-services.json
+
+# Android Profiling
+*.hprof

README.md

@@ -8,15 +8,9 @@ Rokahon (or ローカル本) is a simple server for your local gallery, you can
 browse local files through apps similar to Mihon or just use it as a simple REST
 endpoint.
 
-## Rokahon Mihon Extension
-
-Rokahon android extension for Mihon or any Tachyomi-like apps.
-
-TODO
-
 ## Rokahon server
 
-A very basic server that automatically scans and cache a list of directories.
+A very basic server that exposes your local gallery into a functional REST api.
 
 For example, with the configuration..
 
@@ -37,20 +31,31 @@ Rōkahon will serve any subdirectory that follows the structure
 ```
 path/to/lib1/..
    bookTitle
-     chapter1
+     chapter2
        1.ext
-       2.ext
        ..
-     chapter2
+     chapter1
        1.ext
+       2.ext
        ..
 
 other/lib2/..
    bookTitle
-     chapter1
+     chapter2
        a.ext
        ..
-     chapter2
+     chapter1
        a.ext
        ..
 ```
+
+## Rokahon Mihon Extension
+
+Rokahon android extension for Mihon or any most Tachyomi forks.
+
+Simply launch the server, install the extension, configure the address and you
+are done.
+
+<p align="center">
+  <img src="misc/address_screenshot.bmp">
+</p>

misc/address_screenshot.bmp

@@ -39,4 +39,3 @@ fun loadIndividualExtension(lang: String, name: String) {
 fun File.eachDir(block: (File) -> Unit) {
     listFiles()?.filter { it.isDirectory }?.forEach { block(it) }
 }
-include(":extensions:individual:all:rokahhon")

rokahon-extension/local.properties

@@ -6,7 +6,7 @@ ext {
     extName = 'Rokahon'
     pkgNameSuffix = 'all.rokahon'
     extClass = '.Rokahon'
-    extVersionCode = 12
+    extVersionCode = 1
 }
 
 apply from: "$rootDir/common.gradle"

rokahon-extension/settings.gradle.kts

@@ -37,6 +37,7 @@ class Rokahon : ConfigurableSource, UnmeteredSource, HttpSource() {
         private const val ADDRESS_TITLE = "Server URL"
         private const val ADDRESS_DEFAULT = "http://192.168.1.170:1770"
     }
+
     override val baseUrl by lazy { preferences.getString(ADDRESS_TITLE, ADDRESS_DEFAULT)!! }
 
     private val json: Json by injectLazy()
@@ -53,12 +54,11 @@ class Rokahon : ConfigurableSource, UnmeteredSource, HttpSource() {
     override fun latestUpdatesRequest(page: Int): Request = throw Exception("Not supported")
     override fun latestUpdatesParse(response: Response): MangasPage = throw Exception("Not supported")
     override fun imageUrlParse(response: Response): String = throw Exception("Not supported")
-    override fun pageListParse(response: Response): List<Page> = throw UnsupportedOperationException("Not used")
 
-    // MANGA SEARCH + PARSE
+    // MANGA SEARCH
     override fun searchMangaRequest(page: Int, query: String, filters: FilterList): Request {
         // Response will be available in searchMangaParse
-        println("searchMangaRequest")
+        println("FN_CALL searchMangaRequest")
         val url = "$baseUrl/search"
             .toHttpUrl()
             .newBuilder()
@@ -67,8 +67,9 @@ class Rokahon : ConfigurableSource, UnmeteredSource, HttpSource() {
             .build()
         return GET(url, headers)
     }
+
     override fun searchMangaParse(response: Response): MangasPage {
-        println("searchMangaParse")
+        println("FN_CALL searchMangaParse")
         var rokaResponse = json.decodeFromString<RokahonResponse<List<RokahonSimpBook>>>(response.body.string())
         if (rokaResponse.isError) {
             val msg = rokaResponse.data.toString()
@@ -83,7 +84,6 @@ class Rokahon : ConfigurableSource, UnmeteredSource, HttpSource() {
                     title = book.title
                     url = "$baseUrl/book/" + book.id
                     thumbnail_url = "$baseUrl/image?id=" + book.cover.id
-                    genre = "sample"
                     status = SManga.ONGOING
                 },
             )
@@ -92,80 +92,69 @@ class Rokahon : ConfigurableSource, UnmeteredSource, HttpSource() {
         return MangasPage(items, false)
     }
 
-    // POPULAR MANGA REQUEST + PARSE
+    // POPULAR MANGA
     override fun popularMangaRequest(page: Int) = searchMangaRequest(1, "", FilterList())
 
-    override fun popularMangaParse(response: Response): MangasPage {
-        return searchMangaParse(response)
-    }
+    override fun popularMangaParse(response: Response) = searchMangaParse(response)
 
     // MANGA DETAILS
     override fun fetchMangaDetails(manga: SManga): Observable<SManga> {
-        println("fetchMangaDetails " + manga.title)
+        println("FN_CALL fetchMangaDetails " + manga.title + " :: " + manga.url)
         return Observable.just(manga)
     }
 
-    override fun mangaDetailsRequest(manga: SManga): Request {
-        println("mangaDetailsRequest " + manga.title)
-        return super.mangaDetailsRequest(manga)
-    }
-
-    override fun mangaDetailsParse(response: Response) = throw UnsupportedOperationException("Not used.")
+    override fun mangaDetailsParse(response: Response) = throw UnsupportedOperationException("mangaDetailsParse :: Not used")
 
-    // CHAPTER LIST + PARSE
-//    override fun prepareNewChapter(chapter: SChapter, manga: SManga) {
-//        println("prepareNewChapter " + chapter.url)
-//        super.prepareNewChapter(chapter, manga)
-//    }
+    // CHAPTER LIST
+    override fun chapterListRequest(manga: SManga): Request {
+        println("FN_CALL chapterListRequest " + manga.title + " :: " + manga.url)
+        return GET(manga.url, headers)
+    }
 
-    override fun fetchChapterList(manga: SManga): Observable<List<SChapter>> {
-        println("fetchChapterList " + manga.title)
-        var response = GET(manga.url, headers)
-        val rokaResponse = json.decodeFromString<RokahonResponse<RokahonSimpBook>>(response.body.toString())
+    override fun chapterListParse(response: Response): List<SChapter> {
+        println("FN_CALL chapterListParse " + response.request.url)
+        val rokaResponse = json.decodeFromString<RokahonResponse<RokahonSimpBook>>(response.body.string())
         if (rokaResponse.isError) {
             val msg = rokaResponse.data.toString()
             Log.e("Search", msg)
+            throw Exception(msg)
         }
         val book = rokaResponse.data
-        val chapters = book.chapters.map {
+        return book.chapters.map {
             SChapter.create().apply {
-                url = "$baseUrl/pages/" + book.id + "/" + it.id
+                url = "$baseUrl/chapter/" + book.id + "/" + it.id
                 name = it.title
             }
         }
-        return Observable.just(chapters)
     }
 
-    override fun chapterListRequest(manga: SManga): Request {
-        println("chapterListRequest " + manga.title + " :: " + manga.url)
-        return GET(manga.url, headers)
+    // PAGE
+    override fun pageListRequest(chapter: SChapter): Request {
+        println("FN_CALL pageListRequest " + chapter.url)
+        return GET(chapter.url, headers)
     }
 
-    override fun chapterListParse(response: Response): List<SChapter> {
-        println("chapterListParse " + response.request.url)
-        val rokaResponse = json.decodeFromString<RokahonResponse<RokahonSimpBook>>(response.body.toString())
+    override fun pageListParse(response: Response): List<Page> {
+        println("FN_CALL pageListParse " + response.request.url)
+        val rokaResponse = json.decodeFromString<RokahonResponse<RokahonChapter>>(response.body.string())
         if (rokaResponse.isError) {
             val msg = rokaResponse.data.toString()
             Log.e("Search", msg)
             throw Exception(msg)
         }
-        val book = rokaResponse.data
-        return book.chapters.map {
-            SChapter.create().apply {
-                url = "$baseUrl/pages/" + book.id + "/" + it.id
-                name = it.title
-            }
+        val chapter = rokaResponse.data
+        return chapter.pages.map {
+            Page(
+                index = it.number,
+                imageUrl = "$baseUrl/image?id=" + it.image.id,
+            )
         }
     }
 
-    override fun pageListRequest(chapter: SChapter): Request {
-        TODO("page list request")
-    }
-
     // Settings/UI
 
     override fun setupPreferenceScreen(screen: PreferenceScreen) {
-        screen.addPreference(screen.editTextPreference(ADDRESS_TITLE, ADDRESS_DEFAULT, baseUrl, false, "i.e. http://192.168.1.115:4567"))
+        screen.addPreference(screen.editTextPreference(ADDRESS_TITLE, ADDRESS_DEFAULT, baseUrl, false, "http://192.168.1.170:1770"))
     }
 
     private val preferences: SharedPreferences by lazy {
@@ -194,7 +183,7 @@ class Rokahon : ConfigurableSource, UnmeteredSource, HttpSource() {
             setOnPreferenceChangeListener { _, newValue ->
                 try {
                     val res = preferences.edit().putString(title, newValue as String).commit()
-                    Toast.makeText(context, "Restart Tachiyomi to apply new setting.", Toast.LENGTH_LONG).show()
+                    Toast.makeText(context, "Restart application to apply new setting.", Toast.LENGTH_LONG).show()
                     res
                 } catch (e: Exception) {
                     Log.e("Rokahon", "Exception while setting text preference", e)

rokahon-extension/src/all/rokahon/build.gradle

@@ -5,8 +5,8 @@ CONFIG = ./src/deno.json
 server:
 	deno run -A --config=$(CONFIG) $(MAIN)
 
-# compile:
-# 	deno compile -A --output $(BIN) --config=$(CONFIG) $(MAIN) --is_compiled_binary
+compile:
+	deno compile -A --output $(BIN) --config=$(CONFIG) $(MAIN) --is_compiled_binary
 
 cache:
 	deno cache --config=$(CONFIG) --lock-write $(MAIN)