From 8b50c17fbfcc5d45666c75c00d8080b89e922e59 Mon Sep 17 00:00:00 2001 From: hexated Date: Wed, 24 Aug 2022 07:42:13 +0700 Subject: [PATCH 01/20] fixed Gomunime --- GomunimeProvider/build.gradle.kts | 6 +-- .../kotlin/com/lagradost/GomunimeProvider.kt | 42 +++++++++++-------- 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/GomunimeProvider/build.gradle.kts b/GomunimeProvider/build.gradle.kts index be91150..ca320bf 100644 --- a/GomunimeProvider/build.gradle.kts +++ b/GomunimeProvider/build.gradle.kts @@ -1,13 +1,13 @@ // use an integer for version numbers -version = 1 +version = 2 cloudstream { language = "id" // All of these properties are optional, you can safely remove them - // description = "Lorem Ipsum" - // authors = listOf("Cloudburst") +// description = "Lorem Ipsum" + authors = listOf("Hexated") /** * Status int as the following: diff --git a/GomunimeProvider/src/main/kotlin/com/lagradost/GomunimeProvider.kt b/GomunimeProvider/src/main/kotlin/com/lagradost/GomunimeProvider.kt index 30689dc..f8d8a44 100644 --- a/GomunimeProvider/src/main/kotlin/com/lagradost/GomunimeProvider.kt +++ b/GomunimeProvider/src/main/kotlin/com/lagradost/GomunimeProvider.kt @@ -25,6 +25,9 @@ class GomunimeProvider : MainAPI() { ) companion object { + + private const val mainServer = "https://path.onicdn.xyz/app/rapi.php" + fun getType(t: String): TvType { return if (t.contains("OVA") || t.contains("Special")) TvType.OVA else if (t.contains("Movie")) TvType.AnimeMovie @@ -152,14 +155,16 @@ class GomunimeProvider : MainAPI() { callback: (ExtractorLink) -> Unit ): Boolean { val document = app.get(data).document - val scriptData = document.select("aside.sidebar > script").dataNodes().toString() val key = scriptData.substringAfter("var a_ray = '").substringBefore("';") val title = scriptData.substringAfter("var judul_postingan = \"").substringBefore("\";") + .replace(" ", "+") + val image = document.select("img#tempvid").last()?.attr("src").toString() val sources: List> = app.post( - url = "https://path.gomuni.me/app/vapi.php", - data = mapOf("data" to key, "judul" to title, "func" to "mirror") + url = mainServer, + data = mapOf("data" to key, "gambar" to image, "judul" to title, "func" to "mirror"), + referer = "$mainUrl/" ).document.select("div.gomunime-server-mirror").map { Pair( it.attr("data-vhash"), @@ -171,24 +176,25 @@ class GomunimeProvider : MainAPI() { safeApiCall { when { it.second.contains("frame") -> { - loadExtractor(it.first, data, subtitleCallback, callback) - } - it.second.contains("hls") -> { - app.post( - url = "https://path.gomuni.me/app/vapi.php", - data = mapOf("fid" to it.first, "func" to "hls") - ).text.let { link -> - M3u8Helper.generateM3u8( - this.name, - link, - "$mainUrl/", - headers = mapOf("Origin" to mainUrl) - ).forEach(callback) - } + loadExtractor(it.first, mainUrl, subtitleCallback, callback) } + // Skip for now +// it.second.contains("hls") -> { +// app.post( +// url = mainServer, +// data = mapOf("fid" to it.first, "func" to "hls") +// ).text.let { link -> +// M3u8Helper.generateM3u8( +// this.name, +// link, +// "$mainUrl/", +// headers = mapOf("Origin" to mainUrl) +// ).forEach(callback) +// } +// } it.second.contains("mp4") -> { app.post( - url = "https://path.gomuni.me/app/vapi.php", + url = mainServer, data = mapOf("data" to it.first, "func" to "blogs") ).parsed>().map { callback.invoke( From 271ded4b034dbffacd715c78079dfa13a40f17e3 Mon Sep 17 00:00:00 2001 From: Osten <11805592+LagradOst@users.noreply.github.com> Date: Wed, 24 Aug 2022 23:25:01 +0000 Subject: [PATCH 02/20] Update README.md --- README.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/README.md b/README.md index 2dfa80d..a377ccc 100644 --- a/README.md +++ b/README.md @@ -12,11 +12,6 @@ Not all extractors are included, only those need to compile. We need to use load - Windows: `.\gradlew.bat ExampleProvider:make` or `.\gradlew.bat ExampleProvider:deployWithAdb` - Linux & Mac: `./gradlew ExampleProvider:make` or `./gradlew ExampleProvider:deployWithAdb` -## License - -Everything in this repo is released into the public domain. You may use it however you want with no conditions whatsoever - - ## Attribution This template as well as the gradle plugin and the whole plugin system is **heavily** based on [Aliucord](https://github.com/Aliucord). From 6d8a9d3c98d705260dbc1e7a004cb5140a84d429 Mon Sep 17 00:00:00 2001 From: Osten <11805592+LagradOst@users.noreply.github.com> Date: Wed, 24 Aug 2022 23:25:31 +0000 Subject: [PATCH 03/20] Create LICENSE --- LICENSE | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 674 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + 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 . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. From a09f3b23f3d1c7b119fb39972e89087bdbc4eb39 Mon Sep 17 00:00:00 2001 From: hexated Date: Fri, 26 Aug 2022 12:03:16 +0700 Subject: [PATCH 04/20] changes HDrezka domain --- HDrezkaProvider/build.gradle.kts | 4 ++-- .../src/main/kotlin/com/lagradost/HDrezkaProvider.kt | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/HDrezkaProvider/build.gradle.kts b/HDrezkaProvider/build.gradle.kts index 6a0d087..4f6da24 100644 --- a/HDrezkaProvider/build.gradle.kts +++ b/HDrezkaProvider/build.gradle.kts @@ -1,5 +1,5 @@ // use an integer for version numbers -version = 1 +version = 2 cloudstream { @@ -7,7 +7,7 @@ cloudstream { // All of these properties are optional, you can safely remove them // description = "Lorem Ipsum" - // authors = listOf("Cloudburst") + authors = listOf("Hexated") /** * Status int as the following: diff --git a/HDrezkaProvider/src/main/kotlin/com/lagradost/HDrezkaProvider.kt b/HDrezkaProvider/src/main/kotlin/com/lagradost/HDrezkaProvider.kt index 6d7da73..f5819ed 100644 --- a/HDrezkaProvider/src/main/kotlin/com/lagradost/HDrezkaProvider.kt +++ b/HDrezkaProvider/src/main/kotlin/com/lagradost/HDrezkaProvider.kt @@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonProperty import com.lagradost.cloudstream3.* import com.lagradost.cloudstream3.LoadResponse.Companion.addActors import com.lagradost.cloudstream3.LoadResponse.Companion.addTrailer -import com.lagradost.cloudstream3.mvvm.safeApiCall import com.lagradost.cloudstream3.mvvm.suspendSafeApiCall import com.lagradost.cloudstream3.utils.AppUtils.toJson import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson @@ -16,7 +15,7 @@ import org.jsoup.nodes.Element import java.util.* class HDrezkaProvider : MainAPI() { - override var mainUrl = "https://hdrezka19139.org" + override var mainUrl = "https://rezka.ag" override var name = "HDrezka" override val hasMainPage = true override var lang = "ru" From 7dbb146399b84a3f95f600696128b38a3de025f0 Mon Sep 17 00:00:00 2001 From: antonydp <38143733+antonydp@users.noreply.github.com> Date: Sat, 27 Aug 2022 16:27:45 +0200 Subject: [PATCH 05/20] Tantifilm (cloudflare) and IlGenioDelloStreamingProvider fixes (#4) --- EurostreamingProvider/build.gradle.kts | 26 ++++ .../src/main/AndroidManifest.xml | 2 + .../com/lagradost/EurostreamingProvider.kt | 113 ++++++++++++++++++ .../lagradost/EurostreamingProviderPlugin.kt | 14 +++ .../IlGenioDelloStreamingProvider.kt | 48 +++++--- TantiFilmProvider/build.gradle.kts | 2 +- .../kotlin/com/lagradost/TantiFilmProvider.kt | 31 +++-- 7 files changed, 208 insertions(+), 28 deletions(-) create mode 100644 EurostreamingProvider/build.gradle.kts create mode 100644 EurostreamingProvider/src/main/AndroidManifest.xml create mode 100644 EurostreamingProvider/src/main/kotlin/com/lagradost/EurostreamingProvider.kt create mode 100644 EurostreamingProvider/src/main/kotlin/com/lagradost/EurostreamingProviderPlugin.kt diff --git a/EurostreamingProvider/build.gradle.kts b/EurostreamingProvider/build.gradle.kts new file mode 100644 index 0000000..fa19a12 --- /dev/null +++ b/EurostreamingProvider/build.gradle.kts @@ -0,0 +1,26 @@ +// use an integer for version numbers +version = 1 + + +cloudstream { + language = "it" + // All of these properties are optional, you can safely remove them + + // description = "Lorem Ipsum" + // authors = listOf("Cloudburst") + + /** + * Status int as the following: + * 0: Down + * 1: Ok + * 2: Slow + * 3: Beta only + * */ + status = 1 // will be 3 if unspecified + tvTypes = listOf( + "TvSeries" + ) + + + iconUrl = "https://www.google.com/s2/favicons?domain=eurostreaming.social&sz=%size%" +} \ No newline at end of file diff --git a/EurostreamingProvider/src/main/AndroidManifest.xml b/EurostreamingProvider/src/main/AndroidManifest.xml new file mode 100644 index 0000000..29aec9d --- /dev/null +++ b/EurostreamingProvider/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/EurostreamingProvider/src/main/kotlin/com/lagradost/EurostreamingProvider.kt b/EurostreamingProvider/src/main/kotlin/com/lagradost/EurostreamingProvider.kt new file mode 100644 index 0000000..ec81f4e --- /dev/null +++ b/EurostreamingProvider/src/main/kotlin/com/lagradost/EurostreamingProvider.kt @@ -0,0 +1,113 @@ +package com.lagradost + +import com.lagradost.cloudstream3.* +import com.lagradost.cloudstream3.utils.ExtractorLink +import com.lagradost.cloudstream3.utils.loadExtractor +import com.lagradost.cloudstream3.utils.AppUtils.parseJson +import com.lagradost.cloudstream3.utils.AppUtils.toJson + + +class EurostreamingProvider : MainAPI() { + override var lang = "it" + override var mainUrl = "https://eurostreaming.social" + override var name = "Eurostreaming" + override val hasMainPage = true + override val hasChromecastSupport = true + override val supportedTypes = setOf( + TvType.TvSeries + ) + + override val mainPage = mainPageOf( + Pair("$mainUrl/serie-tv-archive/page/", "Ultime serie Tv"), + Pair("$mainUrl/animazione/page/", "Ultime serie Animazione"), + + ) + + override suspend fun getMainPage(page: Int, request: MainPageRequest): HomePageResponse { + val url = request.data + page + + val soup = app.get(url).document + val home = soup.select("div.post-thumb").map { + val title = it.selectFirst("img")!!.attr("alt") + val link = it.selectFirst("a")!!.attr("href") + val image = fixUrl(it.selectFirst("img")!!.attr("src")) + + MovieSearchResponse( + title, + link, + this.name, + TvType.Movie, + image + ) + } + return newHomePageResponse(request.name, home) + } + + override suspend fun search(query: String): List { + val doc = app.post( + "$mainUrl/index.php", data = mapOf( + "do" to "search", + "subaction" to "search", + "story" to query, + "sortby" to "news_read" + ) + ).document + return doc.select("div.post-thumb").map { + val title = it.selectFirst("img")!!.attr("alt") + val link = it.selectFirst("a")!!.attr("href") + val image = mainUrl + it.selectFirst("img")!!.attr("src") + + MovieSearchResponse( + title, + link, + this.name, + TvType.Movie, + image + ) + } + } + + override suspend fun load(url: String): LoadResponse { + val page = app.get(url) + val document = page.document + val title = document.selectFirst("h2")!!.text().replace("^([1-9+]]$","") + val style = document.selectFirst("div.entry-cover")!!.attr("style") + val poster = fixUrl(Regex("(/upload.+\\))").find(style)!!.value.dropLast(1)) + val episodeList = ArrayList() + document.select("div.tab-pane.fade").map { element -> + val season = element.attr("id").filter { it.isDigit() }.toInt() + element.select("li").filter { it-> it.selectFirst("a")?.hasAttr("data-title")?:false }.map{episode -> + val data = episode.select("div.mirrors > a").map { it.attr("data-link") }.toJson() + val epnameData = episode.selectFirst("a") + val epTitle = epnameData!!.attr("data-title") + val epNum = epnameData.text().toInt() + episodeList.add( + Episode( + data, + epTitle, + season, + epNum + + ) + ) + } + } + return newTvSeriesLoadResponse(title, url, TvType.TvSeries, episodeList) { + posterUrl = poster + } + + } + + + override suspend fun loadLinks( + data: String, + isCasting: Boolean, + subtitleCallback: (SubtitleFile) -> Unit, + callback: (ExtractorLink) -> Unit + ): Boolean { + parseJson>(data).map { videoUrl -> + loadExtractor(videoUrl, data, subtitleCallback, callback) + } + return true + } +} diff --git a/EurostreamingProvider/src/main/kotlin/com/lagradost/EurostreamingProviderPlugin.kt b/EurostreamingProvider/src/main/kotlin/com/lagradost/EurostreamingProviderPlugin.kt new file mode 100644 index 0000000..7a18c9b --- /dev/null +++ b/EurostreamingProvider/src/main/kotlin/com/lagradost/EurostreamingProviderPlugin.kt @@ -0,0 +1,14 @@ + +package com.lagradost + +import com.lagradost.cloudstream3.plugins.CloudstreamPlugin +import com.lagradost.cloudstream3.plugins.Plugin +import android.content.Context + +@CloudstreamPlugin +class EurostreamingProviderPlugin: Plugin() { + override fun load(context: Context) { + // All providers should be added in this manner. Please don't edit the providers list directly. + registerMainAPI(EurostreamingProvider()) + } +} \ No newline at end of file diff --git a/IlGenioDelloStreamingProvider/src/main/kotlin/com/lagradost/IlGenioDelloStreamingProvider.kt b/IlGenioDelloStreamingProvider/src/main/kotlin/com/lagradost/IlGenioDelloStreamingProvider.kt index 5d8d417..b747ab4 100644 --- a/IlGenioDelloStreamingProvider/src/main/kotlin/com/lagradost/IlGenioDelloStreamingProvider.kt +++ b/IlGenioDelloStreamingProvider/src/main/kotlin/com/lagradost/IlGenioDelloStreamingProvider.kt @@ -9,6 +9,7 @@ import com.lagradost.cloudstream3.utils.ExtractorLink import com.lagradost.cloudstream3.utils.ShortLink import com.lagradost.cloudstream3.utils.loadExtractor import org.jsoup.Jsoup +import org.jsoup.nodes.Element class IlGenioDelloStreamingProvider : MainAPI() { @@ -74,7 +75,7 @@ class IlGenioDelloStreamingProvider : MainAPI() { override suspend fun load(url: String): LoadResponse { val page = app.get(url) val document = page.document - val type = if (document.selectFirst("div.sgeneros")?.text() == "Serie TV"){TvType.TvSeries} else{TvType.Movie} + val type = if (document.select("div.seasons-wraper").isNotEmpty()){TvType.TvSeries} else{TvType.Movie} val title = document.selectFirst("div.data > h1")!!.text().substringBefore("(").substringBefore("[") val description = document.selectFirst("div#info")?.selectFirst("p")?.html() val rating = document.select("span.valor").last()?.text()?.split(" ")?.get(0) @@ -104,23 +105,36 @@ class IlGenioDelloStreamingProvider : MainAPI() { if (type == TvType.TvSeries) { val episodeList = ArrayList() - val seasons = document.selectFirst("div#info")?.select("p")?.map {it.children() } - ?.filter { it.size > 1 && it.first()!!.hasAttr("href") } - ?.map{(it.toString().split("
")) - .map{Jsoup.parse(it).select("a") - ?.map { it?.attr("href") }}} - seasons?.mapIndexed { season, element -> - element.mapIndexed { index, list -> - val urls = list?.toJson()?:url - episodeList.add( - Episode( - data = urls, - episode = index + 1, - season = season + 1 - ) - ) + document.selectFirst("div.seasons-wraper") + ?.select("div.accordion-item ")?.groupBy {it.selectFirst("span.season-title")!!.text() }?.map { seasons -> + seasons.value.map {season -> season.select("div.episode-wrap")}.flatten() + .groupBy { it.selectFirst("li.season-no")?.text()?.substringBeforeLast(" ") } + .map { episodeItaSub -> + val episodes = episodeItaSub.value + val posterUrl = episodes.firstNotNullOf { it.selectFirst("img")?.attr("src")} + val epName = episodes.firstNotNullOf{it.selectFirst("li.other_link")?.text()?:""} + + episodes.map{ episode -> + val seasonNo = episode.selectFirst("li.season-no") + val subtag = seasonNo?.text()?.takeIf {it.contains("Sub")}?.substringAfter(" ") ?: "" + val urls = episode.getElementsByAttributeValue("target", "_blank").map { it.attr("href").trim() } + .filter { it.isNotEmpty()}.toJson() + episodeList.add(Episode( + data = urls, + posterUrl = posterUrl, + season = seasons.key.toIntOrNull(), + name = "$epName ${subtag.uppercase()}", + episode = seasonNo?.text()?.substringAfter("x")?.filter { it.isDigit() }?.toIntOrNull() + + )) + } + + + + } } - } + + val seasonnames = document.selectFirst("div#info")?.select("p")?.map {it.children() } ?.filter { it.size<3 && it.isNotEmpty()}?.map{it.text()} diff --git a/TantiFilmProvider/build.gradle.kts b/TantiFilmProvider/build.gradle.kts index 7106ffe..f98a6f1 100644 --- a/TantiFilmProvider/build.gradle.kts +++ b/TantiFilmProvider/build.gradle.kts @@ -16,7 +16,7 @@ cloudstream { * 2: Slow * 3: Beta only * */ - status = 0 // will be 3 if unspecified + status = 1 // will be 3 if unspecified tvTypes = listOf( "TvSeries", "Movie", diff --git a/TantiFilmProvider/src/main/kotlin/com/lagradost/TantiFilmProvider.kt b/TantiFilmProvider/src/main/kotlin/com/lagradost/TantiFilmProvider.kt index f030606..ed1c6e6 100644 --- a/TantiFilmProvider/src/main/kotlin/com/lagradost/TantiFilmProvider.kt +++ b/TantiFilmProvider/src/main/kotlin/com/lagradost/TantiFilmProvider.kt @@ -4,6 +4,7 @@ import com.lagradost.cloudstream3.* import com.lagradost.cloudstream3.LoadResponse.Companion.addTrailer import com.lagradost.cloudstream3.utils.ExtractorLink import com.lagradost.cloudstream3.utils.loadExtractor +import com.lagradost.cloudstream3.network.CloudflareKiller class TantifilmProvider : MainAPI() { @@ -23,23 +24,27 @@ class TantifilmProvider : MainAPI() { Pair("$mainUrl/watch-genre/film-aggiornati/page/", "Ultimi Film Aggiornati"), ) + private val interceptor = CloudflareKiller() + override suspend fun getMainPage( page: Int, - request : MainPageRequest + request: MainPageRequest ): HomePageResponse { val url = request.data + page - val soup = app.get(url).document + val soup = app.get(url, interceptor = interceptor).document val home = soup.select("div.media3").map { val title = it.selectFirst("p")!!.text().substringBefore("(") val link = it.selectFirst("a")!!.attr("href") + val posterUrl = it.selectFirst("img")!!.attr("src") TvSeriesSearchResponse( title, link, this.name, TvType.Movie, - it.selectFirst("img")!!.attr("src"), + posterUrl, null, null, + posterHeaders = interceptor.getCookieHeaders(url).toMap() ) } return newHomePageResponse(request.name, home) @@ -48,7 +53,8 @@ class TantifilmProvider : MainAPI() { override suspend fun search(query: String): List { val queryformatted = query.replace(" ", "+") val url = "$mainUrl/search/$queryformatted" - val doc = app.get(url).document + + val doc = app.get(url, interceptor = interceptor).document return doc.select("div.film.film-2").map { val href = it.selectFirst("a")!!.attr("href") val poster = it.selectFirst("img")!!.attr("src") @@ -59,14 +65,16 @@ class TantifilmProvider : MainAPI() { this.name, TvType.Movie, poster, - null + null, + posterHeaders = interceptor.getCookieHeaders(url).toMap() ) } } override suspend fun load(url: String): LoadResponse { - val document = app.get(url).document + + val document = app.get(url, interceptor = interceptor).document val type = if (document.selectFirst("div.category-film")!!.text().contains("Serie") .not() ) TvType.Movie else TvType.TvSeries @@ -97,7 +105,8 @@ class TantifilmProvider : MainAPI() { this.name, TvType.Movie, poster, - null + null, + posterHeaders = interceptor.getCookieHeaders(url).toMap() ) } @@ -149,6 +158,7 @@ class TantifilmProvider : MainAPI() { this.rating = rating this.recommendations = recomm addTrailer(trailerurl) + this.posterHeaders = interceptor.getCookieHeaders(url).toMap() } } else { val url2 = document.selectFirst("iframe")!!.attr("src") @@ -161,8 +171,8 @@ class TantifilmProvider : MainAPI() { val actors: List? = if (Linkactor.isNotEmpty()) { val actorpage = app.get(Linkactor + "cast/").document - actorpage.select("article.membro-cast").filter { - it -> it.selectFirst("img") + actorpage.select("article.membro-cast").filter { it -> + it.selectFirst("img") ?.attr("src") != "https://www.filmtv.it/imgbank/DUMMY/no_portrait.jpg" }.mapNotNull { val name = it.selectFirst("div.info > h3")!!.text() @@ -209,6 +219,7 @@ class TantifilmProvider : MainAPI() { this.tags = tags this.duration = duratio this.actors = actors + this.posterHeaders = interceptor.getCookieHeaders(url).toMap() addTrailer(trailerurl) } @@ -223,7 +234,7 @@ class TantifilmProvider : MainAPI() { ): Boolean { val doc = app.get(data).document val iframe = - doc.select("option").map { fixUrl(it.attr("value")) }.filter { it.contains("label") } + doc.select("option").map { it.attr("value") }.filter { it.contains("label") } iframe.forEach { id -> val doc2 = app.get(id).document val id2 = app.get(doc2.selectFirst("iframe")!!.attr("src")).url From 5e9ade8ec16e50cbf25eb12c3e8d29d34e0a772b Mon Sep 17 00:00:00 2001 From: Hexated <37908684+hexated@users.noreply.github.com> Date: Sun, 28 Aug 2022 22:51:09 +0700 Subject: [PATCH 06/20] changes Idlix domain (#6) --- IdlixProvider/build.gradle.kts | 4 ++-- IdlixProvider/src/main/kotlin/com/lagradost/IdlixProvider.kt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/IdlixProvider/build.gradle.kts b/IdlixProvider/build.gradle.kts index 13cafd3..acdda45 100644 --- a/IdlixProvider/build.gradle.kts +++ b/IdlixProvider/build.gradle.kts @@ -1,5 +1,5 @@ // use an integer for version numbers -version = 1 +version = 2 cloudstream { @@ -7,7 +7,7 @@ cloudstream { // All of these properties are optional, you can safely remove them // description = "Lorem Ipsum" - // authors = listOf("Cloudburst") + authors = listOf("Hexated") /** * Status int as the following: diff --git a/IdlixProvider/src/main/kotlin/com/lagradost/IdlixProvider.kt b/IdlixProvider/src/main/kotlin/com/lagradost/IdlixProvider.kt index 3ff2b0b..cf0182f 100644 --- a/IdlixProvider/src/main/kotlin/com/lagradost/IdlixProvider.kt +++ b/IdlixProvider/src/main/kotlin/com/lagradost/IdlixProvider.kt @@ -11,7 +11,7 @@ import org.jsoup.nodes.Element import java.net.URI class IdlixProvider : MainAPI() { - override var mainUrl = "https://94.103.82.88" + override var mainUrl = "https://195.2.92.213" override var name = "Idlix" override val hasMainPage = true override var lang = "id" From 0164c86f81fbc41cf3cb6e3ae53e8dfe776b572a Mon Sep 17 00:00:00 2001 From: LagradOst <46196380+Blatzar@users.noreply.github.com> Date: Mon, 29 Aug 2022 15:56:50 +0200 Subject: [PATCH 07/20] disable egybest --- settings.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 21bf4f0..16b5679 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -4,7 +4,7 @@ rootProject.name = "CloudstreamPlugins" // to the includes below. // Plugins are included like this -val disabled = listOf() +val disabled = listOf("EgyBestProvider") File(rootDir, ".").eachDir { dir -> if (!disabled.contains(dir.name) && File(dir, "build.gradle.kts").exists()) { From a30277322aac5671027caaa47146f68ae5ac6cf9 Mon Sep 17 00:00:00 2001 From: Jace <54625750+Jacekun@users.noreply.github.com> Date: Tue, 30 Aug 2022 22:13:46 +0800 Subject: [PATCH 08/20] [Feature] Enable nsfw on Pinoy movie providers homepage (#7) --- PinoyHDXyzProvider/build.gradle.kts | 4 ++-- PinoyMovies/build.gradle.kts | 4 ++-- .../com/lagradost/PinoyMoviePediaProvider.kt | 8 ++++--- .../com/lagradost/PinoyMoviesEsProvider.kt | 21 ++++++++++++------- 4 files changed, 22 insertions(+), 15 deletions(-) diff --git a/PinoyHDXyzProvider/build.gradle.kts b/PinoyHDXyzProvider/build.gradle.kts index 077ec3b..714133d 100644 --- a/PinoyHDXyzProvider/build.gradle.kts +++ b/PinoyHDXyzProvider/build.gradle.kts @@ -6,8 +6,8 @@ cloudstream { language = "tl" // All of these properties are optional, you can safely remove them - // description = "Lorem Ipsum" - // authors = listOf("Cloudburst") + description = "Pinoy HD Movies - High Definition" + authors = listOf("Jace") /** * Status int as the following: diff --git a/PinoyMovies/build.gradle.kts b/PinoyMovies/build.gradle.kts index 9e087e9..0e2c4a2 100644 --- a/PinoyMovies/build.gradle.kts +++ b/PinoyMovies/build.gradle.kts @@ -1,5 +1,5 @@ // use an integer for version numbers -version = 1 +version = 2 cloudstream { @@ -7,7 +7,7 @@ cloudstream { // All of these properties are optional, you can safely remove them description = "Includes PinoyMoviePediaProvider and PinoyMoviesEsProvider" - // authors = listOf("Cloudburst") + authors = listOf("Jace") /** * Status int as the following: diff --git a/PinoyMovies/src/main/kotlin/com/lagradost/PinoyMoviePediaProvider.kt b/PinoyMovies/src/main/kotlin/com/lagradost/PinoyMoviePediaProvider.kt index 8448701..33e0a30 100644 --- a/PinoyMovies/src/main/kotlin/com/lagradost/PinoyMoviePediaProvider.kt +++ b/PinoyMovies/src/main/kotlin/com/lagradost/PinoyMoviePediaProvider.kt @@ -21,7 +21,7 @@ class PinoyMoviePediaProvider : MainAPI() { val document = app.get(mainUrl).document val mainbody = document.getElementsByTag("body") // All rows will be hardcoded bc of the nature of the site - val rows: List> = listOf( + val rows = listOf( Pair("Latest Movies", "featured-titles"), Pair("Movies", "dt-movies"), Pair("Digitally Restored", "genre_digitally-restored"), @@ -29,8 +29,10 @@ class PinoyMoviePediaProvider : MainAPI() { Pair("Romance", "genre_romance"), Pair("Comedy", "genre_comedy"), Pair("Family", "genre_family") - //Pair("Adult +18", "genre_pinay-sexy-movies") - ) + ).toMutableList() + if (settingsForProvider.enableAdult) { + rows.add(Pair("Adult +18", "genre_pinay-sexy-movies")) + } rows.forEach { item -> val title = item.first val inner = mainbody?.select("div#${item.second} > article") diff --git a/PinoyMovies/src/main/kotlin/com/lagradost/PinoyMoviesEsProvider.kt b/PinoyMovies/src/main/kotlin/com/lagradost/PinoyMoviesEsProvider.kt index f614269..5b7ad69 100644 --- a/PinoyMovies/src/main/kotlin/com/lagradost/PinoyMoviesEsProvider.kt +++ b/PinoyMovies/src/main/kotlin/com/lagradost/PinoyMoviesEsProvider.kt @@ -106,14 +106,19 @@ class PinoyMoviesEsProvider : MainAPI() { all.addAll(homepage1) } //2nd rows + val listOfRows = listOf( + Pair("Action", "genre_action"), + Pair("Comedy", "genre_comedy"), + Pair("Romance", "genre_romance"), + Pair("Horror", "genre_horror") + ).toMutableList() + if (settingsForProvider.enableAdult) { + listOfRows.add(Pair("Rated-R", "genre_rated-r")) + } val homepage2 = getRowElements( - mainbody, listOf( - Pair("Action", "genre_action"), - Pair("Comedy", "genre_comedy"), - Pair("Romance", "genre_romance"), - Pair("Horror", "genre_horror") - //Pair("Rated-R", "genre_rated-r") - ), "#" + mainbody = mainbody, + rows = listOfRows, + sep = "#" ) if (homepage2.isNotEmpty()) { all.addAll(homepage2) @@ -127,7 +132,7 @@ class PinoyMoviesEsProvider : MainAPI() { val document = app.get(url, interceptor = DdosGuardKiller(true)) .document.select("div#archive-content > article") - return document?.mapNotNull { + return document.mapNotNull { // Fetch details val urlTitle = it?.select("div.data") ?: return@mapNotNull null val link = urlTitle.select("a")?.attr("href") ?: return@mapNotNull null From e32a531ed069f5ba2d58739ccd77a554e480dd9e Mon Sep 17 00:00:00 2001 From: hexated Date: Tue, 30 Aug 2022 05:06:25 +0700 Subject: [PATCH 09/20] changes Yomovies domain --- YomoviesProvider/build.gradle.kts | 4 ++-- .../src/main/kotlin/com/lagradost/YomoviesProvider.kt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/YomoviesProvider/build.gradle.kts b/YomoviesProvider/build.gradle.kts index bd9fa91..4b93d4e 100644 --- a/YomoviesProvider/build.gradle.kts +++ b/YomoviesProvider/build.gradle.kts @@ -1,5 +1,5 @@ // use an integer for version numbers -version = 2 +version = 3 cloudstream { @@ -7,7 +7,7 @@ cloudstream { // All of these properties are optional, you can safely remove them // description = "Lorem Ipsum" - // authors = listOf("Cloudburst") + authors = listOf("Hexated") /** * Status int as the following: diff --git a/YomoviesProvider/src/main/kotlin/com/lagradost/YomoviesProvider.kt b/YomoviesProvider/src/main/kotlin/com/lagradost/YomoviesProvider.kt index c746d46..e206af8 100644 --- a/YomoviesProvider/src/main/kotlin/com/lagradost/YomoviesProvider.kt +++ b/YomoviesProvider/src/main/kotlin/com/lagradost/YomoviesProvider.kt @@ -9,7 +9,7 @@ import com.lagradost.cloudstream3.utils.loadExtractor import org.jsoup.nodes.Element class YomoviesProvider : MainAPI() { - override var mainUrl = "https://yomovies.ink" + override var mainUrl = "https://yomovies.cloud" override var name = "Yomovies" override val hasMainPage = true override var lang = "hi" From 67e00768968cf3d83b69635f849dbbc5e8cc8818 Mon Sep 17 00:00:00 2001 From: hexated Date: Tue, 30 Aug 2022 17:57:11 +0700 Subject: [PATCH 10/20] add source to AnimeSail --- AnimeSailProvider/build.gradle.kts | 4 ++-- .../src/main/kotlin/com/lagradost/AnimeSailProvider.kt | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/AnimeSailProvider/build.gradle.kts b/AnimeSailProvider/build.gradle.kts index 40666ed..7fcac9c 100644 --- a/AnimeSailProvider/build.gradle.kts +++ b/AnimeSailProvider/build.gradle.kts @@ -1,5 +1,5 @@ // use an integer for version numbers -version = 1 +version = 2 cloudstream { @@ -7,7 +7,7 @@ cloudstream { // All of these properties are optional, you can safely remove them // description = "Lorem Ipsum" - // authors = listOf("Cloudburst") + authors = listOf("Hexated") /** * Status int as the following: diff --git a/AnimeSailProvider/src/main/kotlin/com/lagradost/AnimeSailProvider.kt b/AnimeSailProvider/src/main/kotlin/com/lagradost/AnimeSailProvider.kt index b190fd8..f4018db 100644 --- a/AnimeSailProvider/src/main/kotlin/com/lagradost/AnimeSailProvider.kt +++ b/AnimeSailProvider/src/main/kotlin/com/lagradost/AnimeSailProvider.kt @@ -171,6 +171,10 @@ class AnimeSailProvider : MainAPI() { // skip for now // iframe.startsWith("$mainUrl/utils/player/fichan/") -> "" // iframe.startsWith("$mainUrl/utils/player/blogger/") -> "" + iframe.startsWith("https://aghanim.xyz/tools/redirect/") -> { + val link = "https://rasa-cintaku-semakin-berantai.xyz/v/${iframe.substringAfter("id=").substringBefore("&token")}" + loadExtractor(link, mainUrl, subtitleCallback, callback) + } iframe.startsWith("$mainUrl/utils/player/framezilla/") || iframe.startsWith("https://uservideo.xyz") -> { request(iframe, ref = data).document.select("iframe").attr("src") .let { link -> From 4b1b6626e67a1f8697f94595bd23701a80659b7c Mon Sep 17 00:00:00 2001 From: Zaw <42999156+ImZaw@users.noreply.github.com> Date: Thu, 1 Sep 2022 11:48:48 +0300 Subject: [PATCH 11/20] because they are in the arabic repo and some are kinda outdated --- settings.gradle.kts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 16b5679..72ef97b 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -4,7 +4,9 @@ rootProject.name = "CloudstreamPlugins" // to the includes below. // Plugins are included like this -val disabled = listOf("EgyBestProvider") +val disabled = listOf( + "EgyBestProvider", "FaselHDProvider", "AkwamProvider", "MyCimaProvider" +) File(rootDir, ".").eachDir { dir -> if (!disabled.contains(dir.name) && File(dir, "build.gradle.kts").exists()) { @@ -18,4 +20,4 @@ fun File.eachDir(block: (File) -> Unit) { // To only include a single project, comment out the previous lines (except the first one), and include your plugin like so: -// include("PluginName") \ No newline at end of file +// include("PluginName") From 9b35c6acd73b64c7e3fa2fbdacb98e2232f533ad Mon Sep 17 00:00:00 2001 From: Hexated <37908684+hexated@users.noreply.github.com> Date: Fri, 2 Sep 2022 04:26:24 +0700 Subject: [PATCH 12/20] added Useetv (#9) * add Useetv * fixes --- UseeTv/build.gradle.kts | 25 +++++ UseeTv/src/main/AndroidManifest.xml | 2 + .../src/main/kotlin/com/lagradost/UseeTv.kt | 93 +++++++++++++++++++ .../main/kotlin/com/lagradost/UseeTvPlugin.kt | 14 +++ 4 files changed, 134 insertions(+) create mode 100644 UseeTv/build.gradle.kts create mode 100644 UseeTv/src/main/AndroidManifest.xml create mode 100644 UseeTv/src/main/kotlin/com/lagradost/UseeTv.kt create mode 100644 UseeTv/src/main/kotlin/com/lagradost/UseeTvPlugin.kt diff --git a/UseeTv/build.gradle.kts b/UseeTv/build.gradle.kts new file mode 100644 index 0000000..31e67a1 --- /dev/null +++ b/UseeTv/build.gradle.kts @@ -0,0 +1,25 @@ +// use an integer for version numbers +version = 1 + + +cloudstream { + language = "id" + // All of these properties are optional, you can safely remove them + + // description = "Lorem Ipsum" + authors = listOf("Hexated") + + /** + * Status int as the following: + * 0: Down + * 1: Ok + * 2: Slow + * 3: Beta only + * */ + status = 1 // will be 3 if unspecified + tvTypes = listOf( + "Live", + ) + + iconUrl = "https://www.google.com/s2/favicons?domain=useetv.com&sz=%size%" +} diff --git a/UseeTv/src/main/AndroidManifest.xml b/UseeTv/src/main/AndroidManifest.xml new file mode 100644 index 0000000..29aec9d --- /dev/null +++ b/UseeTv/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/UseeTv/src/main/kotlin/com/lagradost/UseeTv.kt b/UseeTv/src/main/kotlin/com/lagradost/UseeTv.kt new file mode 100644 index 0000000..cbb7af9 --- /dev/null +++ b/UseeTv/src/main/kotlin/com/lagradost/UseeTv.kt @@ -0,0 +1,93 @@ +package com.lagradost + +import com.lagradost.cloudstream3.* +import com.lagradost.cloudstream3.utils.ExtractorLink +import com.lagradost.cloudstream3.utils.M3u8Helper +import org.jsoup.nodes.Element + +class UseeTv : MainAPI() { + override var mainUrl = "https://www.useetv.com" + override var name = "Useetv" + override var lang = "id" + override val hasDownloadSupport = false + override val hasMainPage = true + override val supportedTypes = setOf( + TvType.Live + ) + + companion object { + private const val mainLink = "https://streaming.useetv.com" + } + + override suspend fun getMainPage(page: Int, request: MainPageRequest): HomePageResponse { + val document = app.get("$mainUrl/tv/live").document + + val home = listOf( + Pair("col-xs-4", "Semua"), + Pair("local", "Local"), + Pair("news", "News"), + ).map { (soap,name) -> + val home = document.select("div#channelContainer div.col-channel").mapNotNull { it }.filter { + it.attr("class").contains(soap, true) + }.mapNotNull { + it.toSearchResult() + } + HomePageList(name, home) + }.filter { it.list.isNotEmpty() } + return HomePageResponse(home) + + } + + private fun Element.toSearchResult(): LiveSearchResponse? { + return LiveSearchResponse( + this.selectFirst("a")?.attr("data-name") ?: return null, + fixUrl(this.selectFirst("a")!!.attr("href")), + this@UseeTv.name, + TvType.Live, + fixUrlNull(this.select("img").attr("data-src")), + ) + + } + + override suspend fun search(query: String): List { + return app.get("$mainUrl/tv/live").document.select("div#channelContainer div.col-channel").mapNotNull { + it + }.filter { it.select("a").attr("data-name").contains(query, true) }.mapNotNull { + it.toSearchResult() + } + } + + override suspend fun load(url: String): LoadResponse? { + val document = app.get(url).document + val content = document.selectFirst("div.d-flex.video-schedule-time p")?.text()?.split("•") + val link = document.select("script").findLast { it.data().contains("\$('.live').last()") }?.data()?.let{ + Regex("'$mainLink(.*)';var").find(it)?.groupValues?.getOrNull(1) + } + return LiveStreamLoadResponse( + content?.firstOrNull()?.trim() ?: return null, + url, + this.name, + "$mainLink$link", + fixUrlNull(document.selectFirst("div.row.video-schedule img")?.attr("src")), + plot = document.selectFirst("title")?.text() + ) + } + + override suspend fun loadLinks( + data: String, + isCasting: Boolean, + subtitleCallback: (SubtitleFile) -> Unit, + callback: (ExtractorLink) -> Unit + ): Boolean { + + M3u8Helper.generateM3u8( + this.name, + data, + mainUrl + ).forEach(callback) + + return true + + } + +} \ No newline at end of file diff --git a/UseeTv/src/main/kotlin/com/lagradost/UseeTvPlugin.kt b/UseeTv/src/main/kotlin/com/lagradost/UseeTvPlugin.kt new file mode 100644 index 0000000..7184a89 --- /dev/null +++ b/UseeTv/src/main/kotlin/com/lagradost/UseeTvPlugin.kt @@ -0,0 +1,14 @@ + +package com.lagradost + +import com.lagradost.cloudstream3.plugins.CloudstreamPlugin +import com.lagradost.cloudstream3.plugins.Plugin +import android.content.Context + +@CloudstreamPlugin +class UseeTvPlugin: Plugin() { + override fun load(context: Context) { + // All providers should be added in this manner. Please don't edit the providers list directly. + registerMainAPI(UseeTv()) + } +} \ No newline at end of file From e9f40bc0ce7f3dbae67d54dad256b8b3b14dbbb2 Mon Sep 17 00:00:00 2001 From: Hexated <37908684+hexated@users.noreply.github.com> Date: Sat, 3 Sep 2022 09:19:29 +0700 Subject: [PATCH 13/20] sayonara Gomunime, best anime site EVER..!! (#11) * added Gomunimeis * fixes --- GomunimeProvider/build.gradle.kts | 2 +- Gomunimeis/build.gradle.kts | 27 +++ Gomunimeis/src/main/AndroidManifest.xml | 2 + .../main/kotlin/com/lagradost/Gomunimeis.kt | 162 ++++++++++++++++++ .../kotlin/com/lagradost/GomunimeisPlugin.kt | 14 ++ 5 files changed, 206 insertions(+), 1 deletion(-) create mode 100644 Gomunimeis/build.gradle.kts create mode 100644 Gomunimeis/src/main/AndroidManifest.xml create mode 100644 Gomunimeis/src/main/kotlin/com/lagradost/Gomunimeis.kt create mode 100644 Gomunimeis/src/main/kotlin/com/lagradost/GomunimeisPlugin.kt diff --git a/GomunimeProvider/build.gradle.kts b/GomunimeProvider/build.gradle.kts index ca320bf..96c05f7 100644 --- a/GomunimeProvider/build.gradle.kts +++ b/GomunimeProvider/build.gradle.kts @@ -16,7 +16,7 @@ cloudstream { * 2: Slow * 3: Beta only * */ - status = 1 // will be 3 if unspecified + status = 0 // will be 3 if unspecified tvTypes = listOf( "AnimeMovie", "Anime", diff --git a/Gomunimeis/build.gradle.kts b/Gomunimeis/build.gradle.kts new file mode 100644 index 0000000..b329c01 --- /dev/null +++ b/Gomunimeis/build.gradle.kts @@ -0,0 +1,27 @@ +// use an integer for version numbers +version = 1 + + +cloudstream { + language = "id" + // All of these properties are optional, you can safely remove them + + // description = "Lorem Ipsum" + authors = listOf("Hexated") + + /** + * Status int as the following: + * 0: Down + * 1: Ok + * 2: Slow + * 3: Beta only + * */ + status = 1 // will be 3 if unspecified + tvTypes = listOf( + "AnimeMovie", + "Anime", + "OVA", + ) + + iconUrl = "https://www.google.com/s2/favicons?domain=gomunime.is&sz=%size%" +} \ No newline at end of file diff --git a/Gomunimeis/src/main/AndroidManifest.xml b/Gomunimeis/src/main/AndroidManifest.xml new file mode 100644 index 0000000..29aec9d --- /dev/null +++ b/Gomunimeis/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/Gomunimeis/src/main/kotlin/com/lagradost/Gomunimeis.kt b/Gomunimeis/src/main/kotlin/com/lagradost/Gomunimeis.kt new file mode 100644 index 0000000..e8522c9 --- /dev/null +++ b/Gomunimeis/src/main/kotlin/com/lagradost/Gomunimeis.kt @@ -0,0 +1,162 @@ +package com.lagradost + +import com.fasterxml.jackson.annotation.JsonProperty +import com.lagradost.cloudstream3.* +import com.lagradost.cloudstream3.utils.* +import java.util.ArrayList + + +class Gomunimeis : MainAPI() { + override var mainUrl = "https://gomunime.is" + override var name = "Gomunime.is" + override val hasMainPage = true + override var lang = "id" + override val hasQuickSearch = true + override val hasDownloadSupport = true + + override val supportedTypes = setOf( + TvType.Anime, + TvType.AnimeMovie, + TvType.OVA + ) + + companion object { + + private const val mainImageUrl = "https://upload.anoboy.live" + + fun getType(t: String): TvType { + return if (t.contains("OVA", true) || t.contains("Special", true)) TvType.OVA + else if (t.contains("Movie", true)) TvType.AnimeMovie + else TvType.Anime + } + + fun getStatus(t: String): ShowStatus { + return when (t) { + "Completed" -> ShowStatus.Completed + "Ongoing" -> ShowStatus.Ongoing + else -> ShowStatus.Completed + } + } + } + + override val mainPage = mainPageOf( + "&limit=12&action=load_movie_last_update&status=Ongoing" to "Episode Baru", + "&limit=15&action=load_movie_last_update&status=Completed" to "Completed", + "&limit=15&action=load_movie_last_update&type=Live Action" to "Live Action", + "&limit=15&action=load_movie_trending" to "Trending" + ) + + override suspend fun getMainPage( + page: Int, + request: MainPageRequest + ): HomePageResponse { + val home = app.get( + "$mainUrl/my-ajax?page=$page${request.data}", + headers = mapOf("X-Requested-With" to "XMLHttpRequest") + ) + .parsedSafe()?.data + ?.mapNotNull { media -> + media.toSearchResponse() + } ?: throw ErrorLoadingException("Invalid Json reponse") + return newHomePageResponse(request.name, home) + } + + private fun Anime.toSearchResponse(): SearchResponse? { + + return newAnimeSearchResponse( + postTitle ?: return null, + "$mainUrl/anime/$postName.$salt", + TvType.TvSeries, + ) { + this.posterUrl = "$mainImageUrl/$image" + addSub(totalEpisode?.toIntOrNull()) + } + } + + override suspend fun quickSearch(query: String): List = search(query) + + override suspend fun search(query: String): List { + return app.get( + "$mainUrl/my-ajax?page=1&limit=10&action=load_search_movie&keyword=$query", + referer = "$mainUrl/search/?keyword=$query", + headers = mapOf("X-Requested-With" to "XMLHttpRequest") + ).parsedSafe()?.data + ?.mapNotNull { media -> + media.toSearchResponse() + } ?: throw ErrorLoadingException("Invalid Json reponse") + } + + override suspend fun load(url: String): LoadResponse { + val document = app.get(url).document + + val title = document.selectFirst(".entry-title")?.text().toString() + val poster = document.selectFirst(".thumbposter > img")?.attr("src") + val tags = document.select(".genxed > a").map { it.text() } + val type = getType(document.selectFirst("div.info-content .spe span:last-child")?.ownText().toString()) + val year = Regex("\\d, ([0-9]*)").find( + document.selectFirst("div.info-content .spe span.split")?.ownText().toString() + )?.groupValues?.get(1)?.toIntOrNull() + val status = getStatus(document.selectFirst(".spe > span")!!.ownText()) + val description = document.select("div[itemprop = description] > p").text() + + val episodes = document.select(".eplister > ul > li").map { + val header = it.select(".epl-title").text() + val name = Regex("(Episode\\s?[0-9]+)").find(header)?.groupValues?.getOrNull(0) ?: header + val link = it.select("a").attr("href") + Episode(link, name) + }.reversed() + + return newAnimeLoadResponse(title, url, type) { + engName = title + posterUrl = poster + this.year = year + addEpisodes(DubStatus.Subbed, episodes) + showStatus = status + plot = description + this.tags = tags + } + } + + override suspend fun loadLinks( + data: String, + isCasting: Boolean, + subtitleCallback: (SubtitleFile) -> Unit, + callback: (ExtractorLink) -> Unit + ): Boolean { + + val document = app.get(data).document + + document.select("div.player-container iframe").attr("src").substringAfter("html#").let { id -> + app.get("https://gomunimes.com/stream?id=$id").parsedSafe()?.server?.streamsb?.link?.let { link -> + loadExtractor(link, "https://vidgomunime.xyz/", subtitleCallback, callback) + } + } + + return true + } + + data class Streamsb( + @JsonProperty("link") val link: String?, + ) + + data class Server( + @JsonProperty("streamsb") val streamsb: Streamsb?, + ) + + data class Sources( + @JsonProperty("server") val server: Server?, + ) + + data class Responses( + @JsonProperty("data") val data: ArrayList? = arrayListOf(), + ) + + data class Anime( + @JsonProperty("post_title") val postTitle: String?, + @JsonProperty("post_name") val postName: String?, + @JsonProperty("image") val image: String?, + @JsonProperty("total_episode") val totalEpisode: String?, + @JsonProperty("salt") val salt: String?, + ) + +} \ No newline at end of file diff --git a/Gomunimeis/src/main/kotlin/com/lagradost/GomunimeisPlugin.kt b/Gomunimeis/src/main/kotlin/com/lagradost/GomunimeisPlugin.kt new file mode 100644 index 0000000..bd9b1c1 --- /dev/null +++ b/Gomunimeis/src/main/kotlin/com/lagradost/GomunimeisPlugin.kt @@ -0,0 +1,14 @@ + +package com.lagradost + +import com.lagradost.cloudstream3.plugins.CloudstreamPlugin +import com.lagradost.cloudstream3.plugins.Plugin +import android.content.Context + +@CloudstreamPlugin +class GomunimeisPlugin: Plugin() { + override fun load(context: Context) { + // All providers should be added in this manner. Please don't edit the providers list directly. + registerMainAPI(Gomunimeis()) + } +} \ No newline at end of file From bbac9318330bbf9cab3692c2dd0f5595eda36fa0 Mon Sep 17 00:00:00 2001 From: tuan041 <30403510+tuan041@users.noreply.github.com> Date: Sat, 3 Sep 2022 15:39:45 +0700 Subject: [PATCH 14/20] Fix description and poster in recommendations Fix description and poster in recommendations --- .../com/lagradost/PhimmoichillProvider.kt | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/PhimmoichillProvider/src/main/kotlin/com/lagradost/PhimmoichillProvider.kt b/PhimmoichillProvider/src/main/kotlin/com/lagradost/PhimmoichillProvider.kt index 6f4a726..22bf201 100644 --- a/PhimmoichillProvider/src/main/kotlin/com/lagradost/PhimmoichillProvider.kt +++ b/PhimmoichillProvider/src/main/kotlin/com/lagradost/PhimmoichillProvider.kt @@ -89,16 +89,25 @@ class PhimmoichillProvider : MainAPI() { .toIntOrNull() val tvType = if (document.select("div.latest-episode").isNotEmpty() ) TvType.TvSeries else TvType.Movie - val description = document.select("div#film-content-wrapper").text().trim() + val description = document.select("div#film-content").text().trim() val trailer = document.select("div#trailer script").last()?.data()?.substringAfter("file: \"") ?.substringBefore("\",") val rating = document.select("ul.entry-meta.block-film li:nth-child(7) span").text().toRatingInt() val actors = document.select("ul.entry-meta.block-film li:last-child a").map { it.text() } - val recommendations = document.select("ul#list-film-realted li.item").map { - it.toSearchResult() - } + val recommendations = document.select("ul#list-film-realted li.item").mapNotNull { + val titleHeader = element.select("li.item > p") ?: return null + val recUrl = fixUrlNull(titleHeader.attr("href")) ?: return null + val recTitle = titleHeader.text() ?: return null + val poster = element.select("li.item > .lazyloaded > img").attr("src") + MovieSearchResponse( + recTitle, + recUrl, + this.name, + poster + ) + } return if (tvType == TvType.TvSeries) { val docEpisodes = app.get(link).document @@ -222,4 +231,4 @@ class PhimmoichillProvider : MainAPI() { @JsonProperty("2048p") val main: DataM3u?, ) -} \ No newline at end of file +} From 0376eca756c9a11aa2abbe8db1bbd688bba4af0b Mon Sep 17 00:00:00 2001 From: tuan041 <30403510+tuan041@users.noreply.github.com> Date: Sat, 3 Sep 2022 16:13:51 +0700 Subject: [PATCH 15/20] Update PhimmoichillProvider.kt --- .../main/kotlin/com/lagradost/PhimmoichillProvider.kt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/PhimmoichillProvider/src/main/kotlin/com/lagradost/PhimmoichillProvider.kt b/PhimmoichillProvider/src/main/kotlin/com/lagradost/PhimmoichillProvider.kt index 22bf201..3092de7 100644 --- a/PhimmoichillProvider/src/main/kotlin/com/lagradost/PhimmoichillProvider.kt +++ b/PhimmoichillProvider/src/main/kotlin/com/lagradost/PhimmoichillProvider.kt @@ -97,14 +97,15 @@ class PhimmoichillProvider : MainAPI() { document.select("ul.entry-meta.block-film li:nth-child(7) span").text().toRatingInt() val actors = document.select("ul.entry-meta.block-film li:last-child a").map { it.text() } val recommendations = document.select("ul#list-film-realted li.item").mapNotNull { - val titleHeader = element.select("li.item > p") ?: return null - val recUrl = fixUrlNull(titleHeader.attr("href")) ?: return null - val recTitle = titleHeader.text() ?: return null - val poster = element.select("li.item > .lazyloaded > img").attr("src") + val titleHeader = document.select("p") ?: return@mapNotNull null + val recUrl = titleHeader.attr("href")) ?: return@mapNotNull null + val recTitle = titleHeader.text() ?: return@mapNotNull null + val poster = element.select("img").attr("src") MovieSearchResponse( recTitle, recUrl, this.name, + TvType.Movie, poster ) } From 2cdff514e4b6d347f75a70979d9c75bd7b03ead3 Mon Sep 17 00:00:00 2001 From: Cloudburst <18114966+C10udburst@users.noreply.github.com> Date: Sat, 3 Sep 2022 11:43:05 +0200 Subject: [PATCH 16/20] fix --- .../src/main/kotlin/com/lagradost/PhimmoichillProvider.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PhimmoichillProvider/src/main/kotlin/com/lagradost/PhimmoichillProvider.kt b/PhimmoichillProvider/src/main/kotlin/com/lagradost/PhimmoichillProvider.kt index 3092de7..1820ec8 100644 --- a/PhimmoichillProvider/src/main/kotlin/com/lagradost/PhimmoichillProvider.kt +++ b/PhimmoichillProvider/src/main/kotlin/com/lagradost/PhimmoichillProvider.kt @@ -97,10 +97,10 @@ class PhimmoichillProvider : MainAPI() { document.select("ul.entry-meta.block-film li:nth-child(7) span").text().toRatingInt() val actors = document.select("ul.entry-meta.block-film li:last-child a").map { it.text() } val recommendations = document.select("ul#list-film-realted li.item").mapNotNull { - val titleHeader = document.select("p") ?: return@mapNotNull null - val recUrl = titleHeader.attr("href")) ?: return@mapNotNull null + val titleHeader = it.select("p") ?: return@mapNotNull null + val recUrl = titleHeader.attr("href") ?: return@mapNotNull null val recTitle = titleHeader.text() ?: return@mapNotNull null - val poster = element.select("img").attr("src") + val poster = it.select("img").attr("src") MovieSearchResponse( recTitle, recUrl, From b0905c3c68d50a7a606729dbe76a2ac393989e88 Mon Sep 17 00:00:00 2001 From: tuan041 <30403510+tuan041@users.noreply.github.com> Date: Sun, 4 Sep 2022 20:26:07 +0700 Subject: [PATCH 17/20] Update PhimmoichillProvider.kt (#14) --- .../kotlin/com/lagradost/PhimmoichillProvider.kt | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/PhimmoichillProvider/src/main/kotlin/com/lagradost/PhimmoichillProvider.kt b/PhimmoichillProvider/src/main/kotlin/com/lagradost/PhimmoichillProvider.kt index 1820ec8..1f53fc7 100644 --- a/PhimmoichillProvider/src/main/kotlin/com/lagradost/PhimmoichillProvider.kt +++ b/PhimmoichillProvider/src/main/kotlin/com/lagradost/PhimmoichillProvider.kt @@ -96,19 +96,9 @@ class PhimmoichillProvider : MainAPI() { val rating = document.select("ul.entry-meta.block-film li:nth-child(7) span").text().toRatingInt() val actors = document.select("ul.entry-meta.block-film li:last-child a").map { it.text() } - val recommendations = document.select("ul#list-film-realted li.item").mapNotNull { - val titleHeader = it.select("p") ?: return@mapNotNull null - val recUrl = titleHeader.attr("href") ?: return@mapNotNull null - val recTitle = titleHeader.text() ?: return@mapNotNull null - val poster = it.select("img").attr("src") - MovieSearchResponse( - recTitle, - recUrl, - this.name, - TvType.Movie, - poster - ) - } + val recommendations = document.select("ul#list-film-realted li.item").map { + it.toSearchResult() + } return if (tvType == TvType.TvSeries) { val docEpisodes = app.get(link).document From 0bfba1ba5d38819ff5655d6dbf6c046172696d66 Mon Sep 17 00:00:00 2001 From: Hexated <37908684+hexated@users.noreply.github.com> Date: Mon, 5 Sep 2022 06:13:58 +0700 Subject: [PATCH 18/20] added Anizm & Hdfilmcehennemi (Turkish) (#17) * added Anizm & Hdfilmcehennemi * changes Dramaid domain --- Anizm/build.gradle.kts | 27 +++ Anizm/src/main/AndroidManifest.xml | 2 + Anizm/src/main/kotlin/com/lagradost/Anizm.kt | 195 +++++++++++++++++ .../main/kotlin/com/lagradost/AnizmPlugin.kt | 14 ++ DramaidProvider/build.gradle.kts | 6 +- .../kotlin/com/lagradost/DramaidProvider.kt | 2 +- Hdfilmcehennemi/build.gradle.kts | 26 +++ Hdfilmcehennemi/src/main/AndroidManifest.xml | 2 + .../kotlin/com/lagradost/Hdfilmcehennemi.kt | 205 ++++++++++++++++++ .../com/lagradost/HdfilmcehennemiPlugin.kt | 14 ++ KuronimeProvider/build.gradle.kts | 4 +- .../kotlin/com/lagradost/KuronimeProvider.kt | 2 +- LayarKacaProvider/build.gradle.kts | 8 +- .../kotlin/com/lagradost/LayarKacaProvider.kt | 2 +- NontonAnimeIDProvider/build.gradle.kts | 4 +- .../com/lagradost/NontonAnimeIDProvider.kt | 2 +- 16 files changed, 500 insertions(+), 15 deletions(-) create mode 100644 Anizm/build.gradle.kts create mode 100644 Anizm/src/main/AndroidManifest.xml create mode 100644 Anizm/src/main/kotlin/com/lagradost/Anizm.kt create mode 100644 Anizm/src/main/kotlin/com/lagradost/AnizmPlugin.kt create mode 100644 Hdfilmcehennemi/build.gradle.kts create mode 100644 Hdfilmcehennemi/src/main/AndroidManifest.xml create mode 100644 Hdfilmcehennemi/src/main/kotlin/com/lagradost/Hdfilmcehennemi.kt create mode 100644 Hdfilmcehennemi/src/main/kotlin/com/lagradost/HdfilmcehennemiPlugin.kt diff --git a/Anizm/build.gradle.kts b/Anizm/build.gradle.kts new file mode 100644 index 0000000..6c69805 --- /dev/null +++ b/Anizm/build.gradle.kts @@ -0,0 +1,27 @@ +// use an integer for version numbers +version = 1 + + +cloudstream { + language = "tr" + // All of these properties are optional, you can safely remove them + + // description = "Lorem Ipsum" + authors = listOf("Hexated") + + /** + * Status int as the following: + * 0: Down + * 1: Ok + * 2: Slow + * 3: Beta only + * */ + status = 1 // will be 3 if unspecified + tvTypes = listOf( + "AnimeMovie", + "Anime", + "OVA", + ) + + iconUrl = "https://www.google.com/s2/favicons?domain=anizm.net&sz=%size%" +} \ No newline at end of file diff --git a/Anizm/src/main/AndroidManifest.xml b/Anizm/src/main/AndroidManifest.xml new file mode 100644 index 0000000..29aec9d --- /dev/null +++ b/Anizm/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/Anizm/src/main/kotlin/com/lagradost/Anizm.kt b/Anizm/src/main/kotlin/com/lagradost/Anizm.kt new file mode 100644 index 0000000..eefabe2 --- /dev/null +++ b/Anizm/src/main/kotlin/com/lagradost/Anizm.kt @@ -0,0 +1,195 @@ +package com.lagradost + +import android.util.Log +import com.fasterxml.jackson.annotation.JsonProperty +import com.lagradost.cloudstream3.* +import com.lagradost.cloudstream3.LoadResponse.Companion.addTrailer +import com.lagradost.cloudstream3.mvvm.safeApiCall +import com.lagradost.cloudstream3.utils.* +import org.jsoup.Jsoup +import org.jsoup.nodes.Element + + +class Anizm : MainAPI() { + override var mainUrl = "https://anizm.net" + override var name = "Anizm" + override val hasMainPage = true + override var lang = "tr" + override val hasDownloadSupport = true + + override val supportedTypes = setOf( + TvType.Anime, + TvType.AnimeMovie, + TvType.OVA + ) + + companion object { + private const val mainServer = "https://anizmplayer.com" + } + + override val mainPage = mainPageOf( + "$mainUrl/anime-izle?sayfa=" to "Son Eklenen Animeler", + ) + + override suspend fun getMainPage( + page: Int, + request: MainPageRequest + ): HomePageResponse { + val document = app.get(request.data + page).document + val home = document.select("div.restrictedWidth div#episodesMiddle").mapNotNull { + it.toSearchResult() + } + return newHomePageResponse(request.name, home) + } + + private fun getProperAnimeLink(uri: String): String { + return if (uri.contains("-bolum")) { + "$mainUrl/${uri.substringAfter("$mainUrl/").replace(Regex("-[0-9]+-bolum.*"), "")}" + } else { + uri + } + } + + private fun Element.toSearchResult(): AnimeSearchResponse? { + val href = getProperAnimeLink(this.selectFirst("a")!!.attr("href")) + val title = this.selectFirst("div.title, h5.animeTitle a")?.text() ?: return null + val posterUrl = fixUrlNull(this.selectFirst("img")?.attr("src")) + val episode = this.selectFirst("div.truncateText")?.text()?.let { + Regex("([0-9]+).\\s?Bölüm").find(it)?.groupValues?.getOrNull(1)?.toIntOrNull() + } + + return newAnimeSearchResponse(title, href, TvType.Anime) { + this.posterUrl = posterUrl + addSub(episode) + } + } + + override suspend fun search(query: String): List { + val document = app.get( + "$mainUrl/fullViewSearch?search=$query&skip=0", + headers = mapOf("X-Requested-With" to "XMLHttpRequest") + ).document + + return document.select("div.searchResultItem").mapNotNull { + it.toSearchResult() + } + } + + override suspend fun load(url: String): LoadResponse { + val document = app.get(url).document + + val title = document.selectFirst("h2.anizm_pageTitle a")!!.text().trim() + val type = + if (document.select("div.ui.grid div.four.wide").size == 1) TvType.Movie else TvType.Anime + val trailer = document.select("div.yt-hd-thumbnail-inner-container iframe").attr("src") + val episodes = document.select("div.ui.grid div.four.wide").map { + val name = it.select("div.episodeBlock").text() + val link = fixUrl(it.selectFirst("a")?.attr("href").toString()) + Episode(link, name) + } + return newAnimeLoadResponse(title, url, type) { + posterUrl = fixUrlNull(document.selectFirst("div.infoPosterImg > img")?.attr("src")) + this.year = document.select("div.infoSta ul li:first-child").text().trim().toIntOrNull() + addEpisodes(DubStatus.Subbed, episodes) + plot = document.select("div.infoDesc").text().trim() + this.tags = document.select("span.dataValue span.ui.label").map { it.text() } + addTrailer(trailer) + } + } + + private suspend fun invokeLokalSource( + url: String, + translator: String, + sourceCallback: (ExtractorLink) -> Unit + ) { + app.get(url, referer = "$mainUrl/").document.select("script").find { script -> + script.data().contains("eval(function(p,a,c,k,e,d)") + }?.let { + val key = getAndUnpack(it.data()).substringAfter("FirePlayer(\"").substringBefore("\",") + val referer = "$mainServer/video/$key" + val link = "$mainServer/player/index.php?data=$key&do=getVideo" + Log.i("hexated", link) + app.post( + link, + data = mapOf("hash" to key, "r" to "$mainUrl/"), + referer = referer, + headers = mapOf( + "Accept" to "*/*", + "Origin" to mainServer, + "Content-Type" to "application/x-www-form-urlencoded; charset=UTF-8", + "X-Requested-With" to "XMLHttpRequest" + ) + ).parsedSafe()?.videoSource?.let { m3uLink -> + M3u8Helper.generateM3u8( + "${this.name} ($translator)", + m3uLink, + referer + ).forEach(sourceCallback) + } + } + } + + override suspend fun loadLinks( + data: String, + isCasting: Boolean, + subtitleCallback: (SubtitleFile) -> Unit, + callback: (ExtractorLink) -> Unit + ): Boolean { + val document = app.get(data).document + document.select("div.episodeTranslators div#fansec").map { + Pair(it.select("a").attr("translator"), it.select("div.title").text()) + }.apmap { (url, translator) -> + safeApiCall { + app.get( + url, + referer = data, + headers = mapOf( + "Accept" to "application/json, text/javascript, */*; q=0.01", + "X-Requested-With" to "XMLHttpRequest" + ) + ).parsedSafe()?.data?.let { + Jsoup.parse(it).select("a").apmap { video -> + app.get( + video.attr("video"), + referer = data, + headers = mapOf( + "Accept" to "application/json, text/javascript, */*; q=0.01", + "X-Requested-With" to "XMLHttpRequest" + ) + ).parsedSafe()?.player?.let { iframe -> + Jsoup.parse(iframe).select("iframe").attr("src").let { link -> + when { + link.startsWith(mainServer) -> { + invokeLokalSource(link, translator, callback) + } + else -> { + loadExtractor( + fixUrl(link), + "$mainUrl/", + subtitleCallback, + callback + ) + } + } + } + } + } + } + } + } + return true + } + + data class Source( + @JsonProperty("videoSource") val videoSource: String?, + ) + + data class Videos( + @JsonProperty("player") val player: String?, + ) + + data class Translators( + @JsonProperty("data") val data: String?, + ) + +} \ No newline at end of file diff --git a/Anizm/src/main/kotlin/com/lagradost/AnizmPlugin.kt b/Anizm/src/main/kotlin/com/lagradost/AnizmPlugin.kt new file mode 100644 index 0000000..8080247 --- /dev/null +++ b/Anizm/src/main/kotlin/com/lagradost/AnizmPlugin.kt @@ -0,0 +1,14 @@ + +package com.lagradost + +import com.lagradost.cloudstream3.plugins.CloudstreamPlugin +import com.lagradost.cloudstream3.plugins.Plugin +import android.content.Context + +@CloudstreamPlugin +class AnizmPlugin: Plugin() { + override fun load(context: Context) { + // All providers should be added in this manner. Please don't edit the providers list directly. + registerMainAPI(Anizm()) + } +} \ No newline at end of file diff --git a/DramaidProvider/build.gradle.kts b/DramaidProvider/build.gradle.kts index 3fc2c3a..c217391 100644 --- a/DramaidProvider/build.gradle.kts +++ b/DramaidProvider/build.gradle.kts @@ -1,5 +1,5 @@ // use an integer for version numbers -version = 1 +version = 2 cloudstream { @@ -7,7 +7,7 @@ cloudstream { // All of these properties are optional, you can safely remove them // description = "Lorem Ipsum" - // authors = listOf("Cloudburst") + authors = listOf("Hexated") /** * Status int as the following: @@ -22,5 +22,5 @@ cloudstream { "Movie", ) - iconUrl = "https://www.google.com/s2/favicons?domain=185.224.83.103&sz=%size%" + iconUrl = "https://www.google.com/s2/favicons?domain=dramaid.asia&sz=%size%" } \ No newline at end of file diff --git a/DramaidProvider/src/main/kotlin/com/lagradost/DramaidProvider.kt b/DramaidProvider/src/main/kotlin/com/lagradost/DramaidProvider.kt index 318a5ca..8dcf2b7 100644 --- a/DramaidProvider/src/main/kotlin/com/lagradost/DramaidProvider.kt +++ b/DramaidProvider/src/main/kotlin/com/lagradost/DramaidProvider.kt @@ -10,7 +10,7 @@ import org.jsoup.Jsoup import org.jsoup.nodes.Element class DramaidProvider : MainAPI() { - override var mainUrl = "https://185.224.83.103" + override var mainUrl = "https://dramaid.asia" override var name = "DramaId" override val hasQuickSearch = false override val hasMainPage = true diff --git a/Hdfilmcehennemi/build.gradle.kts b/Hdfilmcehennemi/build.gradle.kts new file mode 100644 index 0000000..c10c4e9 --- /dev/null +++ b/Hdfilmcehennemi/build.gradle.kts @@ -0,0 +1,26 @@ +// use an integer for version numbers +version = 1 + + +cloudstream { + language = "tr" + // All of these properties are optional, you can safely remove them + + // description = "Lorem Ipsum" + authors = listOf("Hexated") + + /** + * Status int as the following: + * 0: Down + * 1: Ok + * 2: Slow + * 3: Beta only + * */ + status = 1 // will be 3 if unspecified + tvTypes = listOf( + "TvSeries", + "Movie", + ) + + iconUrl = "https://www.google.com/s2/favicons?domain=hdfilmcehennemi.live&sz=%size%" +} \ No newline at end of file diff --git a/Hdfilmcehennemi/src/main/AndroidManifest.xml b/Hdfilmcehennemi/src/main/AndroidManifest.xml new file mode 100644 index 0000000..29aec9d --- /dev/null +++ b/Hdfilmcehennemi/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/Hdfilmcehennemi/src/main/kotlin/com/lagradost/Hdfilmcehennemi.kt b/Hdfilmcehennemi/src/main/kotlin/com/lagradost/Hdfilmcehennemi.kt new file mode 100644 index 0000000..2ff8264 --- /dev/null +++ b/Hdfilmcehennemi/src/main/kotlin/com/lagradost/Hdfilmcehennemi.kt @@ -0,0 +1,205 @@ +package com.lagradost + +import com.fasterxml.jackson.annotation.JsonProperty +import com.lagradost.cloudstream3.* +import com.lagradost.cloudstream3.LoadResponse.Companion.addActors +import com.lagradost.cloudstream3.LoadResponse.Companion.addTrailer +import com.lagradost.cloudstream3.mvvm.safeApiCall +import com.lagradost.cloudstream3.utils.* +import org.jsoup.nodes.Element + +class Hdfilmcehennemi : MainAPI() { + override var mainUrl = "https://www.hdfilmcehennemi.live" + override var name = "hdfilmcehennemi" + override val hasMainPage = true + override var lang = "tr" + override val hasQuickSearch = true + override val hasDownloadSupport = true + override val supportedTypes = setOf( + TvType.Movie, + TvType.TvSeries, + ) + + override val mainPage = mainPageOf( + "$mainUrl/category/tavsiye-filmler-izle1/page/" to "Tavsiye Filmler Kategorisi", + "$mainUrl/yabancidizi/page/" to "Son Eklenen Yabancı Diziler", + "$mainUrl/imdb-7-puan-uzeri-filmler/page/" to "Imdb 7+ Filmler", + "$mainUrl/en-cok-yorumlananlar/page/" to "En Çok Yorumlananlar", + "$mainUrl/en-cok-begenilen-filmleri-izle/page/" to "En Çok Beğenilenler", + ) + + override suspend fun getMainPage( + page: Int, + request: MainPageRequest + ): HomePageResponse { + val document = app.get(request.data + page).document + val home = document.select("div.card-body div.row div.col-6.col-sm-3.poster-container") + .mapNotNull { + it.toSearchResult() + } + return newHomePageResponse(request.name, home) + } + + private fun Element.toSearchResult(): SearchResponse? { + val title = this.selectFirst("a")?.text() ?: return null + val href = fixUrlNull(this.selectFirst("a")?.attr("href")) ?: return null + val posterUrl = fixUrlNull(this.selectFirst("img")?.attr("data-src")) + return newMovieSearchResponse(title, href, TvType.Movie) { + this.posterUrl = posterUrl + } + + } + + private fun Media.toSearchResponse(): SearchResponse? { + return newMovieSearchResponse( + title ?: return null, + "$mainUrl/$slugPrefix$slug", + TvType.TvSeries, + ) { + this.posterUrl = "$mainUrl/uploads/poster/$poster" + } + } + + override suspend fun quickSearch(query: String): List = search(query) + + override suspend fun search(query: String): List { + return app.post( + "$mainUrl/search/", + data = mapOf("query" to query), + referer = "$mainUrl/", + headers = mapOf( + "Accept" to "application/json, text/javascript, */*; q=0.01", + "X-Requested-With" to "XMLHttpRequest" + ) + ).parsedSafe()?.result?.mapNotNull { media -> + media.toSearchResponse() + } ?: throw ErrorLoadingException("Invalid Json reponse") + } + + override suspend fun load(url: String): LoadResponse? { + val document = app.get(url).document + + val title = document.selectFirst("div.card-header > h1, div.card-header > h2")?.text() + ?: return null + val poster = fixUrlNull(document.selectFirst("img.img-fluid")?.attr("src")) + val tags = document.select("div.mb-0.lh-lg div:nth-child(5) a").map { it.text() } + val year = + document.selectFirst("div.mb-0.lh-lg div:nth-child(4) a")?.text()?.trim()?.toIntOrNull() + val tvType = if (document.select("nav#seasonsTabs").isNullOrEmpty() + ) TvType.Movie else TvType.TvSeries + val description = document.selectFirst("article.text-white > p")?.text()?.trim() + val rating = document.selectFirst("div.rating-votes div.rate span")?.text()?.toRatingInt() + val actors = document.select("div.mb-0.lh-lg div:last-child a.chip").map { + Actor(it.text(), it.select("img").attr("src")) + } + val recommendations = + document.select("div.swiper-wrapper div.poster.poster-pop").mapNotNull { + val recName = it.selectFirst("h2.title")?.text() ?: return@mapNotNull null + val recHref = + fixUrlNull(it.selectFirst("a")?.attr("href")) ?: return@mapNotNull null + val recPosterUrl = fixUrlNull(it.selectFirst("img")?.attr("data-src")) + newTvSeriesSearchResponse(recName, recHref, TvType.TvSeries) { + this.posterUrl = recPosterUrl + } + } + + return if (tvType == TvType.TvSeries) { + val trailer = + document.selectFirst("button.btn.btn-fragman.btn-danger")?.attr("data-trailer") + ?.let { + "https://www.youtube.com/embed/$it" + } + val episodes = document.select("div#seasonsTabs-tabContent div.card-list-item").map { + val href = it.select("a").attr("href") + val name = it.select("h3").text().trim() + val episode = it.select("h3").text().let { num -> + Regex("Sezon\\s?([0-9]+).").find(num)?.groupValues?.getOrNull(1)?.toIntOrNull() + } + val season = it.parents()[1].attr("id").substringAfter("-").toIntOrNull() + Episode( + href, + name, + season, + episode, + ) + } + newTvSeriesLoadResponse(title, url, TvType.TvSeries, episodes) { + this.posterUrl = poster + this.year = year + this.plot = description + this.tags = tags + this.rating = rating + addActors(actors) + this.recommendations = recommendations + addTrailer(trailer) + } + } else { + val trailer = + document.selectFirst("nav.nav.card-nav.nav-slider a[data-bs-toggle=\"modal\"]") + ?.attr("data-trailer")?.let { + "https://www.youtube.com/embed/$it" + } + newMovieLoadResponse(title, url, TvType.Movie, url) { + this.posterUrl = poster + this.year = year + this.plot = description + this.tags = tags + this.rating = rating + addActors(actors) + this.recommendations = recommendations + addTrailer(trailer) + } + } + } + + private suspend fun invokeLocalSource( + source: String, + url: String, + sourceCallback: (ExtractorLink) -> Unit + ) { + val m3uLink = + app.get(url, referer = "$mainUrl/").document.select("script") + .find { + it.data().contains("var sources = [];") || it.data() + .contains("playerInstance =") + }?.data() + ?.substringAfter("[{file:\"")?.substringBefore("\"}]") ?: return + + M3u8Helper.generateM3u8( + source, + m3uLink, + if (url.startsWith(mainUrl)) "$mainUrl/" else "https://vidmoly.to/" + ).forEach(sourceCallback) + + } + + override suspend fun loadLinks( + data: String, + isCasting: Boolean, + subtitleCallback: (SubtitleFile) -> Unit, + callback: (ExtractorLink) -> Unit + ): Boolean { + app.get(data).document.select("nav.nav.card-nav.nav-slider a.nav-link").map { + Pair(it.attr("href"), it.text()) + }.apmap { (url, source) -> + safeApiCall { + app.get(url).document.select("div.card-video > iframe").attr("data-src") + .let { link -> + invokeLocalSource(source, link, callback) + } + } + } + return true + } + + data class Result( + @JsonProperty("result") val result: ArrayList? = arrayListOf(), + ) + + data class Media( + @JsonProperty("title") val title: String? = null, + @JsonProperty("poster") val poster: String? = null, + @JsonProperty("slug") val slug: String? = null, + @JsonProperty("slug_prefix") val slugPrefix: String? = null, + ) +} \ No newline at end of file diff --git a/Hdfilmcehennemi/src/main/kotlin/com/lagradost/HdfilmcehennemiPlugin.kt b/Hdfilmcehennemi/src/main/kotlin/com/lagradost/HdfilmcehennemiPlugin.kt new file mode 100644 index 0000000..bdee03b --- /dev/null +++ b/Hdfilmcehennemi/src/main/kotlin/com/lagradost/HdfilmcehennemiPlugin.kt @@ -0,0 +1,14 @@ + +package com.lagradost + +import com.lagradost.cloudstream3.plugins.CloudstreamPlugin +import com.lagradost.cloudstream3.plugins.Plugin +import android.content.Context + +@CloudstreamPlugin +class HdfilmcehennemiPlugin: Plugin() { + override fun load(context: Context) { + // All providers should be added in this manner. Please don't edit the providers list directly. + registerMainAPI(Hdfilmcehennemi()) + } +} \ No newline at end of file diff --git a/KuronimeProvider/build.gradle.kts b/KuronimeProvider/build.gradle.kts index f4ad752..51f4655 100644 --- a/KuronimeProvider/build.gradle.kts +++ b/KuronimeProvider/build.gradle.kts @@ -1,5 +1,5 @@ // use an integer for version numbers -version = 1 +version = 2 cloudstream { @@ -7,7 +7,7 @@ cloudstream { // All of these properties are optional, you can safely remove them // description = "Lorem Ipsum" - // authors = listOf("Cloudburst") + authors = listOf("Hexated") /** * Status int as the following: diff --git a/KuronimeProvider/src/main/kotlin/com/lagradost/KuronimeProvider.kt b/KuronimeProvider/src/main/kotlin/com/lagradost/KuronimeProvider.kt index 5f68ec6..9b22dee 100644 --- a/KuronimeProvider/src/main/kotlin/com/lagradost/KuronimeProvider.kt +++ b/KuronimeProvider/src/main/kotlin/com/lagradost/KuronimeProvider.kt @@ -111,7 +111,7 @@ class KuronimeProvider : MainAPI() { val type = getType( document.selectFirst(".infodetail > ul > li:nth-child(7)")?.ownText()?.trim().toString() ) - val trailer = document.selectFirst("div.tply iframe")?.attr("data-lazy-src") + val trailer = document.selectFirst("div.tply iframe")?.attr("data-src") val year = Regex("\\d, ([0-9]*)").find( document.select(".infodetail > ul > li:nth-child(5)").text() )?.groupValues?.get(1)?.toIntOrNull() diff --git a/LayarKacaProvider/build.gradle.kts b/LayarKacaProvider/build.gradle.kts index aaf7e01..27c96ea 100644 --- a/LayarKacaProvider/build.gradle.kts +++ b/LayarKacaProvider/build.gradle.kts @@ -1,5 +1,5 @@ // use an integer for version numbers -version = 1 +version = 2 cloudstream { @@ -7,7 +7,7 @@ cloudstream { // All of these properties are optional, you can safely remove them // description = "Lorem Ipsum" - // authors = listOf("Cloudburst") + authors = listOf("Hexated") /** * Status int as the following: @@ -23,5 +23,5 @@ cloudstream { "Movie", ) - - } \ No newline at end of file + iconUrl = "https://www.google.com/s2/favicons?domain=lk21.homes&sz=%size%" +} \ No newline at end of file diff --git a/LayarKacaProvider/src/main/kotlin/com/lagradost/LayarKacaProvider.kt b/LayarKacaProvider/src/main/kotlin/com/lagradost/LayarKacaProvider.kt index cd31c85..2d72c22 100644 --- a/LayarKacaProvider/src/main/kotlin/com/lagradost/LayarKacaProvider.kt +++ b/LayarKacaProvider/src/main/kotlin/com/lagradost/LayarKacaProvider.kt @@ -9,7 +9,7 @@ import org.jsoup.Jsoup import org.jsoup.nodes.Element class LayarKacaProvider : MainAPI() { - override var mainUrl = "https://lk21.xn--6frz82g" + override var mainUrl = "https://lk21.homes" override var name = "LayarKaca" override val hasMainPage = true override var lang = "id" diff --git a/NontonAnimeIDProvider/build.gradle.kts b/NontonAnimeIDProvider/build.gradle.kts index 233b380..97b31f7 100644 --- a/NontonAnimeIDProvider/build.gradle.kts +++ b/NontonAnimeIDProvider/build.gradle.kts @@ -1,5 +1,5 @@ // use an integer for version numbers -version = 1 +version = 2 cloudstream { @@ -7,7 +7,7 @@ cloudstream { // All of these properties are optional, you can safely remove them // description = "Lorem Ipsum" - // authors = listOf("Cloudburst") + authors = listOf("Hexated") /** * Status int as the following: diff --git a/NontonAnimeIDProvider/src/main/kotlin/com/lagradost/NontonAnimeIDProvider.kt b/NontonAnimeIDProvider/src/main/kotlin/com/lagradost/NontonAnimeIDProvider.kt index bc75ac2..f73b932 100644 --- a/NontonAnimeIDProvider/src/main/kotlin/com/lagradost/NontonAnimeIDProvider.kt +++ b/NontonAnimeIDProvider/src/main/kotlin/com/lagradost/NontonAnimeIDProvider.kt @@ -157,7 +157,7 @@ class NontonAnimeIDProvider : MainAPI() { val type = getType(document.select("span.typeseries").text().trim()) val rating = document.select("span.nilaiseries").text().trim().toIntOrNull() val description = document.select(".entry-content.seriesdesc > p").text().trim() - val trailer = document.selectFirst("iframe#traileryt")?.attr("data-src") + val trailer = document.selectFirst("a.trailerbutton")?.attr("href") val episodes = if (document.select("button.buttfilter").isNotEmpty()) { val id = document.select("input[name=series_id]").attr("value") From 4a739d07bf86f1e8281dd2da9cff75b44e9605e3 Mon Sep 17 00:00:00 2001 From: Hexated <37908684+hexated@users.noreply.github.com> Date: Sat, 10 Sep 2022 04:02:06 +0700 Subject: [PATCH 19/20] moved some providers (#19) --- settings.gradle.kts | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 72ef97b..bfedf27 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -5,7 +5,34 @@ rootProject.name = "CloudstreamPlugins" // Plugins are included like this val disabled = listOf( - "EgyBestProvider", "FaselHDProvider", "AkwamProvider", "MyCimaProvider" + "EgyBestProvider", + "FaselHDProvider", + "AkwamProvider", + "MyCimaProvider", + "AnimeIndoProvider", + "AnimeSailProvider", + "Anizm", + "DramaidProvider", + "DubokuProvider", + "Gomunimeis", + "GomunimeProvider", + "Hdfilmcehennemi", + "HDrezkaProvider", + "IdlixProvider", + "KuramanimeProvider", + "KuronimeProvider", + "LayarKacaProvider", + "MultiplexProvider", + "NeonimeProvider", + "NontonAnimeIDProvider", + "OploverzProvider", + "OtakudesuProvider", + "PhimmoichillProvider", + "RebahinProvider", + "TocanimeProvider", + "UakinoProvider", + "UseeTv", + "YomoviesProvider" ) File(rootDir, ".").eachDir { dir -> From 5d025ac2f67401a17cf5f948f08967aa18e21d09 Mon Sep 17 00:00:00 2001 From: Fixer Date: Sat, 10 Sep 2022 01:36:33 +0200 Subject: [PATCH 20/20] Update StreamingcommunityProvider.kt --- .../src/main/kotlin/com/lagradost/StreamingcommunityProvider.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/StreamingcommunityProvider/src/main/kotlin/com/lagradost/StreamingcommunityProvider.kt b/StreamingcommunityProvider/src/main/kotlin/com/lagradost/StreamingcommunityProvider.kt index e1c0f6a..8ce80f5 100644 --- a/StreamingcommunityProvider/src/main/kotlin/com/lagradost/StreamingcommunityProvider.kt +++ b/StreamingcommunityProvider/src/main/kotlin/com/lagradost/StreamingcommunityProvider.kt @@ -128,7 +128,7 @@ data class TrailerElement( class StreamingcommunityProvider : MainAPI() { override var lang = "it" - override var mainUrl = "https://streamingcommunity.agency" + override var mainUrl = "https://streamingcommunity.blog" override var name = "Streamingcommunity" override val hasMainPage = true override val hasChromecastSupport = true