From cca5e276d23b4b8df9338c38e32bf52a0b8c0e54 Mon Sep 17 00:00:00 2001 From: bapeey <90949336+bapeey@users.noreply.github.com> Date: Mon, 5 Aug 2024 08:59:49 -0500 Subject: [PATCH] TMO / LectorManga: Move to factory (fix http 530) (#4393) * damn * shouldn't newBuilder() create a new instance? * 1 second is enough * remove lazy Co-authored-by: AwkwardPeak7 <48650614+AwkwardPeak7@users.noreply.github.com> * imports --------- Co-authored-by: AwkwardPeak7 <48650614+AwkwardPeak7@users.noreply.github.com> --- lib-multisrc/lectortmo/build.gradle.kts | 5 ---- src/es/lectormanga/build.gradle | 10 ------- .../res/mipmap-hdpi/ic_launcher.png | Bin 5177 -> 0 bytes .../res/mipmap-mdpi/ic_launcher.png | Bin 2806 -> 0 bytes .../res/mipmap-xhdpi/ic_launcher.png | Bin 7235 -> 0 bytes .../res/mipmap-xxhdpi/ic_launcher.png | Bin 13351 -> 0 bytes .../res/mipmap-xxxhdpi/ic_launcher.png | Bin 21252 -> 0 bytes .../es}/lectortmo/AndroidManifest.xml | 10 +++---- src/es/lectortmo/build.gradle | 8 ++++++ .../res/mipmap-hdpi/ic_launcher.png | Bin .../res/mipmap-mdpi/ic_launcher.png | Bin .../res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher.png | Bin .../extension/es}/lectortmo/LectorTmo.kt | 11 +++++--- .../es/lectortmo/LectorTmoFactory.kt} | 25 +++++++++++++++--- .../es}/lectortmo/LectorTmoFilters.kt | 2 +- .../es}/lectortmo/LectorTmoUrlActivity.kt | 4 +-- src/es/tumangaonline/build.gradle | 10 ------- .../es/tumangaonline/TuMangaOnline.kt | 8 ------ 20 files changed, 46 insertions(+), 47 deletions(-) delete mode 100644 lib-multisrc/lectortmo/build.gradle.kts delete mode 100644 src/es/lectormanga/build.gradle delete mode 100644 src/es/lectormanga/res/mipmap-hdpi/ic_launcher.png delete mode 100644 src/es/lectormanga/res/mipmap-mdpi/ic_launcher.png delete mode 100644 src/es/lectormanga/res/mipmap-xhdpi/ic_launcher.png delete mode 100644 src/es/lectormanga/res/mipmap-xxhdpi/ic_launcher.png delete mode 100644 src/es/lectormanga/res/mipmap-xxxhdpi/ic_launcher.png rename {lib-multisrc => src/es}/lectortmo/AndroidManifest.xml (66%) create mode 100644 src/es/lectortmo/build.gradle rename src/es/{tumangaonline => lectortmo}/res/mipmap-hdpi/ic_launcher.png (100%) rename src/es/{tumangaonline => lectortmo}/res/mipmap-mdpi/ic_launcher.png (100%) rename src/es/{tumangaonline => lectortmo}/res/mipmap-xhdpi/ic_launcher.png (100%) rename src/es/{tumangaonline => lectortmo}/res/mipmap-xxhdpi/ic_launcher.png (100%) rename src/es/{tumangaonline => lectortmo}/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {lib-multisrc/lectortmo/src/eu/kanade/tachiyomi/multisrc => src/es/lectortmo/src/eu/kanade/tachiyomi/extension/es}/lectortmo/LectorTmo.kt (98%) rename src/es/{lectormanga/src/eu/kanade/tachiyomi/extension/es/lectormanga/LectorManga.kt => lectortmo/src/eu/kanade/tachiyomi/extension/es/lectortmo/LectorTmoFactory.kt} (79%) rename {lib-multisrc/lectortmo/src/eu/kanade/tachiyomi/multisrc => src/es/lectortmo/src/eu/kanade/tachiyomi/extension/es}/lectortmo/LectorTmoFilters.kt (92%) rename {lib-multisrc/lectortmo/src/eu/kanade/tachiyomi/multisrc => src/es/lectortmo/src/eu/kanade/tachiyomi/extension/es}/lectortmo/LectorTmoUrlActivity.kt (89%) delete mode 100644 src/es/tumangaonline/build.gradle delete mode 100644 src/es/tumangaonline/src/eu/kanade/tachiyomi/extension/es/tumangaonline/TuMangaOnline.kt diff --git a/lib-multisrc/lectortmo/build.gradle.kts b/lib-multisrc/lectortmo/build.gradle.kts deleted file mode 100644 index ede652be5..000000000 --- a/lib-multisrc/lectortmo/build.gradle.kts +++ /dev/null @@ -1,5 +0,0 @@ -plugins { - id("lib-multisrc") -} - -baseVersionCode = 6 diff --git a/src/es/lectormanga/build.gradle b/src/es/lectormanga/build.gradle deleted file mode 100644 index 132aac23f..000000000 --- a/src/es/lectormanga/build.gradle +++ /dev/null @@ -1,10 +0,0 @@ -ext { - extName = 'LectorManga' - extClass = '.LectorManga' - themePkg = 'lectortmo' - baseUrl = 'https://lectormanga.com' - overrideVersionCode = 34 - isNsfw = true -} - -apply from: "$rootDir/common.gradle" diff --git a/src/es/lectormanga/res/mipmap-hdpi/ic_launcher.png b/src/es/lectormanga/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index 282e407147afd4f56fdce4fab01502799741bd69..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5177 zcmV-96vpd`P)WQ@3UO*b#K@6j0pEzs|bkh z2g50Gh2r*|N?i^YgS6GM8r<0xKvGSr{2d93!ptvO_wFZ#riAmo*tq{9xR{?IitkEHm7JNf| z#1Y0+0U{Md5Z;gGe&QSXYVBu(j#>m(%di#zGG?;s z7bdT-`sCcMAu|Eg+$umeJxA|JlsI@SYz-h|p2wKEIXhUv$6W$1R|z~^Byh5~gsnsj zGDU@wfKj2oL5b>GIV!3fQBqNlg3>yaS2v4RItI%gtYran3 z{B@%o_0w2avHAS&VZ@+Y2k4=fb|>06cqJLWEdzI?XC}08cV}xn-pvz(di%o1-IiHm zYLhFJxLzW|566md@ULQKSX~2qX8m-b4S#5u2FOhXNaEm?BrLAUGa551ax1~U_UQkR z7kYQ~gpa!oEJPyEb#pdiS*5fQf2Eb-=M%;FE4>_b4NU>aShms3#B`jz*#R;(0bnj=@g% zggM60qEz8(kqj$7zl0NMWdaU{02w5iCYhKqfXK!j?8JEU#rAl-yVpHsO-qAU)ih$k zrgR)VTgEAafKwAP-_zCQ}k zC?|M~M`4ozlGq6*M&X*+kGaX|ICY^y;EZ7nXKEDd zF=}_B#6ce*3gwdrw_|W9Cux)`IWyJ;izY|ZrV>K85uDamxiM0h+ zX5?%Q9^)=3*A$)=v^7}+MJpAot;Ddlq>FIPZTujHDne@`!T33uUeU0PWWg%Y6bnW7_gLABh3f$dOP(}4X)if}nk%HMmt z*vfoUFA#RM*Inv?T-4q0Wd6chX*Ww6lV@y9DcZX5!LSDJPbG zp0@b!pM}WCuEwG%Q7Efy;LP~M`7(U_TLET{2;(A`fTA&$eRdI6mSPO;>jx{b2%Emo zfv2kkZ;y#!_RUyx7Ei_bpq-yR3UA1;-kXiXCyTLhRu{NBS+m*f`QJ7Cc)SR!UXO;W zqwqqg6r9fFxO<%XhD=a(ZVUh%ze3u ziR8zwT&qEluN`cx#q3KG)}4bwp~UJLF|ZU{pt`mZ3qHwUWnf4je=X=4IaOG+abyVCf3Y|g{O-(@`_}5=Raxa6zYWdVWCLcoPmQUi}jqf*#HXiwZ)3~Xf_FI zH8MHICY{2l{s9==+fUC)A31vi^FL09uZOKViB#d4UcO9y%1`<~d1` z_va!rU&^LuXVa7`l~*<3^)+Yl&e#a8dC`Nlb#i8)#7c;UIR!O*A2G9^8pwhhGE7~O zf(>tU#sgl$OCl56ye}IWIZ`A|jKtjJG}e!LM7kocu$KQP270*)ET)J#An_OqZq#X= zwb=mb80?5;IshF$RgASeGV$S?oe}6G_zg{){n2^&d)i>~;1InUjZACCnp8|59*XWA zT={mXOpaAwT;@eR73a+WQBC#UrVQ?zBou1or(S*k3^OGxK-iiieJEjlDxQ1PkDd15 zS;sM?uRq2=8^k92#`<%ZH@*Y9smG#cHtfp8=6$)^xtb1;omUdY%rJj@P7uA_ZP@#7 z{Pqfd{Idv4rbNQt#*)pz-qsSXPF8q+_6aUSp6=xX%3LV4Qm7?IzWU2cxKY`N*M^7k zGh`B{GAgiaS`>nP1)zU8R*2-i+4yE@Pgtsp;0kF2-dul<0ek7+fuPS6!H7lgO^oEo z_tJt>m^~%}{d;;d@Z__|7tIGFnzZD?ASccEv>%q>S8u_Ic=KiIgo2g-b#Lh%(wW3H`GDWe@ z;k3D`V!4xa7%~M)2)$h;STiFAfxdQ}kbQM94?7O#gCwFULqjmMk3TFeMYxnFWhRtV z)?-L-e@uTq6cTGOvabt%hx#1xLG@#cneob8fuzhp`jdPKT$BDeYbY<%%! z9^^_D`3*7}JJ@YUf;3R)<#>pJry62Ox@Kw2dVKItDo+ zd3IN=2!G|86yq12<}9^B+K9JaYR_+zM5}EFav1~y=;PU4IoxJllOl2bIo{zQzY`wd zfF)C-xJ)52e%bbm%ue!gE2c+tv?9mcA=nXf#zo-u)v4@zw$AI$(UknpvD8vj%No%u z#)HQ?a<-HK3VXl-SFYEvxqb9jXKflnFYo0=e{&==3qYDMuPLd>5B2Qi&Yk~!q6iDO zT)?o${qfB&*D&^(K%VH#b*TvPvu6fT{_*MDZVd3!Z5LT&Up_sWqX~uKwKHQGyzM{a zV&k4{41L@Wznm`N=f^%1jMrDEVC>UD=+n)UP2*oZys%(GM~-xv`8A*|XI~E+^zQ1x zCimVa=}5U;iKSDc@Zr~2I9dE|WgG_*YWYRA7%}f8GtI03Y2*${!dAT&!x4!Vx$AH~ z*J3NbxWwU<5=e5yq#5lxl#hp_-Pv){zScV*rQzWicO;Ao$ELm6ICQEQtENYzV~7(w z*nLL|ur8r9_8+;9LnliR7wv}M&)nb=gc@bVq(i;%WB?X_dV#-dkSo!rt0#kY=28Xw zw*im(vQED0%S`;9as%7m?Z(O{H7bzDCH-xlJcxXdhCv#DDDu2Lrah=|owhQC^9{;Z z2q5~uu2G3WkNWXj{qXB7Odiw@&-M1jTN}>vn4upj!#HiH{Dz{}j)Qsl>R>(#X~Zy+ z9Vo}y@J1}ksvGeBwo6IOSLNidDC2%@bqX%$ z)gZvj7V8pXIoqE6{u$o79{p4hXWhI1m(LNDiehr)pYF@WV_iI$dGs1mGb^$GSRtN{ z^X6QM3f>pzpJXLL(@c(H)&`0qbxe~ZXZ+t|Md%#ij75{9I42?>^X~W#h>Lc|{7*>9 zE61jHx?$~CmvJFSiVqTF+2K;lEtFyE@-y&tw?X1d;TX5@Z#>(}2XkNU$hi~gH{?S) zhdZ;+BIa)SK8HbN7K(&YgG!M;T|Kb!%gd;$kz?J=Sj2=0=0uTfPI4OB`PyOQtgg6_ zTg^$Lt{`U`K*K2y(pMBU$diir*68+JB9JIW3SVhO18X;8u?33D>d+upaehRq9%(oJ zUbfn3LdhmY6pC0Rz!9TJ@6pH@lo`|alw{I%VjVqmDX$vWit9Kvpz?>FmDMR&b`gug zWe>5Pnyg;I(Tb8-Vkbqn!>5GsZyp920AwhI2K(4y_Sgv4d^D5N8~q>hftW@NpZ9S( zC$VM)$jZSpNh4qC0i+Ugqo@!k%zve0vx4;>f(=iDie#$GDC!xWD=^8#VuuS(ng+43 zXnqit1|#rDkRsnhYM`zLeXl`cNmZ_3f0q1hHkT@f&1?W^!aNON>~u$nzda@n4CW|u zueYH!AdnCG;-@@(vNxO40%Ogr02$kk(H+!{4>AN}NFQHVSv6_Y_ku|cjS75q=o*s0 zy~0InOU-0}tTiS^VO5tp1~k$=q!w`XJ4IxACFLFOj~}uctTqcJ)G7fc;%DJ38Zd>|7~JEu;>##CTnIVLCwSL{S4p z^W%~&zaKg;M0zj@`&7`H<0zi7(P)R4wsz+D0GQ% zX|{h)r@=DwqzoMCJNC9>-hZdhlz0+bseV$(Rj8LMK|8ht2oxD z0qc$d)D|$B$x$IX@wwn;K8PIY=6yM=DN$b}mC_C>iD#Pg)8s?y8x^2^G7{uS$EFIO zm_wz=&CcPDIqB$OI})wc`(iiqHk$mDkU++UIb&@?EK3%eMtf8FCABR2lN!j5wAndA zgV79sxpOO%Y2#kg7<3B&8J?P;!gS%Jj)(~((-IB}keK%4@j{kl^Gjs+6c`O|cLgBb zvw$=(?SRBTABtgp{n@n0k6gN1jg8-Azjs4Qo5h>oP)f5{$r*)ysL`%INRC3^BS#;P8>Xy2{NNw|RidCTh_3 z*CdX9OCSu5m%+CsVPc(JL^!wRyt^6Z0J^hlIiq7 zTu{J+@msAOyn8i!xCLsoT08#}SfjI$25Hfmyg%2BkrthzeIQ{k+Mu-t5S?6ca`cOf z^zS}#t;Eqc3L=q>NF_4*qm0%?1z}WkWWKjSF#Sj9^s-V>-yki_xOVbC3DUxo>7>fi zk?C6ni0-G8k}g&*LH=IthxD^P$?C4^);ne%d__VDl5I5 zrv`^M>W#kRwvNj4*>3=J%!~f$>>D}kww^P?Qtn6>1Omy64Qii5KjfuzFfF>wn_Vb@ zLIo9_7UxZlJ2L&d(0E9 nraSHf)CQ3E0lE*6X}0!%E6Ts$r>=2400000NkvXXu0mjf8Cc<0 diff --git a/src/es/lectormanga/res/mipmap-mdpi/ic_launcher.png b/src/es/lectormanga/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index f2c1abc480a7cbae49e09d01e2dcd7f4db4b25f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2806 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 diff --git a/src/es/lectormanga/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/lectormanga/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 69d25a3bd6df5b284a86041e88d3e4eb80a5ca50..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21252 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 Mte_!ZDvJ#IKZ~oxvH$=8 diff --git a/lib-multisrc/lectortmo/AndroidManifest.xml b/src/es/lectortmo/AndroidManifest.xml similarity index 66% rename from lib-multisrc/lectortmo/AndroidManifest.xml rename to src/es/lectortmo/AndroidManifest.xml index b9d3760ca..eb2a86adf 100644 --- a/lib-multisrc/lectortmo/AndroidManifest.xml +++ b/src/es/lectortmo/AndroidManifest.xml @@ -3,7 +3,7 @@ @@ -12,10 +12,10 @@ - + + + + diff --git a/src/es/lectortmo/build.gradle b/src/es/lectortmo/build.gradle new file mode 100644 index 000000000..da77f8583 --- /dev/null +++ b/src/es/lectortmo/build.gradle @@ -0,0 +1,8 @@ +ext { + extName = 'TuMangaOnline / LectorManga' + extClass = '.LectorTmoFactory' + extVersionCode = 1 + isNsfw = true +} + +apply from: "$rootDir/common.gradle" diff --git a/src/es/tumangaonline/res/mipmap-hdpi/ic_launcher.png b/src/es/lectortmo/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from src/es/tumangaonline/res/mipmap-hdpi/ic_launcher.png rename to src/es/lectortmo/res/mipmap-hdpi/ic_launcher.png diff --git a/src/es/tumangaonline/res/mipmap-mdpi/ic_launcher.png b/src/es/lectortmo/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from src/es/tumangaonline/res/mipmap-mdpi/ic_launcher.png rename to src/es/lectortmo/res/mipmap-mdpi/ic_launcher.png diff --git a/src/es/tumangaonline/res/mipmap-xhdpi/ic_launcher.png b/src/es/lectortmo/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from src/es/tumangaonline/res/mipmap-xhdpi/ic_launcher.png rename to src/es/lectortmo/res/mipmap-xhdpi/ic_launcher.png diff --git a/src/es/tumangaonline/res/mipmap-xxhdpi/ic_launcher.png b/src/es/lectortmo/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from src/es/tumangaonline/res/mipmap-xxhdpi/ic_launcher.png rename to src/es/lectortmo/res/mipmap-xxhdpi/ic_launcher.png diff --git a/src/es/tumangaonline/res/mipmap-xxxhdpi/ic_launcher.png b/src/es/lectortmo/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from src/es/tumangaonline/res/mipmap-xxxhdpi/ic_launcher.png rename to src/es/lectortmo/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/lib-multisrc/lectortmo/src/eu/kanade/tachiyomi/multisrc/lectortmo/LectorTmo.kt b/src/es/lectortmo/src/eu/kanade/tachiyomi/extension/es/lectortmo/LectorTmo.kt similarity index 98% rename from lib-multisrc/lectortmo/src/eu/kanade/tachiyomi/multisrc/lectortmo/LectorTmo.kt rename to src/es/lectortmo/src/eu/kanade/tachiyomi/extension/es/lectortmo/LectorTmo.kt index 5410c9c42..81b0843ca 100644 --- a/lib-multisrc/lectortmo/src/eu/kanade/tachiyomi/multisrc/lectortmo/LectorTmo.kt +++ b/src/es/lectortmo/src/eu/kanade/tachiyomi/extension/es/lectortmo/LectorTmo.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.multisrc.lectortmo +package eu.kanade.tachiyomi.extension.es.lectortmo import android.annotation.SuppressLint import android.app.Application @@ -42,6 +42,7 @@ abstract class LectorTmo( override val name: String, override val baseUrl: String, override val lang: String, + private val rateLimitClient: OkHttpClient, ) : ParsedHttpSource(), ConfigurableSource { private val preferences: SharedPreferences by lazy { @@ -91,7 +92,7 @@ abstract class LectorTmo( } private val ignoreSslClient: OkHttpClient by lazy { - network.cloudflareClient.newBuilder() + rateLimitClient.newBuilder() .ignoreAllSSLErrors() .followRedirects(false) .rateLimit( @@ -103,7 +104,7 @@ abstract class LectorTmo( private var lastCFDomain: String = "" override val client: OkHttpClient by lazy { - network.cloudflareClient.newBuilder() + rateLimitClient.newBuilder() .addInterceptor { chain -> val request = chain.request() val url = request.url @@ -244,6 +245,8 @@ abstract class LectorTmo( return super.getMangaUrl(manga) } + override fun mangaDetailsRequest(manga: SManga) = GET(baseUrl + manga.url, tmoHeaders) + override fun mangaDetailsParse(document: Document) = SManga.create().apply { title = document.select("h2.element-subtitle").text() document.select("h5.card-title").let { @@ -271,6 +274,8 @@ abstract class LectorTmo( return super.getChapterUrl(chapter) } + override fun chapterListRequest(manga: SManga) = mangaDetailsRequest(manga) + override fun chapterListParse(response: Response): List { val document = response.asJsoup() diff --git a/src/es/lectormanga/src/eu/kanade/tachiyomi/extension/es/lectormanga/LectorManga.kt b/src/es/lectortmo/src/eu/kanade/tachiyomi/extension/es/lectortmo/LectorTmoFactory.kt similarity index 79% rename from src/es/lectormanga/src/eu/kanade/tachiyomi/extension/es/lectormanga/LectorManga.kt rename to src/es/lectortmo/src/eu/kanade/tachiyomi/extension/es/lectortmo/LectorTmoFactory.kt index 7004a6be0..dacb72b9b 100644 --- a/src/es/lectormanga/src/eu/kanade/tachiyomi/extension/es/lectormanga/LectorManga.kt +++ b/src/es/lectortmo/src/eu/kanade/tachiyomi/extension/es/lectortmo/LectorTmoFactory.kt @@ -1,7 +1,9 @@ -package eu.kanade.tachiyomi.extension.es.lectormanga +package eu.kanade.tachiyomi.extension.es.lectortmo -import eu.kanade.tachiyomi.multisrc.lectortmo.LectorTmo import eu.kanade.tachiyomi.network.GET +import eu.kanade.tachiyomi.network.NetworkHelper +import eu.kanade.tachiyomi.network.interceptor.rateLimit +import eu.kanade.tachiyomi.source.SourceFactory import eu.kanade.tachiyomi.source.model.Page import eu.kanade.tachiyomi.source.model.SChapter import eu.kanade.tachiyomi.source.model.SManga @@ -9,9 +11,26 @@ import eu.kanade.tachiyomi.util.asJsoup import okhttp3.Response import org.jsoup.nodes.Document import org.jsoup.nodes.Element +import uy.kohesive.injekt.Injekt +import uy.kohesive.injekt.api.get -class LectorManga : LectorTmo("LectorManga", "https://lectormanga.com", "es") { +class LectorTmoFactory : SourceFactory { + override fun createSources() = listOf( + LectorManga(), + TuMangaOnline(), + ) +} + +val rateLimitClient = Injekt.get().cloudflareClient.newBuilder() + .rateLimit(1, 1) + .build() + +class TuMangaOnline : LectorTmo("TuMangaOnline", "https://visortmo.com", "es", rateLimitClient) { + override val id = 4146344224513899730 +} + +class LectorManga : LectorTmo("LectorManga", "https://lectormanga.com", "es", rateLimitClient) { override val id = 7925520943983324764 override fun popularMangaSelector() = ".col-6 .card" diff --git a/lib-multisrc/lectortmo/src/eu/kanade/tachiyomi/multisrc/lectortmo/LectorTmoFilters.kt b/src/es/lectortmo/src/eu/kanade/tachiyomi/extension/es/lectortmo/LectorTmoFilters.kt similarity index 92% rename from lib-multisrc/lectortmo/src/eu/kanade/tachiyomi/multisrc/lectortmo/LectorTmoFilters.kt rename to src/es/lectortmo/src/eu/kanade/tachiyomi/extension/es/lectortmo/LectorTmoFilters.kt index 17f1d1b3f..74d66a3ad 100644 --- a/lib-multisrc/lectortmo/src/eu/kanade/tachiyomi/multisrc/lectortmo/LectorTmoFilters.kt +++ b/src/es/lectortmo/src/eu/kanade/tachiyomi/extension/es/lectortmo/LectorTmoFilters.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.multisrc.lectortmo +package eu.kanade.tachiyomi.extension.es.lectortmo import eu.kanade.tachiyomi.source.model.Filter diff --git a/lib-multisrc/lectortmo/src/eu/kanade/tachiyomi/multisrc/lectortmo/LectorTmoUrlActivity.kt b/src/es/lectortmo/src/eu/kanade/tachiyomi/extension/es/lectortmo/LectorTmoUrlActivity.kt similarity index 89% rename from lib-multisrc/lectortmo/src/eu/kanade/tachiyomi/multisrc/lectortmo/LectorTmoUrlActivity.kt rename to src/es/lectortmo/src/eu/kanade/tachiyomi/extension/es/lectortmo/LectorTmoUrlActivity.kt index 489afad29..c1b01e2d4 100644 --- a/lib-multisrc/lectortmo/src/eu/kanade/tachiyomi/multisrc/lectortmo/LectorTmoUrlActivity.kt +++ b/src/es/lectortmo/src/eu/kanade/tachiyomi/extension/es/lectortmo/LectorTmoUrlActivity.kt @@ -1,4 +1,4 @@ -package eu.kanade.tachiyomi.multisrc.lectortmo +package eu.kanade.tachiyomi.extension.es.lectortmo import android.app.Activity import android.content.ActivityNotFoundException @@ -19,7 +19,7 @@ class LectorTmoUrlActivity : Activity() { val mainIntent = Intent().apply { action = "eu.kanade.tachiyomi.SEARCH" - putExtra("query", "${LectorTmo.PREFIX_SLUG_SEARCH}$type/$id/$slug") + putExtra("query", "slug:$type/$id/$slug") putExtra("filter", packageName) } diff --git a/src/es/tumangaonline/build.gradle b/src/es/tumangaonline/build.gradle deleted file mode 100644 index 484939b68..000000000 --- a/src/es/tumangaonline/build.gradle +++ /dev/null @@ -1,10 +0,0 @@ -ext { - extName = 'TuMangaOnline' - extClass = '.TuMangaOnline' - themePkg = 'lectortmo' - baseUrl = 'https://visortmo.com' - overrideVersionCode = 49 - isNsfw = true -} - -apply from: "$rootDir/common.gradle" diff --git a/src/es/tumangaonline/src/eu/kanade/tachiyomi/extension/es/tumangaonline/TuMangaOnline.kt b/src/es/tumangaonline/src/eu/kanade/tachiyomi/extension/es/tumangaonline/TuMangaOnline.kt deleted file mode 100644 index bb2d5eaf9..000000000 --- a/src/es/tumangaonline/src/eu/kanade/tachiyomi/extension/es/tumangaonline/TuMangaOnline.kt +++ /dev/null @@ -1,8 +0,0 @@ -package eu.kanade.tachiyomi.extension.es.tumangaonline - -import eu.kanade.tachiyomi.multisrc.lectortmo.LectorTmo - -class TuMangaOnline : LectorTmo("TuMangaOnline", "https://visortmo.com", "es") { - - override val id = 4146344224513899730 -}