diff --git a/README.md b/README.md index 5cb132b3a..a2a41ebec 100644 --- a/README.md +++ b/README.md @@ -375,7 +375,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht * HDBits [![(invite needed)][inviteneeded]](#) * HDCiTY (HDC) [![(invite needed)][inviteneeded]](#) * HDFans - * HDFun (HDZone) * HDHome (HDBigger) [![(invite needed)][inviteneeded]](#) * HDKylin (麒麟) * HDPT (明教) [![(invite needed)][inviteneeded]](#) diff --git a/src/Jackett.Common/Definitions/hdfun.yml b/src/Jackett.Common/Definitions/hdfun.yml deleted file mode 100644 index 5542141be..000000000 --- a/src/Jackett.Common/Definitions/hdfun.yml +++ /dev/null @@ -1,229 +0,0 @@ ---- -id: hdfun -replaces: - - hdzone -name: HDFun -description: "HDFun (HDZone) is a CHINESE Private Torrent Tracker for HD MOVIES / TV" -language: zh-CN -type: private -encoding: UTF-8 -links: - - https://hdzone.me/ -legacylinks: - - https://hdfun.me/ - -caps: - categorymappings: - - {id: 411, cat: Movies/SD, desc: "Movies SD"} - - {id: 412, cat: Movies, desc: "Movies IPad"} - - {id: 413, cat: Movies/HD, desc: "Movies 720p"} - - {id: 414, cat: Movies/HD, desc: "Movies 1080p"} - - {id: 415, cat: Movies, desc: "Movies REMUX"} - - {id: 450, cat: Movies/BluRay, desc: "Movies Bluray"} - - {id: 499, cat: Movies/UHD, desc: "Movies UHD Blu-ray"} - - {id: 416, cat: Movies/UHD, desc: "Movies 2160p"} - - {id: 417, cat: TV/Documentary, desc: "Doc SD"} - - {id: 418, cat: TV/Documentary, desc: "Doc IPad"} - - {id: 419, cat: TV/Documentary, desc: "Doc 720p"} - - {id: 420, cat: TV/Documentary, desc: "Doc 1080p"} - - {id: 421, cat: TV/Documentary, desc: "Doc REMUX"} - - {id: 451, cat: TV/Documentary, desc: "Doc Bluray"} - - {id: 500, cat: TV/Documentary, desc: "Doc UHD Blu-ray"} - - {id: 422, cat: TV/Documentary, desc: "Doc 2160p"} - - {id: 423, cat: Audio/Video, desc: "TVMusic 720p"} - - {id: 424, cat: Audio/Video, desc: "TVMusic 1080i"} - - {id: 425, cat: TV/SD, desc: "TVShow SD"} - - {id: 426, cat: TV, desc: "TVShow IPad"} - - {id: 471, cat: TV, desc: "TVShow IPad"} - - {id: 427, cat: TV/HD, desc: "TVShow 720p"} - - {id: 472, cat: TV/HD, desc: "TVShow 720p"} - - {id: 428, cat: TV/HD, desc: "TVShow 1080i"} - - {id: 429, cat: TV/HD, desc: "TVShow 1080p"} - - {id: 430, cat: TV, desc: "TVShow REMUX"} - - {id: 452, cat: TV/HD, desc: "TVShow Bluray"} - - {id: 431, cat: TV/UHD, desc: "TVShow 2160p"} - - {id: 432, cat: TV/SD, desc: "TVSeries SD"} - - {id: 433, cat: TV, desc: "TVSeries IPad"} - - {id: 434, cat: TV/HD, desc: "TVSeries 720p"} - - {id: 435, cat: TV/HD, desc: "TVSeries 1080i"} - - {id: 436, cat: TV/HD, desc: "TVSeries 1080p"} - - {id: 437, cat: TV, desc: "TVSeries REMUX"} - - {id: 453, cat: TV/HD, desc: "TVSeries Bluray"} - - {id: 438, cat: TV/UHD, desc: "TVSeries 2160p"} - - {id: 439, cat: Audio, desc: "Music APE"} - - {id: 440, cat: Audio/Lossless, desc: "Music FLAC"} - - {id: 441, cat: Audio/Video, desc: "Music MV"} - - {id: 442, cat: TV/Sport, desc: "Sports 720p"} - - {id: 443, cat: TV/Sport, desc: "Sports 1080i"} - - {id: 444, cat: TV/Anime, desc: "Anime SD"} - - {id: 445, cat: TV/Anime, desc: "Anime IPad"} - - {id: 446, cat: TV/Anime, desc: "Anime 720p"} - - {id: 447, cat: TV/Anime, desc: "Anime 1080p"} - - {id: 448, cat: TV/Anime, desc: "Anime REMUX"} - - {id: 454, cat: TV/Anime, desc: "Anime Bluray"} - - {id: 409, cat: Other, desc: "Misc"} - - {id: 449, cat: TV/Anime, desc: "Anime 2160p"} - - {id: 501, cat: TV/Anime, desc: "Anime UHD Blu-ray"} - - modes: - search: [q] - tv-search: [q, season, ep, imdbid, doubanid] - movie-search: [q, imdbid, doubanid] - music-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: 4 - options: - 4: created - 7: seeders - 5: size - 1: title - - name: type - type: select - label: Order requested from site - default: desc - options: - desc: desc - asc: asc - - name: info_tpp - type: info - label: Results Per Page - default: For best results, change the Torrents per page: setting to 100 on your account profile. - - name: info_activity - type: info - label: Account Inactivity - default: "Cherish your user account. Inactive accounts would be deleted based on the following rules:
  1. Nexus Master or above would never be deleted
  2. Insane User or above would never be deleted if parked (at User CP)
  3. Parked accounts would be deleted if users have not logged in for more than 120 days in a row
  4. Un-parked accounts would be deleted if users have not logged in for more than 60 days in a row
  5. Accounts with both uploaded and downloaded amount being 0 would be deleted if users have not logged in for more than 7 days in a row.
" - -login: - path: login.php - method: form - form: form[action="takelogin.php"] - captcha: - type: image - selector: img[alt="CAPTCHA"] - input: imagestring - inputs: - secret: "" - username: "{{ .Config.username }}" - password: "{{ .Config.password }}" - logout: "" - securelogin: "" - ssl: yes - trackerssl: yes - error: - - selector: td.embedded:has(h2:contains("失败")) - test: - path: torrents.php - selector: a[href="logout.php"] - -search: - paths: - - path: torrents.php - inputs: - $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}" - # currently supports only one query id at one time. - search: "{{ if .Query.IMDBID }}{{ .Query.IMDBID }}{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }} {{ else }}{{ .Keywords }}{{ end }}{{ if .Query.DoubanID }}{{ .Query.DoubanID }}{{ else }}{{ end }}" - # 0 incldead, 1 active, 2 onlydead - incldead: 0 - # 0 all, 1 normal, 2 free, 3 2x, 4 2xfree, 5 50%, 6 2x50%, 7 30% - spstate: "{{ if .Config.freeleech }}2{{ else }}0{{ end }}" - # 0 title, 1 descr, 3 uploader, 4 imdb - search_area: "{{ if .Query.IMDBID }}4{{ else }}{{ end }}{{ if .Query.DoubanID }}1{{ else }}{{ end }}{{ if or .Query.IMDBID .Query.DoubanID }}{{ else }}0{{ end }}" - # 0 AND, 1 OR, 2 exact - search_mode: 0 - sort: "{{ .Config.sort }}" - type: "{{ .Config.type }}" - notnewword: 1 - - rows: - selector: table.torrents > tbody > tr:has(table.torrentname) - - fields: - category: - selector: a[href^="?cat="] - attribute: href - filters: - - name: querystring - args: cat - title_default: - selector: a[href^="details.php?id="] - title: - selector: a[title][href^="details.php?id="] - attribute: title - optional: true - default: "{{ .Result.title_default }}" - details: - selector: a[href^="details.php?id="] - attribute: href - download: - selector: a[href^="download.php?id="] - attribute: href - imdbid: - selector: a[href*="imdb.com/title/tt"] - attribute: href - date_elapsed: - # time type: time elapsed (default) - selector: td:nth-child(4) > span[title] - attribute: title - optional: true - filters: - - name: append - args: " +08:00" # CST - - name: dateparse - args: "yyyy-MM-dd HH:mm:ss zzz" - date_added: - # time added - selector: td:nth-child(4):not(:has(span)) - optional: true - filters: - - name: append - args: " +08:00" # CST - - name: dateparse - args: "yyyy-MM-ddHH:mm:ss zzz" - date: - text: "{{ if or .Result.date_elapsed .Result.date_added }}{{ or .Result.date_elapsed .Result.date_added }}{{ else }}now{{ end }}" - size: - selector: td:nth-child(5) - seeders: - selector: td:nth-child(6) - leechers: - selector: td:nth-child(7) - grabs: - selector: td:nth-child(8) - downloadvolumefactor: - case: - img.pro_free: 0 - img.pro_free2up: 0 - img.pro_50pctdown: 0.5 - img.pro_50pctdown2up: 0.5 - img.pro_30pctdown: 0.3 - "*": 1 - uploadvolumefactor: - case: - img.pro_50pctdown2up: 2 - img.pro_free2up: 2 - img.pro_2up: 2 - "*": 1 - minimumratio: - text: 1.2 -# does not appear to be implemented, no h&r tag found -# minimumseedtime: -# # 14 days (as seconds = 2 x 24 x 60 x 60) -# text: 1209600 - description: - selector: td:nth-child(2) - remove: a, b, font, img, span -# NexusPHP Standard v1.5 Beta 4 diff --git a/src/Jackett.Updater/Program.cs b/src/Jackett.Updater/Program.cs index 42d0d76a9..c49f50c60 100644 --- a/src/Jackett.Updater/Program.cs +++ b/src/Jackett.Updater/Program.cs @@ -436,6 +436,7 @@ namespace Jackett.Updater "Definitions/hdcity.yml", // moved to pixelados "Definitions/hdclub.yml", "Definitions/hddisk.yml", + "Definitions/hdfun.yml", "Definitions/hdhouse.yml", "Definitions/hdmayi.yml", "Definitions/hdme.yml",