diff --git a/README.md b/README.md
index d2d7d0e93..522629a03 100644
--- a/README.md
+++ b/README.md
@@ -364,7 +364,7 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht
* GiroTorrent
* GreatPosterWall (GPW)
* GreekDiamond
- * Greek Team [![(invite needed)][inviteneeded]](#)
+ * Greek Team
* HaiDan
* Haitang
* HappyFappy
diff --git a/src/Jackett.Common/Definitions/greekteam.yml b/src/Jackett.Common/Definitions/greekteam.yml
index 3d15870f5..86ed40044 100644
--- a/src/Jackett.Common/Definitions/greekteam.yml
+++ b/src/Jackett.Common/Definitions/greekteam.yml
@@ -12,65 +12,95 @@ legacylinks:
caps:
categorymappings:
- - {id: 59, cat: TV/Anime, desc: "Anime DVD/BR-rip Gr Sub - Emb"}
- - {id: 35, cat: TV/Anime, desc: "Anime DVDRip/BR-rip"}
- - {id: 9, cat: TV/Anime, desc: "Anime HD"}
- - {id: 63, cat: TV/Anime, desc: "Anime HDTV"}
- - {id: 57, cat: TV/Anime, desc: "Anime TV"}
- - {id: 10, cat: Books, desc: "Books Magazines"}
+ - {id: 9, cat: TV/Anime, desc: "Anime/Cartoon HD"}
+ - {id: 63, cat: TV/Anime, desc: "Anime/Cartoon HDTV"}
+ - {id: 35, cat: TV/Anime, desc: "Anime/Cartoon SD"}
+ - {id: 59, cat: TV/Anime, desc: "Anime/Cartoon SD Emb"}
+ - {id: 57, cat: TV/Anime, desc: "Anime/Cartoon TV"}
+ - {id: 46, cat: PC, desc: "Applications Linux"}
+ - {id: 45, cat: PC, desc: "Applications MAC"}
+ - {id: 23, cat: PC, desc: "Applications Windows"}
+ - {id: 10, cat: Books, desc: "Books/Magazines/English"}
+ - {id: 12, cat: Books, desc: "Books/Magazines/Greek"}
+ - {id: 8, cat: TV/Documentary, desc: "Documentaries"}
+ - {id: 5, cat: TV/Documentary, desc: "Documentaries Greek"}
+ - {id: 25, cat: TV/Documentary, desc: "Documentaries HD"}
+ - {id: 27, cat: Movies/DVD, desc: "Movies DVD-R"}
- {id: 31, cat: Console/Other, desc: "Games Other"}
- - {id: 30, cat: Console/PS4, desc: "Games PSx"}
- {id: 20, cat: PC/Games, desc: "Games Windows"}
- - {id: 29, cat: Console/XBox, desc: "Games XBOX"}
- {id: 11, cat: Other, desc: "Misc"}
- {id: 47, cat: PC/Mobile-Other, desc: "Mobile"}
- - {id: 27, cat: Movies/DVD, desc: "Movies DVD-R"}
- {id: 53, cat: Movies/3D, desc: "Movies 3D"}
- {id: 15, cat: Movies/UHD, desc: "Movies 4K"}
- {id: 18, cat: Movies/BluRay, desc: "Movies Bluray"}
- - {id: 40, cat: Movies/HD, desc: "Movies DVD-rip x264"}
- - {id: 60, cat: Movies/HD, desc: "Movies DVD-rip x264 Packages"}
- - {id: 39, cat: Movies/SD, desc: "Movies DVD/BR-rip"}
- - {id: 14, cat: Movies/SD, desc: "Movies DVD/BR-rip Gr Sub - Emb"}
- - {id: 61, cat: Movies/SD, desc: "Movies DVD/BR-rip XviD Packs"}
- - {id: 12, cat: Movies/SD, desc: "Movies Greek DVD/BRrip"}
+ - {id: 29, cat: Movies, desc: "Movies Emb Packs"}
- {id: 19, cat: Movies/HD, desc: "Movies HD"}
- - {id: 52, cat: Movies/HD, desc: "Movies HD Packages"}
+ - {id: 13, cat: Movies/HD, desc: "Movies HD Emb"}
+ - {id: 52, cat: Movies/HD, desc: "Movies HD Packs"}
+ - {id: 40, cat: Movies/SD, desc: "Movies SD"}
+ - {id: 14, cat: Movies/SD, desc: "Movies SD Emb"}
+ - {id: 60, cat: Movies/SD, desc: "Movies SD Packs"}
+ - {id: 22, cat: Audio, desc: "Music"}
+ - {id: 2, cat: Audio, desc: "Music Discographies"}
- {id: 48, cat: Audio, desc: "Music DJ & Promos"}
- - {id: 22, cat: Audio, desc: "Music Foreign"}
- - {id: 2, cat: Audio, desc: "Music Foreign Discographies"}
- - {id: 33, cat: Audio/Lossless, desc: "Music Foreign Flac"}
+ - {id: 33, cat: Audio/Lossless, desc: "Music Flac"}
- {id: 1, cat: Audio, desc: "Music Greek"}
- {id: 21, cat: Audio, desc: "Music Greek Discographies"}
- {id: 50, cat: Audio/Lossless, desc: "Music Greek Flac"}
- {id: 16, cat: Audio/Video, desc: "Music Videos"}
- - {id: 46, cat: PC, desc: "Programs Linux"}
- - {id: 45, cat: PC, desc: "Programs MAC"}
- - {id: 23, cat: PC, desc: "Programs Windows"}
- - {id: 8, cat: TV/Documentary, desc: "Documentaries Foreign"}
- - {id: 25, cat: TV/Documentary, desc: "Documentaries Foreign HD"}
- - {id: 5, cat: TV/Documentary, desc: "Documentaries Greek"}
- - {id: 6, cat: TV/Sport, desc: "TV Sports"}
- - {id: 54, cat: TV/Sport, desc: "TV Sports HD"}
- - {id: 34, cat: TV/SD, desc: "TV Foreign Series"}
- - {id: 7, cat: TV/SD, desc: "TV Foreign Series Emb"}
- - {id: 36, cat: TV/HD, desc: "TV Foreign Series HD"}
- - {id: 62, cat: TV/HD, desc: "TV Foreign Series HD Packages"}
- - {id: 42, cat: TV/SD, desc: "TV Foreign Series Packages"}
+ - {id: 6, cat: TV/Sport, desc: "Sports"}
+ - {id: 54, cat: TV/Sport, desc: "Sports HD"}
- {id: 55, cat: TV/SD, desc: "TV Greek Movies"}
- {id: 49, cat: TV/HD, desc: "TV Greek Movies HD"}
- - {id: 26, cat: TV/SD, desc: "TV Greek Other"}
- {id: 3, cat: TV/SD, desc: "TV Greek Series"}
- - {id: 44, cat: TV/SD, desc: "TV Greek Packages"}
+ - {id: 44, cat: TV/SD, desc: "TV Greek Packs"}
- {id: 4, cat: TV/SD, desc: "TV Greek Shows"}
+ - {id: 34, cat: TV/SD, desc: "TV Series"}
+ - {id: 7, cat: TV/SD, desc: "TV Series Emb"}
+ - {id: 26, cat: TV/SD, desc: "TV Series Emb Packs"}
+ - {id: 36, cat: TV/HD, desc: "TV Series HD"}
+ - {id: 62, cat: TV/HD, desc: "TV Series HD Packs"}
+ - {id: 42, cat: TV/SD, desc: "TV Series Packs"}
modes:
search: [q]
tv-search: [q, season, ep]
- movie-search: [q]
+ movie-search: [q, imdbid]
music-search: [q]
book-search: [q]
+settings:
+ - name: username
+ type: text
+ label: Username
+ - name: password
+ type: password
+ label: Password
+ - name: freeleech
+ type: checkbox
+ label: Search freeleech only
+ default: false
+ - name: sort
+ type: select
+ label: Sort requested from site
+ default: added
+ options:
+ added: created
+ seeders: seeders
+ size: size
+ name: title
+ - name: type
+ type: select
+ label: Order requested from site
+ default: DESC
+ options:
+ DESC: desc
+ ASC: asc
+ - name: info
+ type: info
+ label: Results Per Page
+ default: For best results, change the Torrents per page: setting to 100 on your account profile. The default is 25.
+
login:
path: login.php
method: post
@@ -82,7 +112,7 @@ login:
error:
- selector: td.embedded:has(h2:contains("failed"))
test:
- path: browse.php
+ path: index.php
selector: a[href="logout.php"]
search:
@@ -90,9 +120,14 @@ search:
- path: browse.php
inputs:
$raw: "{{ range .Categories }}c{{.}}=1&{{end}}"
- search: "{{ .Keywords }}"
- incldead: 1
- blah: 0
+ search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ .Keywords }}{{ end }}"
+ # 0 active, 1 incldead, 2 onlydead, 3 free (gold)
+ incldead: "{{ if .Config.freeleech }}3{{ else }}1{{ end }}"
+ # 0 name, 1 descr, 2 uploader
+ blah: "{{ if .Query.IMDBID }}1{{ else }}0{{ end }}"
+ sort: "{{ .Config.sort }}"
+ d: "{{ .Config.type }}"
+ # does not show IMDB but can support searching with it in descriptions
rows:
selector: table.row1 > tbody > tr:has(a.torname)
@@ -136,8 +171,21 @@ search:
selector: td:has(a[href$="filelist=1"]) ~ td ~ td ~ td ~ td ~ td ~ td ~ td
downloadvolumefactor:
case:
- "img[src=\"pic/free.png\"]": 0
+ img[src="pic/free.png"]: 0
+ img[src="pic/freedownload.gif"]: 0 # freeleech slot exchange
+ img[src="pic/personal_free.png"]: 0 # applies to VIPs only
"*": 1
uploadvolumefactor:
- text: 1
-# engine tbc
+ case:
+ img[src="pic/x2new.png"]: 0 # double uploaded with a freleech slot exchange
+ "*": 1
+ minimumratio:
+ case:
+ img[src="pic/hnrfree.png"]: 0 # exempt from H&R
+ img[src="pic/hnr-50.png"]: 0.5 # min ratio is 0.5
+ "*": 0.5 # rules say 0.3 but FAQ says 0.4 but H&R says 0.5 !#?
+ minimumseedtime:
+ case:
+ img[src="pic/hnrfree.png"]: 0 # exempt from H&R
+ "*": 432000 # 5 days (as seconds = 5 x 24 x 60 x 60)
+# engine n/a