diff --git a/README.md b/README.md index 972c5f8b7..22133794f 100644 --- a/README.md +++ b/README.md @@ -453,7 +453,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht * MoreThanTV (MTV) * MouseBits * Movie-Torrentz - * MuziekFabriek * MyAnonamouse (MAM) * MySpleen [![(invite needed)][inviteneeded]](#) * NCore diff --git a/src/Jackett.Common/Definitions/muziekfabriek.yml b/src/Jackett.Common/Definitions/muziekfabriek.yml deleted file mode 100644 index 92dd1febd..000000000 --- a/src/Jackett.Common/Definitions/muziekfabriek.yml +++ /dev/null @@ -1,161 +0,0 @@ ---- -id: muziekfabriek -name: MuziekFabriek -description: "MuziekFabriek is a DUTCH Private Torrent Tracker for MUSIC" -language: nl-NL -type: private -encoding: UTF-8 -links: - - https://www.muziekfabriek.org/ - -caps: - categorymappings: - - {id: 1, cat: Audio, desc: "Eigen Verzamel"} - - {id: 2, cat: Audio, desc: "NL Album"} - - {id: 3, cat: Audio, desc: "NL Diverse"} - - {id: 4, cat: Audio, desc: "Engels"} - - {id: 5, cat: Audio, desc: "Country"} - - {id: 6, cat: Audio, desc: "DVD Muziek"} - - {id: 7, cat: Audio, desc: "Instrumentaal"} - - {id: 8, cat: Audio, desc: "Reggae"} - - {id: 9, cat: Audio, desc: "Kinderen"} - - {id: 28, cat: Audio, desc: "Allerlei Albums"} - - {id: 11, cat: Audio, desc: "Duits"} - - {id: 26, cat: Audio, desc: "Carnaval"} - - {id: 13, cat: Audio, desc: "Verzamel"} - - {id: 14, cat: Audio, desc: "Soul"} - - {id: 15, cat: Audio, desc: "Classic"} - - {id: 16, cat: Audio, desc: "Rock-Roll"} - - {id: 17, cat: Audio, desc: "Blues"} - - {id: 18, cat: Audio, desc: "MuziekFabriek"} - - {id: 19, cat: Audio, desc: "Trance"} - - {id: 20, cat: Audio, desc: "Dance"} - - {id: 21, cat: Audio, desc: "Oldies"} - - {id: 22, cat: Audio, desc: "Hardcore"} - - {id: 23, cat: Audio, desc: "Sint"} - - {id: 24, cat: Audio, desc: "Kerstfeest"} - - modes: - search: [q] - music-search: [q, artist] - -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. - -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: index.php - selector: a[href="logout.php"] - -download: - selectors: - - selector: a[href^="download.php?id="] - attribute: href - -search: - paths: - - path: browse.php - inputs: - $raw: "{{ range .Categories }}c{{.}}=1&{{end}}" - search: "{{ if .Query.Artist }}{{ .Query.Artist }}{{ else }}{{ .Keywords }}{{ end }}" - incldead: 1 - - rows: - selector: table.mainouter - 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="] - details: - selector: a[href^="details.php?id="] - attribute: href - download: - selector: a[href^="details.php?id="] - attribute: href - poster: - selector: div[id^="Style"] img - attribute: src - size: - selector: td:nth-child(4) table tr:nth-child(1) td:nth-child(2) - filters: - - name: regexp - args: "(.+?) in" - files: - selector: td:nth-child(4) table tr:nth-child(1) 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: "d MMMM yyyy HH:mm:ss zzz" - seeders: - selector: td:nth-child(4) table tr:nth-child(3) td:nth-child(5) font b - optional: true - default: 0 - leechers: - selector: td:nth-child(4) table tr:nth-child(3) td:nth-child(5) font font b - optional: true - default: 0 - downloadvolumefactor: - text: 0 - uploadvolumefactor: - text: 1 -# engine n/a diff --git a/src/Jackett.Updater/Program.cs b/src/Jackett.Updater/Program.cs index 1066727ca..062393139 100644 --- a/src/Jackett.Updater/Program.cs +++ b/src/Jackett.Updater/Program.cs @@ -487,6 +487,7 @@ namespace Jackett.Updater "Definitions/movietorrent.yml", // will need c# #11284 "Definitions/moviezone.yml", // migrated to teracod #9743 "Definitions/music-master.yml", + "Definitions/muziekfabriek.yml", "Definitions/nachtwerk.yml", "Definitions/nbtorrents.yml", "Definitions/nbtorrents-api.yml",