diff --git a/README.md b/README.md index b0c9305d2..6959079b7 100644 --- a/README.md +++ b/README.md @@ -224,7 +224,6 @@ A third-party Golang SDK for Jackett is available from [webtor-io/go-jackett](ht * 0day.kiev * 1ptbar * 2 Fast 4 You [![(invite needed)][inviteneeded]](#) - * 2xFree * 3ChangTrai (3CT) * 3D Torrents (3DT) * 4thD (4th Dimension) [![(invite needed)][inviteneeded]](#) diff --git a/src/Jackett.Common/Definitions/2xfree.yml b/src/Jackett.Common/Definitions/2xfree.yml deleted file mode 100644 index 48bdde578..000000000 --- a/src/Jackett.Common/Definitions/2xfree.yml +++ /dev/null @@ -1,201 +0,0 @@ ---- -id: 2xfree -name: 2xFree -description: "2xFree is a CHINESE Private Torrent Tracker for 3D MOVIES / TV" -language: zh-CN -type: private -encoding: UTF-8 -links: - - https://pt.2xfree.org/ - -caps: - categorymappings: - - # torrents.php - - {id: 526, cat: Movies, desc: "3DMovies(3D电影)"} - - {id: 527, cat: TV, desc: "3DSeries(3D剧集)"} - - {id: 533, cat: Movies, desc: "VRMovies(VR电影)"} - - {id: 534, cat: TV, desc: "VRSeries(VR剧集)"} - - {id: 537, cat: TV, desc: "VRShows(VR演出)"} - - {id: 530, cat: Console, desc: "VRGame(VR一体机游戏)"} - - {id: 531, cat: PC/Games, desc: "PCVRGame(PCVR游戏)"} - - {id: 532, cat: Other, desc: "VRTools(VR工具软件)"} - - modes: - search: [q] - tv-search: [q, season, ep, imdbid, doubanid] - movie-search: [q, imdbid, doubanid] - -settings: - - name: username - type: text - label: Username - - name: password - type: password - label: Password - - name: 2facode - type: text - label: 2FA code - - name: info_2fa - type: info - label: "About 2FA code" - default: "Only fill in the 2FA code box if you have enabled 2FA on the 2xFree Web Site. Otherwise just leave it empty." - - 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_ulslr - type: info - label: Upload Speed Limit Rule - default: The upload bandwidth shall not exceed 120Mbps, that is, the upload speed shall not exceed 15MB/s. - - name: info_flaresolverr - type: info_flaresolverr - - name: info_activity - type: info - label: Account Inactivity - default: "Account retention rules:
  1. Veteran User and above will be retained forever
  2. Elite User and above will not be deleted after parking (in the control panel)
  3. Users with a parked account will be deleted if they do not log in for 400 consecutive days
  4. Users with a non-parked account will be deleted if they do not log in for 150 consecutive days
  5. Users with no traffic (ie, upload/download data are both 0) will be deleted if they do not log in for 100 consecutive days.
" - -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 }}" - two_step_code: "{{ .Config.2facode }}" - logout: "" - securelogin: "" - ssl: yes - trackerssl: yes - error: - - selector: td.embedded:has(h2:contains("失败")) - test: - path: index.php - selector: a[href="logout.php"] - -search: - paths: - - path: torrents.php - inputs: - $raw: "{{ range .Categories }}cat{{.}}=1&{{end}}" - 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 dead - 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 imdburl (4 does not appear to work) - search_area: "{{ if or .Query.IMDBID .Query.DoubanID }}1{{ 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(a[href^="details.php?id="]) - - 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 - poster: - selector: img[data-src] - attribute: data-src - imdbid: - # site currently only has a badge and rating, the id is not present. just in case a future update. - selector: a[href*="imdb.com/title/tt"] - attribute: href - doubanid: - # site currently only has a badge and rating, the id is not present. just in case a future update. - selector: a[href*="movie.douban.com/subject/"] - attribute: href - date_elapsed: - # time type: time elapsed (default) - selector: td.rowfollow: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.rowfollow: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.rowfollow:nth-child(5) - seeders: - selector: td.rowfollow:nth-child(6) - leechers: - selector: td.rowfollow:nth-child(7) - grabs: - selector: td.rowfollow: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: 0.8 - description: - selector: td.rowfollow:nth-child(2) - remove: a, b, font, img, span -# NexusPHP v1.8.6 2023-06-18 diff --git a/src/Jackett.Updater/Program.cs b/src/Jackett.Updater/Program.cs index 44fe7a5c1..ee26d394f 100644 --- a/src/Jackett.Updater/Program.cs +++ b/src/Jackett.Updater/Program.cs @@ -254,6 +254,7 @@ namespace Jackett.Updater "CurlSharp.dll", "CurlSharp.pdb", "Definitions/01torrent.yml", + "Definitions/2xfree.yml", "Definitions/24rolika.yml", "Definitions/32pages.yml", "Definitions/3evils.yml",