diff --git a/src/Jackett.Common/Definitions/world-of-tomorrow.yml b/src/Jackett.Common/Definitions/world-of-tomorrow.yml index 9f64c716e..e9cbd0105 100644 --- a/src/Jackett.Common/Definitions/world-of-tomorrow.yml +++ b/src/Jackett.Common/Definitions/world-of-tomorrow.yml @@ -13,56 +13,51 @@ legacylinks: caps: categorymappings: - - {id: 1068, cat: PC, desc: "Programme"} - - {id: 1107, cat: PC/Mac, desc: "Programme MAC"} - - {id: 1018, cat: PC, desc: "Programme Sonstige"} - - {id: 1028, cat: PC/0day, desc: "Programme Windows"} - - {id: 1069, cat: Audio, desc: "Musik"} - - {id: 1036, cat: Audio/Audiobook, desc: "Hörbücher"} - - {id: 1072, cat: Audio, desc: "Musik Packs"} - - {id: 1093, cat: Audio/Video, desc: "Musik Videos"} - - {id: 1070, cat: Audio/Lossless, desc: "Musik Flac"} - - {id: 1014, cat: Audio/MP3, desc: "Musik MP3"} - - {id: 1071, cat: Audio, desc: "Soundtracks"} - - {id: 1110, cat: Audio, desc: "Musik WOTT"} - - {id: 1066, cat: Movies, desc: "Filme"} - - {id: 1049, cat: Movies/HD, desc: "Filme 1080p"} - - {id: 1090, cat: Movies/3D, desc: "Filme 3D"} - - {id: 1048, cat: Movies/HD, desc: "Filme 720p"} - - {id: 1087, cat: TV/Anime, desc: "Filme Anime"} - - {id: 1047, cat: Movies/BluRay, desc: "Filme Bluray"} - - {id: 1011, cat: Movies/DVD, desc: "Filme DVD / HD2DVD"} - - {id: 1060, cat: Movies/HD, desc: "Filme HDTV"} - - {id: 1091, cat: Movies, desc: "Filme-Packs"} - - {id: 1062, cat: Movies/SD, desc: "Filme-SD"} - - {id: 1089, cat: Movies/UHD, desc: "Filme UHD"} - - {id: 1108, cat: TV, desc: "Filme WOTT"} - - {id: 1108, cat: Movies, desc: "Filme WOTT"} - - {id: 1076, cat: TV, desc: "Serien"} - - {id: 1079, cat: TV/HD, desc: "Serien 1080P"} - - {id: 1095, cat: TV/UHD, desc: "Serien 2160P"} - - {id: 1078, cat: TV/HD, desc: "Serien 720P"} - - {id: 1105, cat: TV/Anime, desc: "Serien Anime"} - - {id: 1100, cat: TV/HD, desc: "Serien Packs HD"} - - {id: 1016, cat: TV/SD, desc: "Serien Packs SD"} - - {id: 1077, cat: TV/SD, desc: "Serien SD"} - - {id: 1109, cat: TV, desc: "Serien WOTT"} - - {id: 1064, cat: TV/Documentary, desc: "Dokumentation"} - - {id: 1019, cat: Books/EBook, desc: "Ebooks"} - - {id: 1111, cat: Books/EBook, desc: "Ebooks English Section"} - - {id: 1101, cat: TV, desc: "Kids"} - - {id: 1096, cat: Other, desc: "Sonstiges"} - - {id: 1092, cat: Console, desc: "Wimmelbild"} - - {id: 1088, cat: XXX, desc: "XXX"} - - {id: 1106, cat: XXX/ImageSet, desc: "XXX Bilder"} - - {id: 1102, cat: XXX/Other, desc: "XXX HENTAI"} - - {id: 1083, cat: TV/Sport, desc: "Spiele"} - - {id: 1005, cat: Console, desc: "Spiele Konsolen"} - - {id: 1004, cat: PC/Games, desc: "Spiele Windows"} - - {id: 1075, cat: TV/Sport, desc: "Formel 1"} - - {id: 1074, cat: TV/Sport, desc: "Fussball"} - - {id: 1073, cat: TV/Sport, desc: "Sport"} - - {id: 1023, cat: TV/Sport, desc: "Wrestling"} + - {id: 1107, cat: PC/Mac, desc: "Apps: MAC"} + - {id: 1018, cat: PC, desc: "Apps: Sonstige"} + - {id: 1028, cat: PC/0day, desc: "Apps: Windows"} + - {id: 1036, cat: Audio/Audiobook, desc: "Audio: Hörbücher"} + - {id: 1072, cat: Audio, desc: "Audio: Musik-Packs"} + - {id: 1093, cat: Audio/Video, desc: "Audio: Musik-Videos"} + - {id: 1070, cat: Audio/Lossless, desc: "Audio: Musik/Flac"} + - {id: 1014, cat: Audio/MP3, desc: "Audio: Musik/MP3"} + - {id: 1071, cat: Audio, desc: "Audio: Soundtracks"} + - {id: 1110, cat: Audio, desc: "Audio: Musik WOTT"} + - {id: 1049, cat: Movies/HD, desc: "Filme: 1080p"} + - {id: 1090, cat: Movies/3D, desc: "Filme: 3D"} + - {id: 1048, cat: Movies/HD, desc: "Filme: 720p"} + - {id: 1087, cat: TV/Anime, desc: "Filme: Anime"} + - {id: 1047, cat: Movies/BluRay, desc: "Filme: Bluray"} + - {id: 1011, cat: Movies/DVD, desc: "Filme: DVD / HD2DVD"} + - {id: 1060, cat: Movies/HD, desc: "Filme: HDTV"} + - {id: 1091, cat: Movies, desc: "Filme: Packs"} + - {id: 1062, cat: Movies/SD, desc: "Filme: SD"} + - {id: 1089, cat: Movies/UHD, desc: "Filme: UHD"} + - {id: 1108, cat: TV, desc: "Filme: WOTT"} + - {id: 1108, cat: Movies, desc: "Filme: WOTT"} + - {id: 1079, cat: TV/HD, desc: "Serien: 1080P"} + - {id: 1095, cat: TV/UHD, desc: "Serien: 2160P"} + - {id: 1078, cat: TV/HD, desc: "Serien: 720P"} + - {id: 1105, cat: TV/Anime, desc: "Serien; Anime"} + - {id: 1100, cat: TV/HD, desc: "Serien: Packs HD"} + - {id: 1016, cat: TV/SD, desc: "Serien: Packs-SD"} + - {id: 1077, cat: TV/SD, desc: "Serien: SD"} + - {id: 1109, cat: TV, desc: "Serien: WOTT"} + - {id: 1064, cat: TV/Documentary, desc: "Sonstiges: Dokumentation"} + - {id: 1019, cat: Books/EBook, desc: "Sonstiges: Ebooks"} + - {id: 1111, cat: Books/EBook, desc: "Sonstiges: English Section"} + - {id: 1101, cat: TV, desc: "Sonstiges: Kids"} + - {id: 1096, cat: Other, desc: "Sonstiges: Sonstiges"} + - {id: 1092, cat: Console, desc: "Sonstiges: Wimmelbild"} + - {id: 1088, cat: XXX, desc: "Sonstiges: XXX"} + - {id: 1106, cat: XXX/ImageSet, desc: "Sonstiges: XXX Bilder"} + - {id: 1102, cat: XXX/Other, desc: "Sonstiges: XXX HENTAI"} + - {id: 1005, cat: Console, desc: "Spiele: Konsolen"} + - {id: 1004, cat: PC/Games, desc: "Spiele: Windows"} + - {id: 1075, cat: TV/Sport, desc: "Sport: Formel 1"} + - {id: 1074, cat: TV/Sport, desc: "Sport: Fussball"} + - {id: 1073, cat: TV/Sport, desc: "Sport: Sport"} + - {id: 1023, cat: TV/Sport, desc: "Sport: Wrestling"} modes: search: [q] @@ -93,26 +88,22 @@ settings: type: info label: About Freeleech and OnlyUpload at World-of-Tomorrow default: "" - - name: sort + - name: sortby type: select label: Sort requested from site default: added options: added: created - seeds: seeders + seeders: seeders size: size name: title - - name: type + - name: typeby type: select label: Order requested from site - default: desc + default: DESC options: - desc: desc - asc: asc - - name: info_tpp - type: info - label: Results Per Page - default: For best results, change the Torrents pro Seite: setting to 100 on your Control Panel. The default is 15. + DESC: desc + ASC: asc - name: info_activity type: info label: Account Inactivity @@ -133,68 +124,82 @@ login: search: paths: - # https://w-o-t.pro/browse.php?showsearch=1&search=&incldead=0&orderby=added&sort=desc&onlyupload=yes&freeleech=yes - - path: browse.php + # POST https://w-o-t.pro/search_query.php + # name=&categories[]=1107&maxAge=added&sortBy=added&sortByType=DESC&myTorrents=no&highlight=no&onlyupload=no&freeleech=no&offset=0&limit=10 + - path: search_query.php + method: post + inputs: - $raw: "{{ range .Categories }}c{{.}}=1&{{end}}" - showsearch: 1 - search: "{{ .Keywords }}" - # 0 active, 1 all, 2 dead - incldead: 1 - orderby: "{{ .Config.sort }}" - sort: "{{ .Config.type }}" - onlyupload: "{{ if .Config.onlyupload }}yes{{ else }}{{ end }}" - freeleech: "{{ if .Config.freeleech }}yes{{ else }}{{ end }}" + name: "{{ .Keywords }}" + $raw: "{{ range .Categories }}&categories[]={{.}}{{end}}" + maxAge: added + sortBy: "{{ .Config.sortby }}" + sortByType: "{{ .Config.typeby }}" + myTorrents: no + highlight: no + onlyupload: "{{ if .Config.onlyupload }}yes{{ else }}no{{ end }}" + freeleech: "{{ if .Config.freeleech }}yes{{ else }}no{{ end }}" + limit: 100 rows: - selector: "table.tableinborder[border=\"0\"][cellspacing=\"1\"][cellpadding=\"4\"][style=\"width:100%\"] > tbody > tr:has(a[href^=\"download.php\"]):has(a[href^=\"browse.php?cat=\"])" + selector: div.container fields: - category: - selector: a[href^="browse.php?cat="] - attribute: href + categorydesc: + selector: div.category + attribute: data-content filters: - - name: querystring - args: cat + - name: re_replace + args: [" \\[.+?\\]", ""] title: - selector: a[href^="torrent.php?id="] > b + selector: div.title a details: - selector: a[href^="torrent.php?id="] + selector: div.title a attribute: href download: selector: a[href^="download.php?torrent="] attribute: href poster: - selector: a[href^="torrent.php?id="] - attribute: onmouseover - filters: - - name: regexp - args: "src=(.+?) " - description: - selector: td:nth-child(2) > img - attribute: title - grabs: - selector: td:nth-last-child(8) - date: - selector: td:nth-last-child(6) - filters: - - name: append - args: " +01:00" # CET - - name: dateparse - args: "dd.MM.yyyyHH:mm:ss zzz" + selector: img + attribute: src + imdbid: + selector: a[href="*imdb.com/title/tt" ] + attribute: href size: - selector: td:nth-last-child(5) + selector: span:has(i.fa-hdd) + grabs: + selector: span:has(i.fa-download) seeders: - selector: td:nth-last-child(4) + selector: span:has(i.fa-circle-chevron-up) leechers: - selector: td:nth-last-child(3) + selector: span:has(i.fa-circle-chevron-down) + date: + selector: span:has(i.fa-clock) + filters: + - name: re_replace + args: ["(?i)(vor)", " ago"] + - name: re_replace + args: ["(?i)(sekunden|sekunde)", "seconds"] + - name: re_replace + args: ["(?i)(minuten|minute)", "minutes"] + - name: re_replace + args: ["(?i)(stunden|stunde)", "hours"] + - name: re_replace + args: ["(?i)(tagen|tag)", "days"] + - name: re_replace + args: ["(?i)(wochen|woche)", "weeks"] + - name: re_replace + args: ["(?i)(monaten|monat)", "months"] + - name: re_replace + args: ["(?i)(jahren|jahr)", " years"] + - name: timeago downloadvolumefactor: case: - img[src="pic/oupic.gif"]: 0 # only upload is counted + div.status-button-onlyupload: 0 # only upload is counted "*": 1 uploadvolumefactor: case: - img[src="pic/freeleech.gif"]: 0 # nothing is counted + div.status-button-freeleech: 0 # nothing is counted "*": 1 minimumratio: text: 0.7