diff --git a/src/Jackett.Common/Definitions/torrentz2eu.yml b/src/Jackett.Common/Definitions/torrentz2eu.yml index d73efb7a3..2e091e563 100644 --- a/src/Jackett.Common/Definitions/torrentz2eu.yml +++ b/src/Jackett.Common/Definitions/torrentz2eu.yml @@ -7,7 +7,7 @@ type: public encoding: UTF-8 requestDelay: 2 links: - - https://torrentz2beta.online/ + - https://torrentz2beta.in/ legacylinks: - https://torrentz2.org.in/ - https://torrentzeu.org/ @@ -18,16 +18,50 @@ legacylinks: - https://torrentz2.unblockninja.com/ - hhttps://torrentz2beta.com/ - https://torrentz2beta.com/ - - https://torrentz2beta.in/ - https://eu.torrentz2beta.in/ - https://www.torrentz2beta.com/ - https://torrentz2beta.asia/ - https://www.torrentz2beta.pro/ + - https://torrentz2beta.online/ caps: categorymappings: - - {id: TV, cat: TV, desc: TV} - - {id: Movies, cat: Movies, desc: Movies} + - {id: "Applications(Android)", cat: PC/Mobile-Android, desc: "Applications(Android)"} + - {id: "Applications(IOS (iPad/iPhone))", cat: PC/Mobile-iOS, desc: "Applications(IOS (iPad/iPhone))"} + - {id: "Applications(Mac)", cat: PC/Mac, desc: "Applications(Mac)"} + - {id: "Applications(UNIX)", cat: PC/ISO, desc: "Applications(UNIX)"} + - {id: "Applications(Windows)", cat: PC/0day, desc: "Applications(Windows)"} + - {id: "Audio(Audio books)", cat: Audio/Audiobook, desc: "Audio(Audio books)"} + - {id: "Audio(FLAC)", cat: Audio/Lossless, desc: "Audio(FLAC)"} + - {id: "Audio(Music)", cat: Audio/MP3, desc: "Audio(Music)"} + - {id: "Audio(Other)", cat: Audio/Other, desc: "Audio(Other)"} + - {id: "Games(Android)", cat: PC/Mobile-Android, desc: "Games(Android)"} + - {id: "Games(Handheld)", cat: Console/Other, desc: "Games(Handheld)"} + - {id: "Games(Mac)", cat: PC/Mac, desc: "Games(Mac)"} + - {id: "Games(Other)", cat: Console/Other, desc: "Games(Other)"} + - {id: "Games(PC)", cat: PC/Games, desc: "Games(PC)"} + - {id: "Games(PSx)", cat: Console/PS3, desc: "Games(PSx)"} + - {id: "Games(Wii)", cat: Console/Wii, desc: "Games(Wii)"} + - {id: "Games(XBOX360)", cat: Console/XBox 360, desc: "Games(XBOX360)"} + - {id: "Other(Comics)", cat: Books/Comics, desc: "Other(Comics)"} + - {id: "Other(E-books)", cat: Books/EBook, desc: "Other(E-books)"} + - {id: "Other(Other)", cat: Other/Misc, desc: "Other(Other)"} + - {id: "Other(Pictures)", cat: Other, desc: "Other"} + - {id: "Porn(HD - Movies)", cat: XXX/x264, desc: "Porn(HD - Movies)"} + - {id: "Porn(Movie clips)", cat: XXX/WEB-DL, desc: "Porn(Movie clips)"} + - {id: "Porn(Movies)", cat: XXX, desc: "Porn(Movies)"} + - {id: "Porn(Other)", cat: XXX/Other, desc: "Porn(Other)"} + - {id: "Porn(Pictures)", cat: XXX/ImageSet, desc: "Porn(Pictures)"} + - {id: "Video()", cat: Movies, desc: "Movies"} + - {id: "Video(3D)", cat: Movies/3D, desc: "Movies(3D)"} + - {id: "Video(HD - Movies)", cat: Movies/HD, desc: "Movies(HD)"} + - {id: "Video(HD - TV shows)", cat: TV/HD, desc: "TV(HD)"} + - {id: "Video(Movies DVDR)", cat: Movies/DVD, desc: "Movies(DVDR)"} + - {id: "Video(Movies)", cat: Movies, desc: "Movies"} + - {id: "Video(Music videos)", cat: Audio/Video, desc: "Video(Music videos)"} + - {id: "Video(Other)", cat: Other, desc: "Video(Other)"} + - {id: "Video(TV shows)", cat: TV, desc: "TV"} + modes: search: [q] @@ -36,60 +70,90 @@ caps: music-search: [q] book-search: [q] + settings: [] -download: - selectors: - - selector: a[href^="magnet:?xt="] - attribute: href search: paths: - # https://torrentz2beta.online/beta/search.php?q=2023 - - path: beta/search.php - - path: beta/search.php + # https://torrentz2beta.in/search.php?q=+ + - path: search.php + - path: search.php inputs: page: 2 inputs: - q: "{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}" + q: "{{ if .Keywords }}{{ .Keywords }}{{ else }}+{{ end }}" + keywordsfilters: + - name: re_replace + args: ["(\\w+)", "+$1"] # prepend + to each word + rows: - selector: table.selectable > tbody > tr - + selector: table.table-responsive > tbody > tr fields: title: - selector: td:first-child + selector: td[data-title="Name"] + category_provided: + selector: td[data-title="Category"] category_is_tv_show: text: "{{ .Result.title }}" filters: - name: regexp - args: "\\b([S|s]\\d+(?:[E|e]\\d+)?)\\b" + args: "\\b(S\\d+(?:E\\d+)?)\\b" category: - text: "{{ if .Result.category_is_tv_show }}TV{{ else }}Movies{{ end }}" + # some tv have category as video() which can also be movies, so we look for the SxxExx to tag TV + text: "{{ if .Result.category_is_tv_show }}Video(TV shows){{ else }}{{ .Result.category_provided }}{{ end }}" details: - selector: td:last-child > button - attribute: onclick - filters: - - name: replace - args: ["submitPage('", "page.php?url="] - - name: replace - args: ["')", ""] + text: / download: - text: "{{ .Result.details }}" + selector: a[href^="magnet:?"] + attribute: href seeders: - selector: td:nth-child(2) + text: 1 leechers: - selector: td:nth-child(3) + text: 1 size: - selector: td:nth-child(4) - date: - # Nov. 05th '23 - selector: td:nth-child(5) + selector: td[data-title="Description"] filters: - - name: re_replace - args: ["(\\.|'|st|nd|rd|th])", ""] + - name: regexp + args: Size (.+?), + date_year: + # 01-04 2021 + selector: td[data-title="Description"]:not(:contains(":")) + optional: true + filters: + - name: regexp + args: Uploaded (\d{2}-\d{2}.\d{4}) + - name: replace + args: ["\xA0", " "] - name: dateparse - args: "MMM dd yy" + args: "MM-dd yyyy" + date_time: + # 08-25 20:12 + selector: td[data-title="Description"]:contains(":"):not(:contains("day")) + optional: true + filters: + - name: regexp + args: Uploaded (\d{2}-\d{2}.\d{2}:\d{2}) + - name: replace + args: ["\xA0", " "] + - name: dateparse + args: "MM-dd HH:mm" + date_day: + # Y-day 16:23 + # Today 13:31 + selector: td[data-title="Description"]:contains("day") + optional: true + filters: + - name: regexp + args: Uploaded.(.+?), + - name: replace + args: ["\xA0", " "] + - name: replace + args: ["Y-day", "Yesterday"] + - name: fuzzytime + date: + text: "{{ if or .Result.date_year .Result.date_time .Result.date_day }}{{ or .Result.date_year .Result.date_time .Result.date_day }}{{ else }}now{{ end }}" downloadvolumefactor: text: 0 uploadvolumefactor: