From 34780f91be72505c2f127df14fb793992b066018 Mon Sep 17 00:00:00 2001 From: garfield69 Date: Mon, 9 Oct 2017 10:36:07 +1300 Subject: [PATCH 1/8] cpabien: switch to .org domain fix #1933 (#1937) this avoids redirection by .cc domain add .cc as legacylink also add original .co as legacylink --- src/Jackett/Definitions/cpabien.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Jackett/Definitions/cpabien.yml b/src/Jackett/Definitions/cpabien.yml index ca87216df..1e9d9c16e 100644 --- a/src/Jackett/Definitions/cpabien.yml +++ b/src/Jackett/Definitions/cpabien.yml @@ -6,7 +6,10 @@ type: public encoding: UTF-8 links: + - http://cpabien.org/ + legacylinks: - http://cpabien.cc/ + - http://cpabien.co/ caps: categorymappings: From 49a7c8df7a2be652cb8a96ba2dd2aa42ef118761 Mon Sep 17 00:00:00 2001 From: Garfield69 Date: Mon, 9 Oct 2017 13:36:09 +1300 Subject: [PATCH 2/8] gktorrent: fix #1941 the dashboard test requires just the base path. categories matching requires french keywords the site does not supply a release date, so lets default to now, otherwise we get ugly "2017y old" in dashboard results. --- src/Jackett/Definitions/gktorrent.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/Jackett/Definitions/gktorrent.yml b/src/Jackett/Definitions/gktorrent.yml index 12e3d60ca..30c2b1efd 100644 --- a/src/Jackett/Definitions/gktorrent.yml +++ b/src/Jackett/Definitions/gktorrent.yml @@ -28,7 +28,7 @@ selector: a[href^="/get_torrent/"] search: - path: "/search/{{ .Query.Keywords }}" + path: "{{if .Keywords}}/recherche/{{.Keywords}}{{else}}{{end}}" rows: selector: div.listing-torrent > table > tbody > tr:has(a) fields: @@ -70,9 +70,11 @@ category: selector: td:nth-child(1) > i case: - .Movies: "movies" - .TV: "tvshows" - .Softwares: "softwares" - .Music: "music" - .Games: "games" - .Books: "books" + .Films: "movies" + .Séries: "tvshows" + .Logiciels: "softwares" + .Musiques: "music" + .Jeux: "games" + .Ebooks: "books" + date: + text: "now" From 8f10d27d0fa78963f0939d78a40191c6bdaa148a Mon Sep 17 00:00:00 2001 From: Garfield69 Date: Tue, 10 Oct 2017 15:23:41 +1300 Subject: [PATCH 3/8] docs: add DuckieTV to the list of apps that support connecting to Jackett --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cf807e8c6..39d5e01e5 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ This project is a new fork and is recruiting development help. If you are able to help out please contact us. -Jackett works as a proxy server: it translates queries from apps ([Sonarr](https://github.com/Sonarr/Sonarr), [Radarr](https://github.com/Radarr/Radarr), [SickRage](https://sickrage.github.io/), [CouchPotato](https://couchpota.to/), [Mylar](https://github.com/evilhero/mylar), etc) into tracker-site-specific http queries, parses the html response, then sends results back to the requesting software. This allows for getting recent uploads (like RSS) and performing searches. Jackett is a single repository of maintained indexer scraping & translation logic - removing the burden from other apps. +Jackett works as a proxy server: it translates queries from apps ([Sonarr](https://github.com/Sonarr/Sonarr), [Radarr](https://github.com/Radarr/Radarr), [SickRage](https://sickrage.github.io/), [CouchPotato](https://couchpota.to/), [Mylar](https://github.com/evilhero/mylar), [DuckieTV](https://github.com/SchizoDuckie/DuckieTV), etc) into tracker-site-specific http queries, parses the html response, then sends results back to the requesting software. This allows for getting recent uploads (like RSS) and performing searches. Jackett is a single repository of maintained indexer scraping & translation logic - removing the burden from other apps. Developer note: The software implements the [Torznab](https://github.com/Sonarr/Sonarr/wiki/Implementing-a-Torznab-indexer) (with [nZEDb](https://github.com/nZEDb/nZEDb/blob/dev/docs/newznab_api_specification.txt) category numbering) and [TorrentPotato](https://github.com/RuudBurger/CouchPotatoServer/wiki/Couchpotato-torrent-provider) APIs. From 91817a10ffc3ef0e38e9947b90dd784269d958d4 Mon Sep 17 00:00:00 2001 From: Garfield69 Date: Wed, 11 Oct 2017 12:51:40 +1300 Subject: [PATCH 4/8] torrent9: moved domain ... again! #1950 --- src/Jackett/Definitions/torrent9.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Jackett/Definitions/torrent9.yml b/src/Jackett/Definitions/torrent9.yml index e8c952bf9..3071b2f8e 100644 --- a/src/Jackett/Definitions/torrent9.yml +++ b/src/Jackett/Definitions/torrent9.yml @@ -6,9 +6,10 @@ type: public encoding: UTF-8 links: - - http://www.torrent9.pe/ + - http://www.torrents9.pe/ legacylinks: - http://www.torrent9.cc/ + - http://www.torrent9.pe/ caps: categorymappings: From 8aa82a22f43949683fa3f5eac0de3c2f50908e85 Mon Sep 17 00:00:00 2001 From: Garfield69 Date: Wed, 11 Oct 2017 13:00:33 +1300 Subject: [PATCH 5/8] nexttorrent: moved domain to www.nextorrent.cc #1950 --- src/Jackett/Definitions/nexttorrent.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Jackett/Definitions/nexttorrent.yml b/src/Jackett/Definitions/nexttorrent.yml index 42c68e785..77cab0af7 100755 --- a/src/Jackett/Definitions/nexttorrent.yml +++ b/src/Jackett/Definitions/nexttorrent.yml @@ -6,6 +6,8 @@ type: public encoding: UTF-8 links: + - https://www.nextorrent.cc/ + legacylinks: - https://www.nextorrent.org/ caps: From 0933d913dca693ed0330383166f25ec740323de4 Mon Sep 17 00:00:00 2001 From: alimnette Date: Wed, 11 Oct 2017 07:48:08 +0200 Subject: [PATCH 6/8] Update t411v2.yml (#1949) Fix Grey's Anatomy results --- src/Jackett/Definitions/t411v2.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Jackett/Definitions/t411v2.yml b/src/Jackett/Definitions/t411v2.yml index 3fa44e364..ead4115b5 100755 --- a/src/Jackett/Definitions/t411v2.yml +++ b/src/Jackett/Definitions/t411v2.yml @@ -47,6 +47,8 @@ title: selector: td.m-name > a filters: + - name: replace # Fix Grey's Anatomy results + args: ["Greys Anatomy", "Grey's Anatomy"] # now we put the date at the right place according scene # naming rules using .Result.site_date - name: replace From 12b9d6ca7dbe21a2e05a011fc1416f17c1aa6581 Mon Sep 17 00:00:00 2001 From: Garfield69 Date: Mon, 16 Oct 2017 17:59:56 +1300 Subject: [PATCH 7/8] btbit: add the English version of this public. resolves #1934 --- README.md | 1 + src/Jackett/Definitions/btbit.yml | 58 +++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 src/Jackett/Definitions/btbit.yml diff --git a/README.md b/README.md index 39d5e01e5..b2047d564 100644 --- a/README.md +++ b/README.md @@ -25,6 +25,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/ * Anidex * Anime Tosho * AniRena + * btbit * BTDB * cpasbien * EZTV diff --git a/src/Jackett/Definitions/btbit.yml b/src/Jackett/Definitions/btbit.yml new file mode 100644 index 000000000..bbc1eb788 --- /dev/null +++ b/src/Jackett/Definitions/btbit.yml @@ -0,0 +1,58 @@ +--- + site: btbit + name: btbit + description: "btbit is a public magnet search engine for MOVIES / GENERAL. This definition is for the English site." + language: en-us + type: public + encoding: UTF-8 + links: + - http://en.btbit.org/ + + caps: + categories: + "Movie": Movies + "Package": PC/0day + "Other": Other + "Software": PC + "Mirror": PC/ISO + "Music": Audio + "Picture": Other/Misc + "Document": Books + + modes: + search: [q] + tv-search: [q, season, ep] + movie-search: [q] + + settings: [] + + search: + path: "list/{{if .Keywords}}{{.Keywords}}{{else}}movie{{end}}.html" + rows: + selector: .rs + fields: + title: + selector: .title + category: + selector: .sbar span[class^="cpill"] + details: + selector: .title h3 a + attribute: href + download: + selector: .sbar a[href^="magnet:?xt"] + attribute: href + date: + selector: .sbar span:nth-of-type(3) b + filters: + - name: dateparse + args: "2006-01-02" + size: + selector: .sbar span:nth-of-type(4) b + files: + selector: .sbar span:nth-of-type(5) b + grabs: + selector: .sbar span:nth-of-type(6) b + downloadvolumefactor: + text: "0" + uploadvolumefactor: + text: "1" From d30bde715c623baad20b607074f2108eea34cfa6 Mon Sep 17 00:00:00 2001 From: Jelle Date: Mon, 16 Oct 2017 18:22:16 +0200 Subject: [PATCH 8/8] Added the aggregate indexer to be retrievable from IndexerManagerService.GetWebIndexer() (#1969) --- src/Jackett/Services/IndexerManagerService.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Jackett/Services/IndexerManagerService.cs b/src/Jackett/Services/IndexerManagerService.cs index 8112c4141..9c502ad9c 100644 --- a/src/Jackett/Services/IndexerManagerService.cs +++ b/src/Jackett/Services/IndexerManagerService.cs @@ -204,7 +204,13 @@ namespace Jackett.Services public IWebIndexer GetWebIndexer(string name) { if (indexers.ContainsKey(name)) + { return indexers[name] as IWebIndexer; + } + else if (name == "all") + { + return aggregateIndexer as IWebIndexer; + } logger.Error("Request for unknown indexer: " + name); throw new Exception("Unknown indexer: " + name);