From 838ad77d7f1b8bb99ffc03b6170a5032605692ac Mon Sep 17 00:00:00 2001 From: Garfield69 Date: Tue, 25 Sep 2018 18:27:13 +1200 Subject: [PATCH] magico: possible solve for #3846 --- src/Jackett.Common/Definitions/magico.yml | 154 ++++++++++++---------- 1 file changed, 85 insertions(+), 69 deletions(-) diff --git a/src/Jackett.Common/Definitions/magico.yml b/src/Jackett.Common/Definitions/magico.yml index d9170218e..e3b7d18e1 100644 --- a/src/Jackett.Common/Definitions/magico.yml +++ b/src/Jackett.Common/Definitions/magico.yml @@ -11,89 +11,91 @@ caps: categorymappings: - {id: 1, cat: Movies, desc: "Movies"} - - {id: 84, cat: Movies, desc: "N ees (2016, 2017)"} - - {id: 14, cat: Movies/SD, desc: "DVDRip-BDRip-BRRip (e?? 2015) FREE"} - - {id: 16, cat: Movies/SD, desc: "In Avouri (CAM) FREE"} - - {id: 17, cat: Movies/BluRay, desc: "B LU-RAY"} - - {id: 44, cat: Movies, desc: "E English Movies"} - - {id: 76, cat: Movies, desc: "N tokimanter"} - - {id: 82, cat: Movies, desc: "I EATP"} + - {id: 84, cat: Movies, desc: "Movies New (2017, 2018)"} + - {id: 14, cat: Movies/SD, desc: "Movies DVDRip-BDRip-BRRip (up to 2016) FREE"} + - {id: 16, cat: Movies/SD, desc: "Movies (CAM) FREE"} + - {id: 17, cat: Movies/BluRay, desc: "Movies BLU-RAY"} + - {id: 44, cat: Movies, desc: "Movies Greek"} + - {id: 76, cat: Movies, desc: "Movies Documentaries"} + - {id: 82, cat: Movies, desc: "Movies Theater"} - - {id: 52, cat: TV, desc: "series"} - - {id: 53, cat: TV/SD, desc: ", O Enes"} - - {id: 70, cat: TV/HD, desc: "O Enes (720p)"} - - {id: 54, cat: TV, desc: "E English"} - - {id: 86, cat: TV, desc: "O Enes Complete Seasons"} - - {id: 92, cat: TV, desc: "O Enes Complete Seasons (720p)"} - - {id: 87, cat: TV, desc: "E English Complete Seasons"} - - {id: 63, cat: TV, desc: "Y ychagogikes Emissions"} + - {id: 52, cat: TV, desc: "TV Series"} + - {id: 53, cat: TV/SD, desc: "TV Series Foreign"} + - {id: 70, cat: TV/HD, desc: "TV Series Foreign (720p)"} + - {id: 54, cat: TV, desc: "TV Series Greek"} + - {id: 86, cat: TV, desc: "TV Series Foreign Complete Seasons"} + - {id: 92, cat: TV, desc: "TV Series Foreign Complete Seasons (720p)"} + - {id: 87, cat: TV, desc: "TV Series Greek Complete Seasons"} + - {id: 63, cat: TV, desc: "TV Series Recreational"} - {id: 83, cat: TV/Sport, desc: "TV Sports"} - {id: 55, cat: Movies, desc: "Children"} - - {id: 38, cat: Movies, desc: "M etaglotismena (Movies)"} - - {id: 39, cat: Movies, desc: "M e Subtitled (Movies)"} - - {id: 93, cat: Movies, desc: "M etaglotismena (Series)"} - - {id: 94, cat: Movies, desc: "M e Subtitled (Series)"} - - {id: 45, cat: Movies, desc: "I absent Anime"} - - {id: 98, cat: Movies, desc: "M etaglotismena 3D"} - - {id: 64, cat: Movies, desc: "M music for Children"} + - {id: 38, cat: Movies, desc: "Children (Movies)"} + - {id: 39, cat: Movies, desc: "Children Subtitled (Movies)"} + - {id: 93, cat: Movies, desc: "Children (TV Series)"} + - {id: 94, cat: Movies, desc: "Children Subtitled (TV Series)"} + - {id: 45, cat: Movies, desc: "Children Anime"} + - {id: 98, cat: Movies, desc: "Children 3D"} + - {id: 64, cat: Movies, desc: "Children Music"} - - {id: 7, cat: Audio, desc: "Foreign music"} - - {id: 21, cat: Audio, desc: "N ees Releases"} - - {id: 46, cat: Audio, desc: "P. Alai Releases"} - - {id: 32, cat: Audio, desc: "D. iskografies"} - - {id: 20, cat: Audio, desc: "In ylloges"} - - {id: 102, cat: Audio, desc: "M AGICO Radio"} - - {id: 81, cat: Audio, desc: "K araoke"} - - {id: 95, cat: Audio, desc: "Soundtrack"} + - {id: 7, cat: Audio, desc: "Music Foreign"} + - {id: 21, cat: Audio, desc: "Music Foreign New Releases"} + - {id: 46, cat: Audio, desc: "Music Foreign Old Releases"} + - {id: 32, cat: Audio, desc: "Music Foreign Discographies"} + - {id: 20, cat: Audio, desc: "Music Foreign Collections"} + - {id: 102, cat: Audio, desc: "Music Foreign MAGICO Radio"} + - {id: 81, cat: Audio, desc: "Music Foreign Karaoke"} + - {id: 95, cat: Audio, desc: "Music Foreign Soundtrack"} - - {id: 47, cat: Audio, desc: "Greek music"} - - {id: 48, cat: Audio, desc: "N ees Releases"} - - {id: 49, cat: Audio, desc: "P. Alai Releases"} - - {id: 51, cat: Audio, desc: "D. iskografies"} - - {id: 50, cat: Audio, desc: "In ylloges"} - - {id: 101, cat: Audio, desc: "M AGICO Radio"} - - {id: 97, cat: Audio, desc: "Live Cd 's"} - - {id: 57, cat: Audio, desc: "P empetika"} - - {id: 58, cat: Audio, desc: "D. imotika"} - - {id: 59, cat: Audio, desc: "K exception of preservatives"} - - {id: 60, cat: Audio, desc: "N isiotika"} - - {id: 62, cat: Audio, desc: "P. ontiaka"} - - {id: 80, cat: Audio, desc: "K araoke"} - - {id: 96, cat: Audio, desc: "Soundtracks"} + - {id: 47, cat: Audio, desc: "Music Greek"} + - {id: 48, cat: Audio, desc: "Music Greek New Releases"} + - {id: 49, cat: Audio, desc: "Music Greek Old Releases"} + - {id: 51, cat: Audio, desc: "Music Greek Discographies"} + - {id: 50, cat: Audio, desc: "Music Greek Collections"} + - {id: 101, cat: Audio, desc: "Music Greek MAGICO Radio"} + - {id: 97, cat: Audio, desc: "Music Greek Live Cd's"} + - {id: 57, cat: Audio, desc: "Music Greek Rebetika"} + - {id: 58, cat: Audio, desc: "Music Greek Primary"} + - {id: 59, cat: Audio, desc: "Music Greek Cretan"} + - {id: 60, cat: Audio, desc: "Music Greek Island"} + - {id: 62, cat: Audio, desc: "Music Greek Pontian"} + - {id: 80, cat: Audio, desc: "Music Greek Karaoke"} + - {id: 96, cat: Audio, desc: "Music Greek Soundtracks"} - - {id: 73, cat: Audio, desc: "seasonal Music"} - - {id: 74, cat: Audio, desc: "X ristougenna"} - - {id: 79, cat: Audio, desc: "P. ascha"} - - {id: 75, cat: Audio, desc: "A pokriatika"} - - {id: 78, cat: Audio, desc: "A Tariff Valentine"} + - {id: 73, cat: Audio, desc: "Music Seasonal"} + - {id: 74, cat: Audio, desc: "Music Seasonal Xmas"} + - {id: 79, cat: Audio, desc: "Music Seasonal Easter"} + - {id: 75, cat: Audio, desc: "Music Seasonal Halloween"} + - {id: 78, cat: Audio, desc: "Music Seasonal Valentines"} - {id: 33, cat: Books, desc: "Books"} - - {id: 41, cat: Books, desc: "E nglis"} - - {id: 65, cat: Books, desc: "K omix"} - - {id: 43, cat: Books, desc: "P. periods"} - - {id: 72, cat: Books, desc: "P. aidika"} - - {id: 66, cat: Books, desc: "L. exika - Educational"} - - {id: 42, cat: Books, desc: "O enoglossa"} - - {id: 67, cat: Books, desc: "E. Konya-Photos"} + - {id: 41, cat: Books, desc: "Books Greek"} + - {id: 65, cat: Books, desc: "Books Comics"} + - {id: 43, cat: Books, desc: "Books Periodicals"} + - {id: 105, cat: Books, desc: "Books Audio"} + - {id: 72, cat: Books, desc: "Books Children"} + - {id: 66, cat: Books, desc: "Books Educational"} + - {id: 42, cat: Books, desc: "Books Foreign"} + - {id: 67, cat: Books, desc: "Books Photos"} - - {id: 6, cat: PC, desc: "programs"} - - {id: 18, cat: PC/0day, desc: "PC"} - - {id: 40, cat: PC/Phone-Android, desc: "Android"} - - {id: 19, cat: PC/Mac, desc: "Mac"} + - {id: 6, cat: PC, desc: "Programs"} + - {id: 18, cat: PC/0day, desc: "Programs PC"} + - {id: 40, cat: PC/Phone-Android, desc: "Programs Android"} + - {id: 19, cat: PC/Mac, desc: "Programs Mac"} - {id: 2, cat: PC/Games, desc: "Games"} - - {id: 27, cat: PC/Games, desc: "PC"} - - {id: 68, cat: PC/Phone-Android, desc: "Android"} + - {id: 27, cat: PC/Games, desc: "Games PC"} + - {id: 68, cat: PC/Phone-Android, desc: "Games Android"} - - {id: 88, cat: Other, desc: "Design / Tutorials / Accessories"} - - {id: 89, cat: Other, desc: "Photoshop Tutorials"} - - {id: 91, cat: Other, desc: "Illustrator Tutorials"} - - {id: 90, cat: Other, desc: "After Effects Tutorials"} + - {id: 88, cat: Other, desc: "Tutorials / Design / Accessories"} + - {id: 89, cat: Other, desc: "Tutorials Photoshop"} + - {id: 91, cat: Other, desc: "Tutorials Illustrator"} + - {id: 90, cat: Other, desc: "Tutorials After Effects"} modes: search: [q] tv-search: [q, season, ep] + movie-search: [q] login: path: /?p=home&pid=1 @@ -135,7 +137,7 @@ error: - selector: div#show_error font rows: - selector: div#content > div.torrent-box[id^="torrent_"] + selector: div#content > div.torrent-box[id^="torrent_"], tr:has(a[href*="?p=torrents&pid=10&action=details"]) filters: - name: andmatch fields: @@ -157,6 +159,7 @@ selector: a[href*="?p=torrents&pid=10&action=download"] attribute: href imdb: + optional: true selector: a[href^="http://www.imdb.com/title/tt"] attribute: href size: @@ -172,6 +175,7 @@ selector: a[rel="fancybox"] attribute: href description: + optional: true selector: div.torrentDetails > div:has(span.floatright) downloadvolumefactor: case: @@ -217,5 +221,17 @@ args: ["Κυριακή", "Sunday"] - name: dateparse args: "02-01-2006 15:04" - - + date: + #
Uploaded Saturday at 21:09 by + optional: true + selector: td.torrent_name + remove: div, a, span + filters: + - name: replace + args: ["Uploaded ", ""] + - name: replace + args: [" by", ""] + - name: replace + args: ["at ", ""] + - name: dateparse + args: "02-01-2006 15:04"