From 1085c753d75b15c1ca208bf634e853763122f706 Mon Sep 17 00:00:00 2001 From: Garfield69 Date: Tue, 12 Mar 2019 14:47:32 +1300 Subject: [PATCH] torrentsectorcrew: rewrite selectors and category processing. resolves #4856 --- .../Definitions/torrentsectorcrew.yml | 197 +++++++++++------- 1 file changed, 116 insertions(+), 81 deletions(-) diff --git a/src/Jackett.Common/Definitions/torrentsectorcrew.yml b/src/Jackett.Common/Definitions/torrentsectorcrew.yml index fd36a42c9..86ba8419b 100644 --- a/src/Jackett.Common/Definitions/torrentsectorcrew.yml +++ b/src/Jackett.Common/Definitions/torrentsectorcrew.yml @@ -4,7 +4,7 @@ description: "Torrent Sector Crew (TSC) is a GERMAN Private Torrent Tracker for MOVIES / TV / GENERAL" language: de-de type: private - encoding: windows-1252 + encoding: ISO-8859-1 links: - https://tsctracker.org/ legacylinks: @@ -13,70 +13,64 @@ caps: categorymappings: # Apps - - {id: 65, cat: PC/Phone-Android, desc: "Android"} - - {id: 83, cat: PC/Phone-IOS, desc: "iOS"} - - {id: 107, cat: PC/0day, desc: "Linux"} - - {id: 48, cat: PC/Mac, desc: "MAC"} - - {id: 109, cat: PC, desc: "Sonstige"} - - {id: 22, cat: PC/0day, desc: "Win"} - + - {id: 65, cat: PC/Phone-Android, desc: "Apps Android"} + - {id: 83, cat: PC/Phone-IOS, desc: "Apps iOS"} + - {id: 107, cat: PC/0day, desc: "Apps Linux"} + - {id: 48, cat: PC/Mac, desc: "Apps MAC"} + - {id: 109, cat: PC, desc: "Apps Sonstige"} + - {id: 22, cat: PC/0day, desc: "Apps Win"} # Audio - - {id: 24, cat: Audio/Audiobook, desc: "aBooks"} - - {id: 104, cat: Audio, desc: "Disco's"} - - {id: 38, cat: Audio/Audiobook, desc: "Hörspiel"} - - {id: 6, cat: Audio, desc: "Musik"} - - {id: 82, cat: Audio, desc: "Tracks"} - - {id: 29, cat: Audio/Video, desc: "Videos"} - + - {id: 24, cat: Audio/Audiobook, desc: "Audio aBooks"} + - {id: 104, cat: Audio, desc: "Audio Disco's"} + - {id: 38, cat: Audio/Audiobook, desc: "Audio Hörspiel"} + - {id: 6, cat: Audio, desc: "Audio Musik"} + - {id: 82, cat: Audio, desc: "Audio Tracks"} + - {id: 29, cat: Audio/Video, desc: "Audio Videos"} # Doku - - {id: 113, cat: TV/Documentary, desc: "3D"} - - {id: 76, cat: TV/Documentary, desc: "HD"} - - {id: 78, cat: TV/Documentary, desc: "Packs"} - - {id: 75, cat: TV/Documentary, desc: "SD"} - - {id: 114, cat: TV/Documentary, desc: "Sonstige"} - - {id: 77, cat: TV/Documentary, desc: "Untouched"} - + - {id: 113, cat: TV/Documentary, desc: "Doku 3D"} + - {id: 76, cat: TV/Documentary, desc: "Doku HD"} + - {id: 78, cat: TV/Documentary, desc: "Doku Packs"} + - {id: 75, cat: TV/Documentary, desc: "Doku SD"} + - {id: 114, cat: TV/Documentary, desc: "Doku Sonstige"} + - {id: 77, cat: TV/Documentary, desc: "Doku Untouched"} # Filme - - {id: 54, cat: Movies/HD, desc: "1080p"} - - {id: 5, cat: Movies/3D, desc: "3D"} - - {id: 55, cat: Movies/HD, desc: "720p"} - - {id: 111, cat: Movies, desc: "Anime"} + - {id: 54, cat: Movies/HD, desc: "Filme 1080p"} + - {id: 5, cat: Movies/3D, desc: "Filme 3D"} + - {id: 55, cat: Movies/HD, desc: "Filme 720p"} + - {id: 111, cat: Movies, desc: "Filme Anime"} - {id: 43, cat: Movies/BluRay, desc: "BluRay"} - - {id: 20, cat: Movies/DVD, desc: "DVDR"} - - {id: 120, cat: Movies/Foreign, desc: "Int."} - - {id: 119, cat: Movies, desc: "Remux"} - - {id: 121, cat: Movies/HD, desc: "UHD"} - - {id: 36, cat: Movies/HD, desc: "x264"} - - {id: 19, cat: Movies/SD, desc: "XviD"} - + - {id: 20, cat: Movies/DVD, desc: "Filme DVDR"} + - {id: 120, cat: Movies/Foreign, desc: "Filme Int."} + - {id: 119, cat: Movies, desc: "Filme Remux"} + - {id: 121, cat: Movies/HD, desc: "Filme UHD"} + - {id: 124, cat: Movies/HD, desc: "Filme UHD Remux"} + - {id: 36, cat: Movies/HD, desc: "Filme SD"} # Serien - - {id: 112, cat: TV/Anime, desc: "Anime"} - - {id: 69, cat: TV/HD, desc: "HD"} - - {id: 72, cat: TV/Foreign, desc: "Int."} - - {id: 68, cat: TV, desc: "Packs"} - - {id: 66, cat: TV/SD, desc: "SD"} - - {id: 108, cat: TV, desc: "TV-Shows"} - + - {id: 112, cat: TV/Anime, desc: "Serien Anime"} + - {id: 69, cat: TV/HD, desc: "Serien HD"} + - {id: 72, cat: TV/Foreign, desc: "Serien Int."} + - {id: 68, cat: TV, desc: "Serien Packs"} + - {id: 66, cat: TV/SD, desc: "Serien SD"} + - {id: 108, cat: TV, desc: "Serien TV-Shows"} # Sonstige - - {id: 117, cat: Other, desc: "Diverses"} - - {id: 28, cat: Books, desc: "eBooks"} - - {id: 42, cat: TV/Sport, desc: "Sport"} - - {id: 103, cat: Other, desc: "Tutorials"} - - {id: 9, cat: Other, desc: "Wallpaper"} - - {id: 64, cat: XXX, desc: "XXX"} - + - {id: 117, cat: Other, desc: "Sonstige Diverses"} + - {id: 28, cat: Books, desc: "Sonstige eBooks"} + - {id: 42, cat: TV/Sport, desc: "Sonstige Sport"} + - {id: 103, cat: Other, desc: "Sonstige Tutorials"} + - {id: 9, cat: Other, desc: "Sonstige Wallpaper"} + - {id: 64, cat: XXX, desc: "Sonstige XXX"} # Spiele - - {id: 115, cat: PC/Mac, desc: "MAC"} - - {id: 37, cat: Console/NDS, desc: "Nintendo"} - - {id: 4, cat: PC/Games, desc: "PC"} - - {id: 58, cat: Console/PS4, desc: "PSX"} - - {id: 116, cat: Other, desc: "Sonstige"} - - {id: 50, cat: Console/Xbox, desc: "XBOX"} - + - {id: 115, cat: PC/Mac, desc: "Spiele MAC"} + - {id: 37, cat: Console/NDS, desc: "Spiele Nintendo"} + - {id: 4, cat: PC/Games, desc: "Spiele PC"} + - {id: 58, cat: Console/PS4, desc: "Spiele PSX"} + - {id: 116, cat: Other, desc: "Spiele Sonstige"} + - {id: 50, cat: Console/Xbox, desc: "Spiele XBOX"} modes: search: [q] tv-search: [q, season, ep] + movie-search: [q] settings: - name: pin @@ -118,62 +112,103 @@ - path: browse.php inputs: $raw: "{{range .Categories}}c{{.}}=1&{{end}}" - search: "{{ .Query.Keywords }}" + search: "{{ .Keywords }}" incldead: "1" orderby: "added" - sort: desc + sort: "desc" rows: - selector: "h2 +p + br + table.tablebrowse > tbody > tr[style=\"height: 45px;\"], tr:contains(\"Weiter\") > td > table.tablebrowse > tbody > tr[style=\"height: 45px;\"]" + selector: table.tableinborder:has(a[href^="download_ssl.php"]) fields: title: selector: a[title][href^="details.php"] attribute: title category: - selector: a[href*="cat="] - attribute: href - filters: - - name: querystring - args: cat + selector: td[style][colspan] + case: + td[style$="#000033;"]:contains("Android"): 65 + td[style$="#000033;"]:contains("iOS"): 83 + td[style$="#000033;"]:contains("Linux"): 107 + td[style$="#000033;"]:contains("MAC"): 48 + td[style$="#000033;"]:contains("Sonstige"): 109 + td[style$="#000033;"]:contains("Win"): 22 + td[style$="#1d2f8c;"]:contains("aBooks"): 24 + td[style$="#1d2f8c;"]:contains("Disco's"): 104 + td[style$="#1d2f8c;"]:contains("Hörspiel"): 38 + td[style$="#1d2f8c;"]:contains("Musik"): 6 + td[style$="#1d2f8c;"]:contains("Tracks"): 82 + td[style$="#1d2f8c;"]:contains("Videos"): 29 + td[style$="#000000;"]:contains("3D"): 113 + td[style$="#000000;"]:contains("HD"): 76 + td[style$="#000000;"]:contains("Packs"): 78 + td[style$="#000000;"]:contains("SD"): 75 + td[style$="#000000;"]:contains("Sonstige"): 114 + td[style$="#000000;"]:contains("Untouched"): 77 + td[style$="#55316e;"]:contains("1080p"): 54 + td[style$="#55316e;"]:contains("3D"): 5 + td[style$="#55316e;"]:contains("720p"): 55 + td[style$="#55316e;"]:contains("Anime"): 111 + td[style$="#55316e;"]:contains("BluRay"): 43 + td[style$="#55316e;"]:contains("DVDR"): 20 + td[style$="#55316e;"]:contains("Int"): 120 + td[style$="#55316e;"]:contains("Remux"): 119 + td[style$="#55316e;"]:contains("UHD"): 121 + td[style$="#55316e;"]:contains("UHD Remux"): 124 + td[style$="#55316e;"]:contains("SD"): 36 + td[style$="#620000;"]:contains("Anime"): 112 + td[style$="#620000;"]:contains("HD"): 69 + td[style$="#620000;"]:contains("Int"): 72 + td[style$="#620000;"]:contains("Packs"): 68 + td[style$="#620000;"]:contains("SD"): 66 + td[style$="#620000;"]:contains("TV-Shows"): 108 + td[style$="#003300;"]:contains("Diverses"): 117 + td[style$="#003300;"]:contains("eBooks"): 28 + td[style$="#003300;"]:contains("Sport"): 42 + td[style$="#003300;"]:contains("Tutorials"): 103 + td[style$="#003300;"]:contains("Wallpaper"): 9 + td[style$="#FF00FF;"]:contains("XXX"): 64 + td[style$="#FF3300;"]:contains("MAC"): 115 + td[style$="#FF3300;"]:contains("Nintendo"): 37 + td[style$="#FF3300;"]:contains("PC"): 4 + td[style$="#FF3300;"]:contains("PSX"): 58 + td[style$="#FF3300;"]:contains("Sonstige"): 116 + td[style$="#FF3300;"]:contains("XBOX"): 50 comments: selector: a[href*="&tocomm="] attribute: href download: selector: a[href^="download_ssl.php"] attribute: href - files: - selector: td:nth-child(3) grabs: - selector: td:nth-child(9) + selector: td:has(a[href*="&tosnatchers="]) filters: - - name: replace - args: ["-mal", ""] + - name: regexp + args: "(\\d+) x" size: - selector: td:nth-child(6) + selector: td:has(a[href*="&filelist="]) filters: + - name: regexp + args: "(.*?) in" - name: replace args: [".", ""] - name: replace args: [",", "."] + files: + selector: td:has(a[href*="&filelist="]) > b seeders: - selector: td:nth-child(7) - filters: - - name: regexp - args: "(\\d+)" + selector: td:has(a[href*="&toseeders="]) > font leechers: - selector: td:nth-child(8) - filters: - - name: regexp - args: "(\\d+)" + selector: td:has(a[href*="&todlers="]) > font date: - selector: td:nth-child(5) - remove: br + selector: td:has(a[href*="&tocomm="]) ~ td filters: + - name: re_replace + args: ["\\s", " "] - name: dateparse - args: "02.01.200615:04:05" + args: "02.01.2006 15:04:05" downloadvolumefactor: case: - "font:contains(\"[OnlyUpload]\")": "0" - "font:contains(\"[-40 Download]\")": "0.6" + img[src="pic/oupic.gif"]: "0" + img[src="pic/-40.gif"]: "0.6" "*": "1" uploadvolumefactor: case: