diff --git a/README.md b/README.md
index c0b03d4cb..766a2e1fd 100644
--- a/README.md
+++ b/README.md
@@ -337,7 +337,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
* DivTeam
* DocsPedia
* Dream Tracker
- * EbookParadijs
* Ebooks-Shares
* Empornium (EMP) [![(invite needed)][inviteneeded]](#)
* eShareNet
@@ -351,7 +350,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
* Fantastiko
* Femdomcult
* FileList (FL)
- * Film-Paleis
* FinElite (FE)
* FinVip
* FunFile (FF)
@@ -433,7 +431,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
* magic-heaven
* Magico (Trellas) [![(invite needed)][inviteneeded]](#)
* Majomparádé (TurkDepo)
- * MediaMaatjes
* MegamixTracker
* MeseVilág (Fairytale World)
* Milkie
diff --git a/src/Jackett.Common/Definitions/ebookparadijs.yml b/src/Jackett.Common/Definitions/ebookparadijs.yml
deleted file mode 100644
index 3344f48c6..000000000
--- a/src/Jackett.Common/Definitions/ebookparadijs.yml
+++ /dev/null
@@ -1,190 +0,0 @@
----
-id: ebookparadijs
-name: EbookParadijs
-description: "EbookParadijs is a DUTCH Private Tracker for EBOOKS"
-language: nl-NL
-type: private
-encoding: UTF-8
-links:
- - https://www.ebookparadijs.org/
-
-caps:
- categorymappings:
- - {id: 2, cat: Books/EBook, desc: "Roman"}
- - {id: 3, cat: Books/EBook, desc: "Thriller"}
- - {id: 4, cat: Books/EBook, desc: "Diverse"}
- - {id: 7, cat: Books/EBook, desc: "Jeugd"}
- - {id: 8, cat: Books/EBook, desc: "Oorlog"}
- - {id: 9, cat: Books/EBook, desc: "Luisterboeken"}
- - {id: 10, cat: Books/EBook, desc: "Stripboeken"}
- - {id: 11, cat: Books/EBook, desc: "Crime"}
- - {id: 13, cat: Books/EBook, desc: "Detective"}
- - {id: 15, cat: Books/EBook, desc: "Erothiek"}
- - {id: 16, cat: Books/EBook, desc: "Tijdschriften"}
- - {id: 17, cat: Books/EBook, desc: "Hobby"}
- - {id: 19, cat: Books/EBook, desc: "Medisch"}
- - {id: 21, cat: Books/EBook, desc: "Sport"}
- - {id: 50, cat: Books/EBook, desc: "Kookboeken"}
- - {id: 51, cat: Books/EBook, desc: "Fantasy"}
- - {id: 52, cat: Books/EBook, desc: "Kerst"}
- - {id: 53, cat: Books/EBook, desc: "Waargebeurd"}
- - {id: 56, cat: Books/EBook, desc: "Engels"}
- - {id: 57, cat: Books/EBook, desc: "Maatschappij"}
- - {id: 58, cat: Books/EBook, desc: "Biografie"}
- - {id: 61, cat: Books/EBook, desc: "Geschiedenis"}
- - {id: 60, cat: Books/EBook, desc: "Sci-Fi"}
- - {id: 64, cat: Books/EBook, desc: "Literatuur"}
- - {id: 65, cat: Books/EBook, desc: "Non-Fiction"}
- - {id: 66, cat: Books/EBook, desc: "Bladmuziek"}
- - {id: 67, cat: Books/EBook, desc: "young Adult"}
- - {id: 68, cat: Books/EBook, desc: "feelgood romans"}
-
- modes:
- search: [q]
- book-search: [q]
-
-settings:
- - name: username
- type: text
- label: Username
- - name: password
- type: password
- label: Password
- - name: flaresolverr
- type: info
- label: FlareSolverr
- default: This site may use DDoS-Guard Protection, therefore Jackett requires FlareSolverr to access it.
- - name: freeleech
- type: checkbox
- label: Filter freeleech only
- default: false
- - name: thankyou
- type: text
- label: Thank You Comment
- - name: info_comment
- type: info
- label: Thank you comment
- default: This site requires you to leave a Thank You comment before you can download. Enter your personalised comment above.
-
-login:
- path: login.php
- method: form
- form: form[action="takelogin.php"]
- inputs:
- username: "{{ .Config.username }}"
- password: "{{ .Config.password }}"
- returnto: "/"
- error:
- - selector: td.embedded:contains("fout")
- test:
- path: /
- selector: a[href="logout.php"]
-
-download:
- before:
- # https://www.ebookparadijs.org/comment.php?action=add&tid=23079
- path: comment.php
- method: post
- inputs:
- action: add
- tid: "{{ .DownloadUri.Query.id }}"
- text: "{{ .Config.thankyou }}"
- submit: Opslaan
- selectors:
- - selector: a[href^="download.php?id="]
- attribute: href
-
-search:
- paths:
- - path: browse.php
- inputs:
- $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
- search: "{{ .Keywords }}"
- incldead: 1
-
- rows:
- selector: "table.mainouter{{ if .Config.freeleech }}:has(img[src=\"pic/freedlfsu.gif\"]){{ else }}{{ end }}"
- filters:
- - name: andmatch
-
- fields:
- category:
- selector: a[href^="browse.php?cat="]
- attribute: href
- filters:
- - name: querystring
- args: cat
- poster:
- selector: img[src*="/covers/"]
- attribute: src
- title:
- selector: a[href^="details.php?id="]
- details:
- selector: a[href^="details.php?id="]
- attribute: href
- download:
- selector: a[href^="details.php?id="]
- attribute: href
- size:
- selector: td:nth-child(4) table tr td:nth-child(2)
- filters:
- - name: regexp
- args: "(.+?) in"
- files:
- selector: td:nth-child(4) table tr td:nth-child(2)
- filters:
- - name: regexp
- args: "in (\\d+) bestan"
- grabs:
- selector: td:nth-child(4) table tr:nth-child(2) td:nth-child(1)
- date:
- selector: td:nth-child(4) table tr:nth-child(2) td:last-child
- filters:
- - name: replace
- args: ["januari", "January"]
- - name: replace
- args: ["februari", "February"]
- - name: replace
- args: ["maart", "March"]
- - name: replace
- args: ["april", "April"]
- - name: replace
- args: ["mei", "May"]
- - name: replace
- args: ["juni", "June"]
- - name: replace
- args: ["juli", "July"]
- - name: replace
- args: ["augustus", "August"]
- - name: replace
- args: ["september", "September"]
- - name: replace
- args: ["oktober", "October"]
- - name: replace
- args: ["november", "November"]
- - name: replace
- args: ["december", "December"]
- - name: re_replace
- args: ["\\s*om\\s*", " "]
- - name: append
- args: " +01:00" # CET
- - name: dateparse
- args: "2 January 2006 15:04:05 -07:00"
- seeders_optional:
- optional: true
- selector: td:nth-child(4) table tr:nth-child(3) td:nth-child(5) font b
- seeders:
- text: "{{ if .Result.seeders_optional }}{{ .Result.seeders_optional }}{{ else }}0{{ end }}"
- leechers_optional:
- optional: true
- selector: td:nth-child(4) table tr:nth-child(3) td:nth-child(5) font font b
- leechers:
- text: "{{ if .Result.leechers_optional }}{{ .Result.leechers_optional }}{{ else }}0{{ end }}"
- downloadvolumefactor:
- case:
- img[src="pic/freedlfsu.gif"]: 0
- "*": 1
- uploadvolumefactor:
- text: 1
-# minimumratio: ratioless site, uses credit points instead.
-# engine n/a
diff --git a/src/Jackett.Common/Definitions/film-paleis.yml b/src/Jackett.Common/Definitions/film-paleis.yml
deleted file mode 100644
index a74af416b..000000000
--- a/src/Jackett.Common/Definitions/film-paleis.yml
+++ /dev/null
@@ -1,199 +0,0 @@
----
-id: film-paleis
-name: Film-Paleis
-description: "Film-Paleis is a DUTCH Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: nl-NL
-type: private
-encoding: UTF-8
-links:
- - https://www.film-paleis.me/
-legacylinks:
- - http://www.film-paleis.me/
-
-caps:
- categorymappings:
- - {id: 2, cat: Movies/BluRay, desc: "Bluray/HD"}
- - {id: 3, cat: Movies/DVD, desc: "DVD Kids"}
- - {id: 4, cat: Audio/Video, desc: "DVD Muziek"}
- - {id: 5, cat: Movies/DVD, desc: "DVD Films"}
- - {id: 7, cat: Movies/UHD, desc: "4K films"}
- - {id: 8, cat: XXX, desc: "Erotiek"}
- - {id: 9, cat: PC/Mobile-Other, desc: "GSM/Navigatie"}
- - {id: 10, cat: Audio, desc: "Muziek Album"}
- - {id: 11, cat: Audio/Other, desc: "Muziek Diverse"}
- - {id: 12, cat: Console/NDS, desc: "Nintendo"}
- - {id: 13, cat: Movies, desc: "Classic"}
- - {id: 15, cat: Other, desc: "Overige"}
- - {id: 16, cat: PC/0day, desc: "PC Software"}
- - {id: 17, cat: PC, desc: "PC Spellen"}
- - {id: 19, cat: TV, desc: "TV Series"}
- - {id: 21, cat: Movies/SD, desc: "Divx/Xvid"}
- - {id: 24, cat: Books/EBook, desc: "E-Books"}
- - {id: 26, cat: Audio/Other, desc: "Cabaret"}
- - {id: 27, cat: TV/Documentary, desc: "Documentaire"}
- - {id: 31, cat: Movies/HD, desc: "FP-release"}
- - {id: 32, cat: Audio/Audiobook, desc: "Luister Boeken"}
-
- modes:
- search: [q]
- tv-search: [q, season, ep, imdbid]
- movie-search: [q, imdbid]
- music-search: [q]
- book-search: [q]
-
-settings:
- - name: username
- type: text
- label: Username
- - name: password
- type: password
- label: Password
- - name: flaresolverr
- type: info
- label: FlareSolverr
- default: This site may use DDoS-Guard Protection, therefore Jackett requires FlareSolverr to access it.
- - name: thankyou
- type: text
- label: Thank You Comment
- - name: info
- type: info
- label: Thank you comment
- default: This site requires you to leave a Thank You comment before you can download. Enter your personalised comment above. Minimum of at least 10 characters.
-
-login:
- path: login.php
- method: form
- form: form[action="takelogin.php"]
- inputs:
- username: "{{ .Config.username }}"
- password: "{{ .Config.password }}"
- returnto: "/"
- error:
- - selector: td.embedded:contains("fout")
- test:
- path: /
- selector: a[href="logout.php"]
-
-download:
- before:
- path: comment.php
- method: post
- inputs:
- action: add
- tid: "{{ .DownloadUri.Query.id }}"
- text: "{{ .Config.thankyou }}"
- submit: Opslaan
- selectors:
- - selector: a[href^="download.php?id="]
- attribute: href
-
-search:
- paths:
- - path: browse.php
- inputs:
- $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
- search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
- incldead: 1
- # does not return imdb link in results
- keywordsfilters:
- - name: re_replace # S01E02 to 1 2
- args: ["(?i)\\bS0*(\\d{1,2})\\s*E0*(\\d{1,2})\\b", "$1 $2"]
- - name: re_replace # S01 to 1
- args: ["(?i)\\bS0*(\\d{1,2})\\b", "$1"]
-
- rows:
- selector: table.mainouter
- filters:
- - name: andmatch
-
- fields:
- title:
- selector: a[href^="details.php?id="]
- filters:
- - name: re_replace
- args: ["(?i)(seizoen\\s*)(\\d{1,2})\\s*(tot|t\/m|&|\\+)\\s*(\\d{1,2})", "S$2-$4"]
- - name: re_replace
- args: ["(?i)(seizoen\\s*)(\\d{1,2})", "S$2"]
- - name: re_replace
- args: ["(?i)(afl.\\s*|aflevering\\s*|ep.\\s*)(\\d{1,2})\\s*(tot|t\/m|&|\\+)\\s*(\\d{1,2})", "E$2-$4"]
- - name: re_replace
- args: ["(?i)(afl.\\s*|aflevering\\s*|ep.\\s*)(\\d{1,2})", "E$2"]
- - name: re_replace
- args: ["(?i)compleet", "Complete"]
- details:
- selector: a[href^="details.php?id="]
- attribute: href
- category:
- selector: a[href^="browse.php?cat="]
- attribute: href
- filters:
- - name: querystring
- args: cat
- download:
- selector: a[href^="details.php?id="]
- attribute: href
- poster:
- selector: img[src*="/covers/"]
- attribute: src
- size:
- selector: td:nth-child(4) table tr td:nth-child(2)
- filters:
- - name: regexp
- args: "(.+?) in"
- files:
- selector: td:nth-child(4) table tr td:nth-child(2)
- filters:
- - name: regexp
- args: "in (\\d+) bestan"
- grabs:
- selector: td:nth-child(4) table tr:nth-child(2) td:nth-child(1)
- date:
- selector: td:nth-child(4) table tr:nth-child(2) td:nth-child(2)
- filters:
- - name: replace
- args: ["januari", "January"]
- - name: replace
- args: ["februari", "February"]
- - name: replace
- args: ["maart", "March"]
- - name: replace
- args: ["april", "April"]
- - name: replace
- args: ["mei", "May"]
- - name: replace
- args: ["juni", "June"]
- - name: replace
- args: ["juli", "July"]
- - name: replace
- args: ["augustus", "August"]
- - name: replace
- args: ["september", "September"]
- - name: replace
- args: ["oktober", "October"]
- - name: replace
- args: ["november", "November"]
- - name: replace
- args: ["december", "December"]
- - name: re_replace
- args: ["\\s*om\\s*", " "]
- - name: append
- args: " +01:00" # CET
- - name: dateparse
- args: "2 January 2006 15:04:05 -07:00"
- seeders_optional:
- optional: true
- selector: td:nth-child(4) table tr:nth-child(3) td:nth-child(5) font b
- seeders:
- text: "{{ if .Result.seeders_optional }}{{ .Result.seeders_optional }}{{ else }}0{{ end }}"
- leechers_optional:
- optional: true
- selector: td:nth-child(4) table tr:nth-child(3) td:nth-child(5) font font b
- leechers:
- text: "{{ if .Result.leechers_optional }}{{ .Result.leechers_optional }}{{ else }}0{{ end }}"
- downloadvolumefactor:
- case:
- img[src="pic/freedlfsu.gif"]: 0
- "*": 1
- uploadvolumefactor:
- text: 1
-# engine n/a
diff --git a/src/Jackett.Common/Definitions/mediamaatjes.yml b/src/Jackett.Common/Definitions/mediamaatjes.yml
deleted file mode 100644
index c182f1086..000000000
--- a/src/Jackett.Common/Definitions/mediamaatjes.yml
+++ /dev/null
@@ -1,196 +0,0 @@
----
-id: mediamaatjes
-name: MediaMaatjes
-description: "MediaMaatjes is a DUTCH Private Torrent Tracker for MOVIES / TV / GENERAL"
-language: nl-NL
-type: private
-encoding: UTF-8
-links:
- - https://www.mediamaatjes.org/
-
-caps:
- categorymappings:
- - {id: 46, cat: Movies/SD, desc: "avi/xvideo"}
- - {id: 43, cat: Movies/UHD, desc: "4k Films"}
- - {id: 41, cat: TV/Documentary, desc: "Documentaire"}
- - {id: 40, cat: Other, desc: "kerst"}
- - {id: 15, cat: Other, desc: "Overige"}
- - {id: 1, cat: Other, desc: "Afbeeldingen"}
- - {id: 19, cat: TV, desc: "TV Series"}
- - {id: 21, cat: TV/HD, desc: "Series/MKV"}
- - {id: 23, cat: Audio/Video, desc: "Cabaret"}
- - {id: 24, cat: Books/EBook, desc: "E-Books"}
- - {id: 30, cat: Movies, desc: "Classic"}
- - {id: 31, cat: Audio/Audiobook, desc: "Luisterboek"}
- - {id: 32, cat: Movies/HD, desc: "Films/HD 720p"}
- - {id: 33, cat: Audio, desc: "NL Muziek"}
- - {id: 34, cat: Books/Comics, desc: "Stripboeken"}
- - {id: 36, cat: Books/Mags, desc: "E Magazine"}
- - {id: 18, cat: TV/SD, desc: "Series/XVID"}
- - {id: 17, cat: PC/Games, desc: "PC Spellen"}
- - {id: 16, cat: PC, desc: "PC Software"}
- - {id: 2, cat: Movies/HD, desc: "Films/HD 1080p"}
- - {id: 4, cat: Audio/Video, desc: "DVD Muziek"}
- - {id: 3, cat: Movies/DVD, desc: "DVD Kids"}
- - {id: 5, cat: Movies/DVD, desc: "DVD Films"}
- - {id: 7, cat: Movies/SD, desc: "DVD Promo/R5"}
- - {id: 8, cat: XXX, desc: "Erotiek"}
- - {id: 9, cat: PC/Mobile-Other, desc: "GSM/Navigatie"}
- - {id: 10, cat: Audio, desc: "Muziek Album"}
- - {id: 11, cat: Audio, desc: "Muziek Diverse"}
- - {id: 13, cat: Console/Wii, desc: "Wii"}
-
- modes:
- search: [q]
- tv-search: [q, season, ep]
- movie-search: [q]
- music-search: [q]
- book-search: [q]
-
-settings:
- - name: username
- type: text
- label: Username
- - name: password
- type: password
- label: Password
- - name: freeleech
- type: checkbox
- label: Filter freeleech only
- default: false
- - name: thankyou
- type: text
- label: Thank You Comment
- - name: info
- type: info
- label: Thank you comment
- default: This site requires you to leave a Thank You comment before you can download. Enter your personalised comment above.
-
-login:
- path: takelogin.php
- method: post
- inputs:
- username: "{{ .Config.username }}"
- password: "{{ .Config.password }}"
- error:
- - selector: table.main:contains("Aanmelden mislukt")
- test:
- path: /
- selector: a[href="logout.php"]
-
-download:
- before:
- # https://www.mediamaatjes.org/comment.php?action=add&tid=166386
- path: comment.php
- method: post
- inputs:
- action: add
- tid: "{{ .DownloadUri.Query.id }}"
- text: "{{ .Config.thankyou }}"
- selectors:
- - selector: a[href^="download.php?id="]
- attribute: href
-
-search:
- paths:
- # https://www.mediamaatjes.org/browse.php?search=&cat=43&incldead=1
- - path: browse.php
- inputs:
- $raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
- search: "{{ .Keywords }}"
- incldead: 1
- # does not support imdbid search and does not return imdb link in results
-
- rows:
- selector: "table.mainouter{{ if .Config.freeleech }}:has(img[src=\"pic/freedlfsu.gif\"]){{ else }}{{ end }}"
- filters:
- - name: andmatch
-
- fields:
- category:
- selector: a[href^="browse.php?cat="]
- attribute: href
- filters:
- - name: querystring
- args: cat
- title:
- selector: a[href^="details.php?id="]
- filters:
- - name: re_replace
- args: ["(?i)seizoen\\s*(\\d{1,2})\\s*(tot|t\/m)\\s*(\\d{1,2})", "S$1-$3"]
- - name: re_replace
- args: ["(?i)(seizoen\\s*)(\\d{1,2})", "S$2"]
- - name: re_replace
- args: ["(?i)(afl.\\s*|aflevering\\s*)(\\d{1,2})", "E$2"]
- - name: re_replace
- args: ["(?i)compleet", "Complete"]
- details:
- selector: a[href^="details.php?id="]
- attribute: href
- download:
- selector: a[href^="details.php?id="]
- attribute: href
- size:
- selector: a[href^="details_bestanden.php?torrent_id="]
- filters:
- - name: regexp
- args: "(.+?) in"
- files:
- selector: a[href^="details_bestanden.php?torrent_id="]
- filters:
- - name: regexp
- args: "in (\\d+) bestan"
- grabs:
- selector: table table tr:nth-child(2) td:nth-child(1)
- date:
- selector: table table tr:nth-child(2) td:nth-child(2)
- filters:
- - name: replace
- args: ["januari", "January"]
- - name: replace
- args: ["februari", "February"]
- - name: replace
- args: ["maart", "March"]
- - name: replace
- args: ["april", "April"]
- - name: replace
- args: ["mei", "May"]
- - name: replace
- args: ["juni", "June"]
- - name: replace
- args: ["juli", "July"]
- - name: replace
- args: ["augustus", "August"]
- - name: replace
- args: ["september", "September"]
- - name: replace
- args: ["oktober", "October"]
- - name: replace
- args: ["november", "November"]
- - name: replace
- args: ["december", "December"]
- - name: re_replace
- args: ["\\s*om\\s*", " "]
- - name: append
- args: " +01:00" # CET
- - name: dateparse
- args: "2 January 2006 15:04:05 -07:00"
- seeders_optional:
- optional: true
- selector: table tr:nth-child(3) td:nth-child(5) font b
- seeders:
- text: "{{ if .Result.seeders_optional }}{{ .Result.seeders_optional }}{{ else }}0{{ end }}"
- leechers_optional:
- optional: true
- selector: table tr:nth-child(3) td:nth-child(5) font b:nth-child(2)
- leechers:
- text: "{{ if .Result.leechers_optional }}{{ .Result.leechers_optional }}{{ else }}0{{ end }}"
- downloadvolumefactor:
- case:
- img[src="pic/freedlfsu.gif"]: 0
- "*": 1
- uploadvolumefactor:
- text: 1
- minimumratio:
- text: 1.0
-# engine n/a
diff --git a/src/Jackett.Updater/Program.cs b/src/Jackett.Updater/Program.cs
index ccdd8f4e2..6eb9cc0a0 100644
--- a/src/Jackett.Updater/Program.cs
+++ b/src/Jackett.Updater/Program.cs
@@ -330,6 +330,7 @@ namespace Jackett.Updater
"Definitions/dragonworldreloaded.yml",
"Definitions/dreamteam.yml",
"Definitions/dxdhd.yml",
+ "Definitions/ebookparadijs.yml",
"Definitions/efectodoppler.yml",
"Definitions/eggmeon.yml",
"Definitions/elitehd.yml",
@@ -350,6 +351,7 @@ namespace Jackett.Updater
"Definitions/extratorrentclone.yml",
"Definitions/feedurneed.yml", // merged with devilsplayground #6872
"Definitions/filebase.yml",
+ "Definitions/film-paleis.yml",
"Definitions/filmsclub.yml",
"Definitions/focusx.yml",
"Definitions/freakstrackingsystem.yml",
@@ -420,6 +422,7 @@ namespace Jackett.Updater
"Definitions/magnetdl.yml",
"Definitions/maniatorrent.yml",
"Definitions/manicomioshare.yml",
+ "Definitions/mediamaatjes.yml",
"Definitions/megabliz.yml",
"Definitions/metal-iplay-ro.yml", // renamed to romanianmetaltorrents
"Definitions/microbit.yml",