diff --git a/definitions/v10/52bt.yml b/definitions/v10/52bt.yml index 3265e0a78..f7699514b 100644 --- a/definitions/v10/52bt.yml +++ b/definitions/v10/52bt.yml @@ -82,16 +82,14 @@ search: selector: a[href^="magnet:?xt="] attribute: href date: - selector: div.sbar > span:contains("添加时间:") + selector: div.sbar > span:contains("添加时间:") > b filters: - - name: replace - args: ["添加时间:", ""] - name: append args: " +08:00" # CST - name: dateparse args: "yyyy-MM-dd zzz" size: - selector: div.sbar > span:contains("大小:") + selector: div.sbar > span:contains("大小:") > b seeders: text: 1 leechers: diff --git a/definitions/v10/gktorrent.yml b/definitions/v10/gktorrent.yml index f8b82870d..4f901b37d 100644 --- a/definitions/v10/gktorrent.yml +++ b/definitions/v10/gktorrent.yml @@ -7,7 +7,7 @@ type: public encoding: UTF-8 # to fetch current domain use https://www.protege-torrent.com/Gktorrent links: - - https://www.gktorrent.sk/ + - https://www.gktorrent.uno/ legacylinks: # latest domains list - https://www.rantop.org/ @@ -15,8 +15,6 @@ legacylinks: - https://www.protege-torrent.com/ - https://gktorrent.news/ # actual legacylinks - - https://gktorrent.nocensor.click/ - - https://www.gktorrent.ph/ - https://www.gktorrent.vc/ - https://www.gktorrent.mx/ - https://www.gktorrent.fi/ @@ -32,6 +30,7 @@ legacylinks: - https://www.gktorrent.pm/ - https://www.gktorrent.tw/ - https://www.gktorrent.in/ + - https://www.gktorrent.sk/ caps: categorymappings: diff --git a/definitions/v10/oxtorrent-vip.yml b/definitions/v10/oxtorrent-vip.yml index d23eab2ca..64b9df8eb 100644 --- a/definitions/v10/oxtorrent-vip.yml +++ b/definitions/v10/oxtorrent-vip.yml @@ -10,7 +10,7 @@ type: public encoding: UTF-8 # to fetch current domain use https://www.protege-torrent.com/Oxtorrent links: - - https://www.oxtorrent.uno/ + - https://www.oxtorrent.st/ legacylinks: - https://www.protege-liens.com/ # latest domains list @@ -34,6 +34,7 @@ legacylinks: - https://www.oxtorrent.vip/ - https://www.oxtorrent.lol/ - https://www.oxtorrent.la/ + - https://www.oxtorrent.uno/ caps: categorymappings: diff --git a/definitions/v10/rudub.yml b/definitions/v10/rudub.yml index 3e9dd68f3..7bd441ea6 100644 --- a/definitions/v10/rudub.yml +++ b/definitions/v10/rudub.yml @@ -9,10 +9,9 @@ type: semi-private encoding: windows-1251 followredirect: true links: - - https://09september.rudub.online/ + - https://10september.rudub.online/ legacylinks: - https://rudub.online/ - - https://10august.rudub.online/ - https://11august.rudub.online/ - https://12august.rudub.online/ - https://13august.rudub.online/ @@ -42,6 +41,7 @@ legacylinks: - https://06september.rudub.online/ - https://07september.rudub.online/ - https://08september.rudub.online/ + - https://09september.rudub.online/ caps: categorymappings: diff --git a/definitions/v11/oxtorrent-vip.yml b/definitions/v11/oxtorrent-vip.yml index d23eab2ca..64b9df8eb 100644 --- a/definitions/v11/oxtorrent-vip.yml +++ b/definitions/v11/oxtorrent-vip.yml @@ -10,7 +10,7 @@ type: public encoding: UTF-8 # to fetch current domain use https://www.protege-torrent.com/Oxtorrent links: - - https://www.oxtorrent.uno/ + - https://www.oxtorrent.st/ legacylinks: - https://www.protege-liens.com/ # latest domains list @@ -34,6 +34,7 @@ legacylinks: - https://www.oxtorrent.vip/ - https://www.oxtorrent.lol/ - https://www.oxtorrent.la/ + - https://www.oxtorrent.uno/ caps: categorymappings: diff --git a/definitions/v9/52bt.yml b/definitions/v9/52bt.yml index bc5f82375..a3e773ac5 100644 --- a/definitions/v9/52bt.yml +++ b/definitions/v9/52bt.yml @@ -84,16 +84,14 @@ search: selector: a[href^="magnet:?xt="] attribute: href date: - selector: div.sbar > span:contains("添加时间:") + selector: div.sbar > span:contains("添加时间:") > b filters: - - name: replace - args: ["添加时间:", ""] - name: append args: " +08:00" # CST - name: dateparse args: "yyyy-MM-dd zzz" size: - selector: div.sbar > span:contains("大小:") + selector: div.sbar > span:contains("大小:") > b seeders: text: 1 leechers: diff --git a/definitions/v9/gktorrent.yml b/definitions/v9/gktorrent.yml index 31946ae6c..7e20e9465 100644 --- a/definitions/v9/gktorrent.yml +++ b/definitions/v9/gktorrent.yml @@ -7,7 +7,7 @@ type: public encoding: UTF-8 # to fetch current domain use https://www.protege-torrent.com/Gktorrent links: - - https://www.gktorrent.sk/ + - https://www.gktorrent.uno/ legacylinks: # latest domains list - https://www.rantop.org/ @@ -15,8 +15,6 @@ legacylinks: - https://www.protege-torrent.com/ - https://gktorrent.news/ # actual legacylinks - - https://gktorrent.nocensor.click/ - - https://www.gktorrent.ph/ - https://www.gktorrent.vc/ - https://www.gktorrent.mx/ - https://www.gktorrent.fi/ @@ -32,6 +30,7 @@ legacylinks: - https://www.gktorrent.pm/ - https://www.gktorrent.tw/ - https://www.gktorrent.in/ + - https://www.gktorrent.sk/ caps: categorymappings: diff --git a/definitions/v9/glodls.yml b/definitions/v9/glodls.yml index 5c8b1f824..8723d291b 100644 --- a/definitions/v9/glodls.yml +++ b/definitions/v9/glodls.yml @@ -85,6 +85,7 @@ search: paths: # https://glodls.to/search_results.php?c1=1&c72=1&c41=1&search=blacklist+s07e05&cat=0&incldead=1&inclexternal=0&lang=0&sort=id&order=desc - path: search_results.php + allowEmptyInputs: true inputs: $raw: "{{ range .Categories }}c{{.}}=1&{{end}}" search: "{{ .Keywords }}" diff --git a/definitions/v9/magnetcat.yml b/definitions/v9/magnetcat.yml new file mode 100644 index 000000000..97b5e582f --- /dev/null +++ b/definitions/v9/magnetcat.yml @@ -0,0 +1,92 @@ +--- +id: magnetcat +name: Magnet Cat +description: "Magnet Cat is a Public Tracker for MOVIES / TV / GENERAL" +language: en-US +type: public +encoding: UTF-8 +links: + - https://magnetcatcat.com/ + +caps: + categorymappings: + - {id: 影视, cat: TV, desc: 影视} + - {id: 影视, cat: Movies, desc: 影视} + - {id: 音乐, cat: Audio, desc: 音乐} + - {id: 图像, cat: Other, desc: 图像} + - {id: 文档书籍, cat: Books, desc: 文档书籍} + - {id: 压缩文件, cat: Other, desc: 压缩文件} + - {id: 安装包, cat: PC, desc: 安装包} + - {id: 其他, cat: Other, desc: 其他} + + modes: + search: [q] + tv-search: [q, season, ep] + movie-search: [q] + music-search: [q] + book-search: [q] + +settings: + - name: cat-id + type: select + label: Category + default: 0 + options: + 0: All categories + 1: Movies and TV shows + 2: Music + 3: Images + 4: Documents and books + 5: Compressed files + 6: Installer packages + 7: Other + - name: sort + type: select + label: Sort requested from site + default: 2 + options: + 2: created + 1: size + 0: relevance + +search: + paths: + - path: "search-{{ if .Keywords }}{{ .Keywords }}{{ else }}{{ .Today.Year }}{{ end }}-{{ .Config.cat-id }}-{{ .Config.sort }}-1.html" + error: + - selector: :root:contains("Internal Server Error") + + rows: + selector: div.ssbox + + fields: + categorydesc: + selector: div.title > h3 > span + filters: + - name: re_replace + args: ["([\\[\\]]+)", ""] + title: + selector: a[href^="/hash/"] + details: + selector: a[href^="/hash/"] + attribute: href + magnet: + selector: a[href^="magnet:?xt="] + attribute: href + date: + selector: div.sbar > span:contains("Date added:") > b + filters: + - name: append + args: " +08:00" # CST + - name: dateparse + args: "yyyy-MM-dd zzz" + size: + selector: div.sbar > span:contains("Size:") > b + seeders: + text: 1 + leechers: + text: 1 + downloadvolumefactor: + text: 0 + uploadvolumefactor: + text: 1 +# engine n/a diff --git a/definitions/v9/oxtorrent-vip.yml b/definitions/v9/oxtorrent-vip.yml index 6f96005ef..1f7fc9880 100644 --- a/definitions/v9/oxtorrent-vip.yml +++ b/definitions/v9/oxtorrent-vip.yml @@ -7,7 +7,7 @@ type: public encoding: UTF-8 # to fetch current domain use https://www.protege-torrent.com/Oxtorrent links: - - https://www.oxtorrent.uno/ + - https://www.oxtorrent.st/ legacylinks: - https://www.protege-liens.com/ # latest domains list @@ -31,6 +31,7 @@ legacylinks: - https://www.oxtorrent.vip/ - https://www.oxtorrent.lol/ - https://www.oxtorrent.la/ + - https://www.oxtorrent.uno/ caps: categorymappings: diff --git a/definitions/v9/skipthecommercials-api.yml b/definitions/v9/privatesilverscreen-api.yml similarity index 87% rename from definitions/v9/skipthecommercials-api.yml rename to definitions/v9/privatesilverscreen-api.yml index c446fc1a7..42073835b 100644 --- a/definitions/v9/skipthecommercials-api.yml +++ b/definitions/v9/privatesilverscreen-api.yml @@ -1,22 +1,24 @@ --- -id: skipthecommercials-api -name: SkipTheCommercials (API) -description: "SkipTheCommercials (STC) is a Private Torrent Tracker for TV" +id: privatesilverscreen-api +name: PrivateSilverScreen (API) +description: "PrivateSilverScreen (PSS) is a Private tracker for MOVIES / TV / MUSIC" language: en-US type: private encoding: UTF-8 links: - - https://skipthecommericals.xyz/ + - https://privatesilverscreen.cc/ caps: categorymappings: - {id: 1, cat: Movies, desc: "Movies"} - - {id: 2, cat: TV, desc: "TV Show"} + - {id: 2, cat: TV, desc: "TV"} + - {id: 3, cat: Audio, desc: "Music"} modes: search: [q] tv-search: [q, season, ep, imdbid, tvdbid, tmdbid] movie-search: [q, imdbid, tmdbid] + music-search: [q] settings: - name: apikey @@ -25,7 +27,7 @@ settings: - name: info_key type: info label: About your API key - default: "Find or Generate a new API Token by accessing your SkipTheCommercials account My Settings page and clicking on the API Key tab." + default: "Find or Generate a new API Token by accessing your PrivateSilverScreen account My Settings page and clicking on the API Key tab." - name: freeleech type: checkbox label: Search freeleech only @@ -50,15 +52,10 @@ settings: options: desc: desc asc: asc - - name: info_activity - type: info - label: Account Inactivity - default: "You must be seeding at least 1 torrent or login once every 90 days to not get pruned. Once pruned, you will get additional 30 days to reactivate your account by logging in." login: path: /api/torrents method: get - inputs: {} # TODO: remove in v10 error: - selector: a[href*="/login"] message: @@ -182,4 +179,4 @@ search: minimumseedtime: # 7 days (as seconds = 7 x 24 x 60 x 60) text: 604800 -# json UNIT3D 8.1.3 +# json UNIT3D 8.2.0 diff --git a/definitions/v9/rudub.yml b/definitions/v9/rudub.yml index 02a81f31b..3e9caa16c 100644 --- a/definitions/v9/rudub.yml +++ b/definitions/v9/rudub.yml @@ -7,10 +7,9 @@ type: semi-private encoding: windows-1251 followredirect: true links: - - https://09september.rudub.online/ + - https://10september.rudub.online/ legacylinks: - https://rudub.online/ - - https://10august.rudub.online/ - https://11august.rudub.online/ - https://12august.rudub.online/ - https://13august.rudub.online/ @@ -40,6 +39,7 @@ legacylinks: - https://06september.rudub.online/ - https://07september.rudub.online/ - https://08september.rudub.online/ + - https://09september.rudub.online/ caps: categorymappings: