70 Commits

Author SHA1 Message Date
AntsyLich
0e2dba8cd4 LocalSource: Create cover file if it doesn't exist (#7954)
(cherry picked from commit 0c7b1bda7f3e9bf3b017b734f64f3ad4b093c22a)
2022-09-10 11:10:53 -04:00
stevenyomi
39e0d7f4e8 Remove 1.x source models (#7781)
(cherry picked from commit e36e9d9d5c1b2a7b55f28f2bf0ef064880cbac8f)

# Conflicts:
#	app/src/main/java/eu/kanade/domain/manga/interactor/UpdateManga.kt
#	app/src/main/java/eu/kanade/domain/manga/model/Manga.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/Source.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/model/SManga.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
2022-08-18 15:44:31 -04:00
Andreas
b9db59fa45 Lint changes (#7802)
- Fixes current lint issues
- Changes lint task to lintKotlin on PRs

(cherry picked from commit 09abfc7843ef69d65cb4f1a3459ff8ee2718e4f7)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt
#	build.gradle.kts
2022-08-18 14:37:45 -04:00
arkon
cfe78ff907 Avoid catastrophic failure when cover can't be created in local source (fixes #7577)
(cherry picked from commit d6977e5676377f6090c0e0b4eb15fd043fa01e11)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt
2022-07-24 00:20:29 -04:00
Ivan Iskandar
29bf8b2378 Change cover memory key (#7276)
Use different key for custom cover and add last modified time for updating
cover without clearing the whole memory cache

(cherry picked from commit 59837bbb903dcfc2cf824972977b6247c713507b)
2022-06-11 12:01:19 -04:00
AntsyLich
1ad8893148 Make ChapterRecognition return the result (#7279)
(cherry picked from commit 06fdfcdb23a47e5d98935509c979da4ee80a044f)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterRecognition.kt
2022-06-11 12:00:58 -04:00
FourTOne5
6fd79f4838 Local Source - qol, cleanup and cover related fixes (#7166)
* Local Source - qol, cleanup and cover related fixes

* Review Changes

(cherry picked from commit ad17eb138609d684fd5929c3cb7dc644e3a3ec95)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt
2022-05-24 20:00:15 -04:00
arkon
d670d29169 Always remove manga title from if it prefixes chapter names (related to #6913)
(cherry picked from commit 89decf34746eaace93b186f7dc41baa6e42a96f0)
2022-04-15 17:52:00 -04:00
arkon
e98567a86b Update linter
(cherry picked from commit f0eb42e72d1e267049777a303bd97d96517a9a1f)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupRestore.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/Backup.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/full/models/BackupManga.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/models/Backup.kt
#	app/src/main/java/eu/kanade/tachiyomi/extension/model/Extension.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/base/changehandler/OneWayFadeChangeHandler.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/SelectionHeader.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceItem.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcePresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterSheet.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryListHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPageSheet.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/HttpPageLoader.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/model/ReaderPage.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/util/view/ViewExtensions.kt
2022-04-09 19:11:54 -04:00
arkon
d98e0c5f68 Stop removing local manga's title from chapter names (closes #6578)
Users should better curate their chapter folder/file names if need be. There's legit reasons for a chapter to start with or contain the same word(s) that the manga title consists of.

(cherry picked from commit b89acb5853ee8cf3e53a45bb28dfd0607f00d158)
2022-03-27 20:14:22 -04:00
arkon
23e43a78d9 Avoid unnecessary string creation when sorting
(cherry picked from commit 1c5c370c12a0541d7f3799be543d66725597d466)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceFilterController.kt
2021-12-26 12:47:22 -05:00
arkon
a3a27dc1c6 Add UnmeteredSource interface
To be included in extension-lib 1.3 (or whatever it's going to be). This applies to sources like Komga or Lanragi, where large numbers of update/download aren't of concern since they're (usually) self-hosted.

(cherry picked from commit 3ea3b0bf2ecc3f74a790af2012dd4f4a6b2ab3f7)
2021-12-02 19:29:50 -05:00
jmir1
b2b5854910 Fix local source cover changing (#6252)
* fix local source cover changing

* Remove unnecessary check for `exists()`

* fix for when there is no thumbnail_url in the db

(cherry picked from commit 10ddeeb7999214f1ed2fa579dadab7e9e379c1a6)
2021-12-02 19:29:08 -05:00
arkon
43ef18cdc3 Partially migrate LocalSource to 1.x methods
(cherry picked from commit 46a4b0e0b676f72fa747a65bedbb00a68ebdb501)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt
2021-12-02 19:27:53 -05:00
arkon
be2e95db38 Clean up local source chapter name cleaning (closes #5969)
(cherry picked from commit 9ebbfb2d908778e993723847bba74a1abcf78281)
2021-11-02 19:08:47 -04:00
Tom Briden
ec6b6ae779 Fix storing covers for local manga (#6127)
getCoverFile only returns a cover if it already exists, meaning
the block of code to write it from the inputstream never executes.
If getCoverFile returns null, then use previous behaviour of setting
it to cover.jpg so that if the file doesn't exist it's created

(cherry picked from commit f0a5557e603e31a53117c40426237d2340142bc2)
2021-11-02 19:06:35 -04:00
nicki
1d80725ea9 Fix Local and Other lang sources showing up in seperate Other Categories (#6024)
* group LocalSource and Other lang source together

* use better kotlin syntactic sugar

* add lang "other" to local

* remove duplicate LocalSource entries in Browse

* linting

* revert unnecessary linting

was a manually adding change

* Revert previous two commit but not the most recent

This reverts commit 30250f2f82fc5e38a1b30c7b55c445efec23a114
This also reversts commit 359ed5a8cda91577216b593a4138280e971e0126

* better way to avoid duplicate Local Sources

* more linting by plugin

* `""` lang is no longer used anywhere

(cherry picked from commit 2d1404d15523484d5f900ae3808c7f31058c2a8c)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcePresenter.kt
2021-10-23 14:24:45 -04:00
Ivan Iskandar
14d6e8dd94 Replace Timber with Square Logcat and make logging configurable (#6062)
* Replace Timber with Square Logcat

* Configurable logger

(cherry picked from commit 2e127dff1f0b00f6a92359a07132c6016db6ea36)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/App.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/full/FullBackupManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/SourcePreferencesController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourcePresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/HttpPageLoader.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewer.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewerAdapter.kt
2021-10-23 14:24:42 -04:00
arkon
b9fea9c045 Minor cleanup
(cherry picked from commit d7d46f4447746d5719cbc30532522e9ccdf405ca)
2021-09-24 12:52:47 -04:00
Aria Moradi
970967104e rewrite getFormat the kotlin way (#5930)
(cherry picked from commit 3664195c71a7b5f3f43f4307d85ec306152181eb)
2021-09-24 12:52:30 -04:00
Jobobby04
98f285f777 Cleanup 2021-09-11 11:48:32 -04:00
arkon
71533fb2bc Read from streams for local source manga details and legacy backups
(cherry picked from commit e942b8a4023be55737d9c11e5e62c7ea9b072c3f)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/LegacyBackupRestore.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt
2021-09-06 16:40:36 -04:00
Ivan Iskandar
db395f5e37 Support more image formats for covers (#5524)
* Add TachiyomiImageDecoder for Coil

Is currently used to decode AVIF and JPEG XL images.

* LocalSource: Check against file name for cover

This allows file with all supported formats to be set as cover

* TachiyomiImageDecoder: Handle HEIF on Android 7 and older

(cherry picked from commit 1ef77225040842af778282168e6fb8b11c339eeb)
2021-07-10 17:18:50 -04:00
Jobobby04
efba76380a Reader cleanup 2021-07-04 17:14:21 -04:00
arkon
65249a4ee7 Address some Kotlin language warnings
(cherry picked from commit 3854995ef23df814da32ef7bc6522007e7882f35)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionHolder.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceFilterController.kt
#	app/src/main/java/eu/kanade/tachiyomi/util/chapter/ChapterRecognition.kt
2021-06-01 20:52:49 -04:00
arkon
3cc61bc3b8 Make some strings in LocalSource translatable (closes #5178)
(cherry picked from commit 179cb8eb50951955611036f4140d6128e6fce781)
2021-05-28 14:36:44 -04:00
Soitora
07f684ac9e Update URL for Local Manga guide (#4641)
(cherry picked from commit d1c2eaf6d53b80c2717b7520b9d61be0daadf094)
2021-03-18 14:52:54 -04:00
Jobobby04
5a67d8169d Edit manga status + edit local manga fixes 2021-02-24 16:15:19 -05:00
Jobobby04
6f712c7f17 Lint 2020-12-12 12:36:29 -05:00
arkon
0db60d68f0 Use more up-to-date fork of junrar
(cherry picked from commit 560f0bba5c8b6d3ba232b9cffaaa15557e0cdff5)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt
2020-12-12 12:11:19 -05:00
Jobobby04
f3365cef67 Convert SY specific usages of Gson to Kotlin Serialization
Cleanup saved searches a bit
Cleanup json parsing
2020-10-12 14:20:54 -04:00
arkon
8d5b2f40b3 Use Kolinter Gradle plugin for linting instead of ktlint directly
(cherry picked from commit 76f6fe46010b235ee59962c94c790428870fc23e)
2020-09-13 23:08:52 -04:00
Jobobby04
d83f938e07 Add a option to allow local source to read hidden folders 2020-09-06 00:31:08 -04:00
arkon
4870bb153d Filter out hidden directories for local source (closes #3706)
(cherry picked from commit fe7c7e72f54dc36b74a2683089a51cb4690aaf46)
2020-08-22 18:19:33 -04:00
Jobobby04
a6b98e24dc Undo linting 2020-08-15 15:57:07 -04:00
Jobobby04
bc549c56d6 Automatic linting fixes 2020-08-14 18:41:20 -04:00
arkon
2ef7212128 Minor optimizations for local source dir lookups
(cherry picked from commit d749e309f8d525aaca8888f7e6ae63c0f242028e)
2020-07-25 22:13:13 -04:00
Jobobby04
372e570fac Use Tachi previews info + chapters manga page, plus of course SY features integrated into it
Add missed invert tap settings
Add missed extension open in settings overflow menu option
Cleanup
2020-07-12 19:21:29 -04:00
Jobobby04
044c638079 Very basic manga info edit, currently will break everything if used, tags and cover edit not working 2020-07-11 14:53:59 -04:00
arkon
a8a22b5803 Null check for local source cover parent dir
(cherry picked from commit 573f3a392ad2d98f0a6532c8d2ad5a809f575fc8)
2020-05-22 17:50:07 -04:00
arkon
2ce01a1c86 Alternative way of reading local manga JSON file
(cherry picked from commit eb3fff6c512ebdde3f703c68935923b368f90a63)
2020-05-09 11:20:21 -04:00
Rani Sargees
4d8f44ddae merge double upstream 2020-05-02 23:39:46 -04:00
Steven Smith
305ee3c12e
Pull basic manga/chapter metadata from EPUB files. (#2962)
* Fill manga and chapter metadata with EPUB metadata where appropriate.

* Use fuzzy-match to remove manga titles from chapter names.

This allows removing manga titles from the metadata title of local EPUB chapters with characters that can't be in the manga directory's name due to filesystem limitations.

* Use more standard way of parsing EPUB dates.

* Use date format compatible with lower Android versions for EPUBs.
2020-04-27 22:49:06 -04:00
arkon
3f63b320c4 Linting fixes 2020-04-25 14:24:45 -04:00
arkon
a95ac8ad83 Add links to local source guide (closes #2896) 2020-04-25 11:56:24 -04:00
TacoTheDank
415df2357c
JDK8, lint fixing (#2888)
* Use Kotlin JDK8

* Satisfy a ton of lints

* Run res/layout files (and manifest) through reformatter
2020-04-18 14:47:22 -04:00
arkon
0f2d480036 More linting fixes 2020-02-26 18:12:44 -05:00
arkon
043e3784e8 Run linter 2020-02-26 18:03:34 -05:00
arkon
3ecc883944 Run default Android Studio formatter on code 2020-02-17 17:23:37 -05:00
arkon
47f5ea881f Reorganize other util files 2020-02-02 22:22:54 -05:00