user01/Pupil
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[WIP] Downloads

Browse Source
This commit is contained in:
tom5079
2021-06-08 18:24:52 +09:00
parent ff0df0d9cc
commit 760194bde8
10 changed files with 127 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/build.gradle
View File

@@ -23,7 +23,6 @@ android {
versionCode 65
versionName "6.0.0-alpha2"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
}
buildTypes {
debug {
@@ -66,21 +65,21 @@ android {
dependencies {
implementation fileTree(dir: "libs", include: ["*.jar", "*.aar"])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.0"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.10"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0-RC"
implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.2.0"
implementation "androidx.appcompat:appcompat:1.2.0"
implementation "androidx.activity:activity-ktx:1.3.0-alpha07"
implementation "androidx.fragment:fragment-ktx:1.3.3"
implementation "androidx.appcompat:appcompat:1.3.0"
implementation "androidx.activity:activity-ktx:1.3.0-beta01"
implementation "androidx.fragment:fragment-ktx:1.3.4"
implementation "androidx.preference:preference-ktx:1.1.1"
implementation "androidx.recyclerview:recyclerview:1.2.0"
implementation "androidx.recyclerview:recyclerview:1.2.1"
implementation "androidx.constraintlayout:constraintlayout:2.0.4"
implementation "androidx.gridlayout:gridlayout:1.0.0"
implementation "androidx.biometric:biometric:1.1.0"
implementation "androidx.work:work-runtime-ktx:2.6.0-alpha02"
implementation "androidx.work:work-runtime-ktx:2.6.0-beta01"
implementation 'org.kodein.di:kodein-di-framework-android-x:7.5.0'
implementation 'org.kodein.di:kodein-di-framework-android-x:7.6.0'
implementation "com.daimajia.swipelayout:library:1.2.0@aar"
@@ -111,7 +110,7 @@ dependencies {
implementation "ru.noties.markwon:core:3.1.0"
implementation "xyz.quaver:libpupil:2.0.0"
implementation "xyz.quaver:libpupil:2.1.0"
implementation "xyz.quaver:documentfilex:0.6.1"
implementation "xyz.quaver:floatingsearchview:1.1.7"

1
app/src/main/java/xyz/quaver/pupil/sources/Common.kt
View File

@@ -151,4 +151,5 @@ val sourceModule = DI.Module(name = "source") {
}
bind { factory { source: String -> History(di, source) } }
bind { singleton { Downloads(di) } }
}

103
app/src/main/java/xyz/quaver/pupil/sources/Downloads.kt Normal file
View File

@@ -0,0 +1,103 @@
/*
* Pupil, Hitomi.la viewer for Android
* Copyright (C) 2021 tom5079
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package xyz.quaver.pupil.sources
import android.app.Application
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.channels.Channel
import kotlinx.coroutines.launch
import kotlinx.serialization.decodeFromString
import kotlinx.serialization.json.Json
import org.kodein.di.DI
import org.kodein.di.DIAware
import org.kodein.di.instance
import xyz.quaver.floatingsearchview.suggestions.model.SearchSuggestion
import xyz.quaver.io.FileX
import xyz.quaver.io.util.getChild
import xyz.quaver.pupil.R
import xyz.quaver.pupil.util.DownloadManager
import kotlin.math.max
import kotlin.math.min
class Downloads(override val di: DI) : Source<DefaultSortMode, SearchSuggestion>(), DIAware {
override val name: String
get() = "Downloads"
override val iconResID: Int
get() = R.drawable.ic_download
override val preferenceID: Int
get() = -1
override val availableSortMode: Array<DefaultSortMode> = DefaultSortMode.values()
private val downloadManager: DownloadManager by instance()
private val applicationContext: Application by instance()
override suspend fun search(query: String, range: IntRange, sortMode: Enum<*>): Pair<Channel<ItemInfo>, Int> {
val downloads = downloadManager.downloads.toList()
val channel = Channel<ItemInfo>()
val sanitizedRange = max(0, range.first) .. min(range.last, downloads.size - 1)
CoroutineScope(Dispatchers.IO).launch {
downloads.slice(sanitizedRange).map { (_, folderName) ->
transform(downloadManager.downloadFolder.getChild(folderName))
}.forEach {
channel.send(it)
}
channel.close()
}
return Pair(channel, downloads.size)
}
override suspend fun suggestion(query: String): List<SearchSuggestion> {
return emptyList()
}
override suspend fun images(itemID: String): List<String> {
TODO("Not yet implemented")
}
override suspend fun info(itemID: String): ItemInfo {
TODO("Not yet implemented")
}
companion object {
private fun firstImage(folder: FileX): String? =
folder.list { _, name ->
name.takeLastWhile { it != '.' } !in listOf("jpg", "png", "gif", "webp")
}?.firstOrNull()
fun transform(folder: FileX): ItemInfo =
kotlin.runCatching {
Json.decodeFromString<ItemInfo>(folder.getChild(".metadata").readText())
}.getOrNull() ?:
ItemInfo(
"Downloads",
"",
folder.name,
firstImage(folder) ?: "",
""
)
}
}

6
app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt
View File

@@ -239,14 +239,12 @@ class MainActivity :
binding.navView.setNavigationItemSelectedListener(this)
with (binding.contents.cancelFab) {
setImageResource(R.drawable.cancel)
setOnClickListener {
}
}
with (binding.contents.jumpFab) {
setImageResource(R.drawable.ic_jump)
setOnClickListener {
val perPage = Preferences["per_page", "25"].toInt()
val editText = EditText(context)
@@ -269,12 +267,10 @@ class MainActivity :
}
with (binding.contents.randomFab) {
setImageResource(R.drawable.shuffle_variant)
setOnClickListener {
setImageDrawable(CircularProgressDrawable(context))
model.random { runOnUiThread {
setImageResource(R.drawable.shuffle_variant)
GalleryDialogFragment(model.source.value!!.name, it.id).apply {
onChipClickedHandler.add {
model.setQueryAndSearch(it.toQuery())
@@ -286,7 +282,6 @@ class MainActivity :
}
with (binding.contents.idFab) {
setImageResource(R.drawable.numeric)
setOnClickListener {
val editText = EditText(context).apply {
inputType = InputType.TYPE_CLASS_NUMBER
@@ -469,6 +464,7 @@ class MainActivity :
when(item.itemId) {
R.id.main_drawer_home -> model.setModeAndReset(MainViewModel.MainMode.SEARCH)
R.id.main_drawer_history -> model.setModeAndReset(MainViewModel.MainMode.HISTORY)
R.id.main_drawer_downloads -> model.setModeAndReset(MainViewModel.MainMode.DOWNLOADS)
R.id.main_drawer_help -> startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.help))))
R.id.main_drawer_github -> startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.github))))
R.id.main_drawer_homepage -> startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.home_page))))

2
app/src/main/java/xyz/quaver/pupil/ui/dialog/DownloadLocationDialogFragment.kt
View File

@@ -79,7 +79,7 @@ class DownloadLocationDialogFragment : DialogFragment(), DIAware {
}
}
} else {
val downloadFolder = DownloadManager.getInstance(context ?: return@registerForActivityResult).downloadFolder.canonicalPath
val downloadFolder = downloadManager.downloadFolder.canonicalPath
val key = entries.keys.firstOrNull { it?.canonicalPath == downloadFolder }
if (key == null)
entries[key]!!.locationAvailable.text = downloadFolder

2
app/src/main/java/xyz/quaver/pupil/ui/viewmodel/MainViewModel.kt
View File

@@ -28,6 +28,7 @@ import org.kodein.di.direct
import org.kodein.di.instance
import xyz.quaver.floatingsearchview.suggestions.model.SearchSuggestion
import xyz.quaver.pupil.sources.AnySource
import xyz.quaver.pupil.sources.Downloads
import xyz.quaver.pupil.sources.History
import xyz.quaver.pupil.sources.ItemInfo
import xyz.quaver.pupil.util.Preferences
@@ -106,6 +107,7 @@ class MainViewModel(app: Application) : AndroidViewModel(app), DIAware {
sourceFactory = when (mode) {
MainMode.SEARCH -> defaultSourceFactory
MainMode.HISTORY -> { { direct.instance<String, History>(arg = it) } }
MainMode.DOWNLOADS -> { { direct.instance<Downloads>() } }
else -> return
}

4
app/src/main/java/xyz/quaver/pupil/util/DownloadManager.kt
View File

@@ -27,6 +27,7 @@ import kotlinx.coroutines.launch
import kotlinx.serialization.decodeFromString
import kotlinx.serialization.encodeToString
import kotlinx.serialization.json.Json
import okhttp3.internal.toImmutableMap
import org.kodein.di.DIAware
import org.kodein.di.android.closestDI
import xyz.quaver.io.FileX
@@ -72,6 +73,9 @@ class DownloadManager constructor(context: Context) : ContextWrapper(context), D
return downloadFolderMapInstance ?: mutableMapOf()
}
val downloads: Map<String, String>
get() = downloadFolderMap.toImmutableMap()
@Synchronized
fun getDownloadFolder(source: String, itemID: String): FileX? =
downloadFolderMap["$source-$itemID"]?.let { downloadFolder.getChild(it) }

4
app/src/main/res/layout/main_activity_content.xml
View File

@@ -83,6 +83,7 @@
android:id="@+id/cancel_fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/cancel"
app:fab_label="@string/main_fab_cancel"
app:fab_size="mini"/>
@@ -90,6 +91,7 @@
android:id="@+id/jump_fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_jump"
app:fab_label="@string/main_jump_title"
app:fab_size="mini"/>
@@ -97,6 +99,7 @@
android:id="@+id/random_fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/shuffle_variant"
app:fab_label="@string/main_fab_random"
app:fab_size="mini"/>
@@ -104,6 +107,7 @@
android:id="@+id/id_fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/numeric"
app:fab_label="@string/main_open_gallery_by_id"
app:fab_size="mini"/>

4
build.gradle
View File

@@ -10,10 +10,10 @@ buildscript {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version"
classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
classpath "com.google.gms:google-services:4.3.5"
classpath "com.google.gms:google-services:4.3.8"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
classpath "com.google.firebase:firebase-crashlytics-gradle:2.6.0"
classpath "com.google.firebase:firebase-crashlytics-gradle:2.7.0"
classpath "com.google.firebase:perf-plugin:1.4.0"
classpath "com.google.android.gms:oss-licenses-plugin:0.10.4"
}

2
gradle.properties
View File

@@ -21,4 +21,4 @@ android.enableJetifier=true
android.useAndroidX=true
android.enableBuildCache=true
kotlin_version=1.5.0
kotlin_version=1.5.10