mirror
/
Jackett
mirror of https://github.com/Jackett/Jackett
1
0
Fork 0
Code Issues Releases Wiki Activity

core: add infohash parameter in cardigann definition (#10091) 

* core: add infohash parameter in cardigann definition

#8590 #10087

* linuxtracker: refresh categories

add date TZ
code tidy
This commit is contained in:
Diego Heras 2020-11-03 21:45:02 +01:00 committed by GitHub
parent ca165b9b45
commit f10d132e54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/Jackett.Common/Definitions/linuxtracker.yml
View File

@ -17,6 +17,7 @@ caps:
- {id: 2012, cat: PC/ISO, desc: "AV Linux"}
- {id: 13, cat: PC/ISO, desc: "Absolute"}
- {id: 2003, cat: PC/ISO, desc: "Alpine Linux"}
- {id: 2292, cat: PC/ISO, desc: "Anarchy Linux"}
- {id: 2005, cat: PC/ISO, desc: "Android x86"}
- {id: 2006, cat: PC/ISO, desc: "Antergos"}
- {id: 2007, cat: PC/ISO, desc: "AntiX"}
@ -68,14 +69,12 @@ caps:
- {id: 2273, cat: PC/ISO, desc: "Cryptocurrency OS"}
- {id: 2245, cat: PC/ISO, desc: "Cucumber Linux"}
- {id: 2285, cat: PC/ISO, desc: "DRBL Live"}
- {id: 123, cat: PC/ISO, desc: "Damnsmall"}
- {id: 128, cat: PC/ISO, desc: "Debian"}
- {id: 131, cat: PC/ISO, desc: "Deepin"}
- {id: 2038, cat: PC/ISO, desc: "Deft"}
- {id: 2192, cat: PC/ISO, desc: "Devuan"}
- {id: 2287, cat: PC/ISO, desc: "Doge Linux"}
- {id: 144, cat: PC/ISO, desc: "DragonFly BSD"}
- {id: 2215, cat: PC/ISO, desc: "Dragora GNU/Linux"}
- {id: 2226, cat: PC/ISO, desc: "DuZeru OS"}
- {id: 148, cat: PC/ISO, desc: "Dynebolic"}
- {id: 2261, cat: PC/ISO, desc: "Eagle Mode"}
@ -86,7 +85,6 @@ caps:
- {id: 2041, cat: PC/ISO, desc: "Elementary OS"}
- {id: 161, cat: PC/ISO, desc: "Elive"}
- {id: 2042, cat: PC/ISO, desc: "Emmabuntus"}
- {id: 2231, cat: PC/ISO, desc: "Emmi OS"}
- {id: 2278, cat: PC/ISO, desc: "EndeavourOS"}
- {id: 164, cat: PC/ISO, desc: "Endian"}
- {id: 2179, cat: PC/ISO, desc: "Endless OS"}
@ -122,6 +120,7 @@ caps:
- {id: 2276, cat: PC/ISO, desc: "Hanthana Linux"}
- {id: 2186, cat: PC/ISO, desc: "HardenedBSD"}
- {id: 2200, cat: PC/ISO, desc: "Heads"}
- {id: 2293, cat: PC/ISO, desc: "Hiren's BootCD+PE"}
- {id: 2166, cat: PC/ISO, desc: "Huayra Linux"}
- {id: 2244, cat: PC/ISO, desc: "Hyperbola GNU"}
- {id: 252, cat: PC/ISO, desc: "IPFire"}
@ -133,7 +132,6 @@ caps:
- {id: 2054, cat: PC/ISO, desc: "Kolibri"}
- {id: 287, cat: PC/ISO, desc: "Kubuntu"}
- {id: 2057, cat: PC/ISO, desc: "Kwort Linux"}
- {id: 2058, cat: PC/ISO, desc: "Kxstudio"}
- {id: 2068, cat: PC/ISO, desc: "LXLE"}
- {id: 2258, cat: PC/ISO, desc: "Lakka"}
- {id: 2176, cat: PC/ISO, desc: "LibreELEC"}
@ -147,7 +145,6 @@ caps:
- {id: 2063, cat: PC/ISO, desc: "Linuxfx"}
- {id: 2064, cat: PC/ISO, desc: "Liquid Lemur"}
- {id: 2191, cat: PC/ISO, desc: "Live Raizo"}
- {id: 316, cat: PC/ISO, desc: "Livecd"}
- {id: 1218, cat: PC/ISO, desc: "Lubuntu"}
- {id: 2163, cat: PC/ISO, desc: "MOFO Linux"}
- {id: 2177, cat: PC/ISO, desc: "MX Linux"}
@ -158,10 +155,8 @@ caps:
- {id: 2075, cat: PC/ISO, desc: "Minino"}
- {id: 2076, cat: PC/ISO, desc: "Minix"}
- {id: 2241, cat: PC/ISO, desc: "MorpheusArch Linux"}
- {id: 369, cat: PC/ISO, desc: "Musix"}
- {id: 373, cat: PC/ISO, desc: "Mythbuntu"}
- {id: 2078, cat: PC/ISO, desc: "NAS4Free"}
- {id: 2217, cat: PC/ISO, desc: "Namib GNU/Linux"}
- {id: 2079, cat: PC/ISO, desc: "Neptune"}
- {id: 380, cat: PC/ISO, desc: "NetBSD"}
- {id: 2080, cat: PC/ISO, desc: "Nethserver"}
@ -182,7 +177,6 @@ caps:
- {id: 2089, cat: PC/ISO, desc: "Openelec"}
- {id: 2092, cat: PC/ISO, desc: "Openmediavault"}
- {id: 2093, cat: PC/ISO, desc: "Opensuse"}
- {id: 2291, cat: PC/ISO, desc: "Opensuse"}
- {id: 1237, cat: PC/ISO, desc: "Oracle Linux"}
- {id: 4, cat: PC/ISO, desc: "Other distros"}
- {id: 2218, cat: PC/ISO, desc: "OviOS Linux"}
@ -225,6 +219,7 @@ caps:
- {id: 2274, cat: PC/ISO, desc: "Redcore Linux"}
- {id: 458, cat: PC/ISO, desc: "Redhat"}
- {id: 2202, cat: PC/ISO, desc: "Refracta"}
- {id: 2291, cat: PC/ISO, desc: "RegataOS"}
- {id: 2114, cat: PC/ISO, desc: "Rescatux"}
- {id: 2270, cat: PC/ISO, desc: "Resilient Linux"}
- {id: 2116, cat: PC/ISO, desc: "Robolinux"}
@ -249,19 +244,16 @@ caps:
- {id: 506, cat: PC/ISO, desc: "Sms"}
- {id: 2126, cat: PC/ISO, desc: "Solus"}
- {id: 2127, cat: PC/ISO, desc: "Solydxk"}
- {id: 2127, cat: PC/ISO, desc: "Solydxk"}
- {id: 1236, cat: PC/ISO, desc: "SparkyLinux"}
- {id: 2225, cat: PC/ISO, desc: "Star"}
- {id: 2132, cat: PC/ISO, desc: "Steamos"}
- {id: 2174, cat: PC/ISO, desc: "Super Grub2 Disk"}
- {id: 531, cat: PC/ISO, desc: "Super Grub2 Disk"}
- {id: 2134, cat: PC/ISO, desc: "SuperX"}
- {id: 2189, cat: PC/ISO, desc: "SwagArch"}
- {id: 2267, cat: PC/ISO, desc: "Symphony OS"}
- {id: 2135, cat: PC/ISO, desc: "SystemRescueCD"}
- {id: 2188, cat: PC/ISO, desc: "TENS"}
- {id: 2136, cat: PC/ISO, desc: "Tails"}
- {id: 2170, cat: PC/ISO, desc: "TalkingArch"}
- {id: 542, cat: PC/ISO, desc: "Thinstation"}
- {id: 2279, cat: PC/ISO, desc: "TinyPaw Linux"}
- {id: 2138, cat: PC/ISO, desc: "Tinycore"}
@ -292,7 +284,6 @@ caps:
- {id: 2281, cat: PC/ISO, desc: "Web Security Dojo"}
- {id: 2246, cat: PC/ISO, desc: "Whonix"}
- {id: 2155, cat: PC/ISO, desc: "Wifislax"}
- {id: 2229, cat: PC/ISO, desc: "XiVa Studio"}
- {id: 2251, cat: PC/ISO, desc: "XigmaNAS"}
- {id: 607, cat: PC/ISO, desc: "Xubuntu"}
- {id: 612, cat: PC/ISO, desc: "Zen"}
@ -339,7 +330,7 @@ search:
by: "{{ .Config.type }}"
rows:
selector: table.lista[width="100%"] > tbody > tr:has(a[href^="magnet:?xt="]):has(a[href^="index.php?page=torrents&category="])
selector: table.lista[width="100%"] > tbody > tr:has(a[href^="index.php?page=torrents&category="])
fields:
category:
@ -353,21 +344,12 @@ search:
details:
selector: a[href^="index.php?page=torrent-details&id="][title]
attribute: href
magnet-hash:
infohash: # magnet link is auto generated from infohash
selector: a[href^="index.php?page=torrent-details&id="][title]
attribute: href
filters:
- name: querystring
args: id
magnet-name:
selector: a[href^="index.php?page=torrent-details&id="][title]
attribute: title
filters:
- name: replace
args: ["View details: ", ""]
- name: validfilename
download:
text: "magnet:?xt=urn:btih:{{ .Result.magnet-hash}}&dn={{ .Result.magnet-name}}&tr=udp://tracker.coppersurfer.tk:6969/announce&tr=udp://tracker.leechers-paradise.org:6969/announce&tr=udp://open.stealth.si:80/announce&tr=udp://exodus.desync.com:6969&tr=udp://p4p.arenabg.com:1337/announce&tr=udp://explodie.org:6969/announce&tr=udp://tracker.opentrackr.org:1337/announce&tr=udp://tracker.tiny-vps.com:6969/announce&tr=udp://open.demonii.si:1337/announce&tr=udp://tracker.torrent.eu.org:451/announce&tr=udp://tracker.pirateparty.gr:6969/announce&tr=udp://ipv4.tracker.harry.lu:80/announce&tr=udp://tracker.cyberia.is:6969/announce&tr=udp://9.rarbg.to:2710/announce&tr=udp://denis.stalker.upeer.me:6969/announce"
banner:
selector: img[src*="/images/categories/"]
attribute: src
@ -375,8 +357,10 @@ search:
selector: td:nth-child(2) > table > tbody > tr > td
remove: strong
filters:
- name: append
args: " -07:00" # PDT
- name: dateparse
args: "02/01/2006"
args: "02/01/2006 -07:00"
size:
selector: td:nth-child(2) > table > tbody > tr:nth-child(2) > td
remove: strong

4
src/Jackett.Common/Indexers/CardigannIndexer.cs
View File

@ -1442,7 +1442,6 @@ namespace Jackett.Common.Indexers
if (value.StartsWith("magnet:"))
{
release.MagnetUri = new Uri(value);
//release.Link = release.MagnetUri;
value = release.MagnetUri.ToString();
}
else
@ -1458,6 +1457,9 @@ namespace Jackett.Common.Indexers
if (release.Guid == null)
release.Guid = magnetUri;
break;
case "infohash":
release.InfoHash = value;
break;
case "details":
var url = resolvePath(value, searchUrlUri);
release.Guid = url;