Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use StorageManager for Exh logs

Browse Source
This commit is contained in:
Jobobby04 2023-12-23 23:41:24 -05:00
parent 44fb882654
commit 7e6d1196ac
2 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/eu/kanade/tachiyomi/App.kt
View File

@ -8,7 +8,6 @@ import android.content.Context
import android.content.Intent
import android.content.IntentFilter
import android.os.Build
import android.os.Environment
import android.os.Looper
import android.webkit.WebView
import androidx.core.content.ContextCompat
@ -68,13 +67,14 @@ import logcat.LogPriority
import logcat.LogcatLogger
import org.conscrypt.Conscrypt
import tachiyomi.core.i18n.stringResource
import tachiyomi.core.storage.toFile
import tachiyomi.core.util.system.logcat
import tachiyomi.domain.storage.service.StorageManager
import tachiyomi.i18n.MR
import tachiyomi.presentation.widget.WidgetManager
import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
import uy.kohesive.injekt.injectLazy
import java.io.File
import java.security.Security
import java.text.SimpleDateFormat
import java.util.Locale
@ -91,8 +91,6 @@ class App : Application(), DefaultLifecycleObserver, ImageLoaderFactory {
override fun onCreate() {
super<Application>.onCreate()
// if (BuildConfig.DEBUG) Timber.plant(Timber.DebugTree())
setupExhLogging() // EXH logging
LogcatLogger.install(XLogLogcatLogger()) // SY Redirect Logcat to XLog
GlobalExceptionHandler.initialize(applicationContext, CrashActivity::class.java)
@ -115,6 +113,9 @@ class App : Application(), DefaultLifecycleObserver, ImageLoaderFactory {
Injekt.importModule(SYDomainModule())
// SY <--
setupExhLogging() // EXH logging
LogcatLogger.install(XLogLogcatLogger()) // SY Redirect Logcat to XLog
setupNotificationChannels()
ProcessLifecycleOwner.get().lifecycle.addObserver(this)
@ -248,16 +249,15 @@ class App : Application(), DefaultLifecycleObserver, ImageLoaderFactory {
val printers = mutableListOf<Printer>(AndroidPrinter())
val logFolder = File(
Environment.getExternalStorageDirectory().absolutePath + File.separator +
stringResource(MR.strings.app_name),
"logs",
)
val logFolder = Injekt.get<StorageManager>().getLogsDirectory()
?.toFile()
?.absolutePath
if (logFolder != null) {
val dateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS", Locale.getDefault())
printers += EnhancedFilePrinter
.Builder(logFolder.absolutePath) {
.Builder(logFolder) {
fileNameGenerator = object : DateFileNameGenerator() {
override fun generateFileName(logLevel: Int, timestamp: Long): String {
return super.generateFileName(
@ -272,6 +272,7 @@ class App : Application(), DefaultLifecycleObserver, ImageLoaderFactory {
cleanStrategy = FileLastModifiedCleanStrategy(7.days.inWholeMilliseconds)
backupStrategy = NeverBackupStrategy()
}
}
// Install Crashlytics in prod
if (!BuildConfig.DEBUG) {

9
domain/src/main/java/tachiyomi/domain/storage/service/StorageManager.kt
View File

@ -47,8 +47,17 @@ class StorageManager(
fun getLocalSourceDirectory(): UniFile? {
return baseDir?.createDirectory(LOCAL_SOURCE_PATH)
}
// SY -->
fun getLogsDirectory(): UniFile? {
return baseDir?.createDirectory(LOGS_PATH)
}
// SY <--
}
private const val AUTOMATIC_BACKUPS_PATH = "autobackup"
private const val DOWNLOADS_PATH = "downloads"
private const val LOCAL_SOURCE_PATH = "local"
// SY -->
private const val LOGS_PATH = "logs"
// SY <--