From ffbeafcabe9dcfb166c48db36b666ef7add9d3b4 Mon Sep 17 00:00:00 2001 From: rraymondgh Date: Sat, 18 Jan 2025 09:49:39 +0000 Subject: [PATCH 1/6] bitmagnet update --- definitions/v10/bitmagnet.yml | 107 ++++++++++++++++++++++++++++++---- 1 file changed, 95 insertions(+), 12 deletions(-) diff --git a/definitions/v10/bitmagnet.yml b/definitions/v10/bitmagnet.yml index eb06d0cae..c6344b46b 100644 --- a/definitions/v10/bitmagnet.yml +++ b/definitions/v10/bitmagnet.yml @@ -8,6 +8,52 @@ encoding: UTF-8 links: - http://127.0.0.1:3333/ - http://bitmagnet:3333/ + - http://192.168.1.2:3333/ + - http://192.168.1.3:3333/ + - http://192.168.1.4:3333/ + - http://192.168.1.5:3333/ + - http://192.168.1.6:3333/ + - http://192.168.1.7:3333/ + - http://192.168.1.8:3333/ + - http://192.168.1.9:3333/ + - http://192.168.1.10:3333/ + - http://192.168.1.11:3333/ + - http://192.168.1.12:3333/ + - http://192.168.1.13:3333/ + - http://192.168.1.14:3333/ + - http://192.168.1.15:3333/ + - http://192.168.1.16:3333/ + - http://192.168.1.17:3333/ + - http://192.168.1.18:3333/ + - http://192.168.1.19:3333/ + - http://192.168.1.20:3333/ + - http://192.168.1.21:3333/ + - http://192.168.1.22:3333/ + - http://192.168.1.23:3333/ + - http://192.168.1.24:3333/ + - http://10.0.1.2:3333/ + - http://10.0.1.3:3333/ + - http://10.0.1.4:3333/ + - http://10.0.1.5:3333/ + - http://10.0.1.6:3333/ + - http://10.0.1.7:3333/ + - http://10.0.1.8:3333/ + - http://10.0.1.9:3333/ + - http://10.0.1.10:3333/ + - http://10.0.1.11:3333/ + - http://10.0.1.12:3333/ + - http://10.0.1.13:3333/ + - http://10.0.1.14:3333/ + - http://10.0.1.15:3333/ + - http://10.0.1.16:3333/ + - http://10.0.1.17:3333/ + - http://10.0.1.18:3333/ + - http://10.0.1.19:3333/ + - http://10.0.1.20:3333/ + - http://10.0.1.21:3333/ + - http://10.0.1.22:3333/ + - http://10.0.1.23:3333/ + - http://10.0.1.24:3333/ caps: categorymappings: @@ -57,26 +103,63 @@ search: rows: selector: rss > channel > item - + fields: - categorydesc: - selector: category + _guid: + selector: guid title: selector: title details: - text: / + text: "/webui/torrents/permalink/{{ .Result._guid }}" date: selector: pubDate - infohash: - selector: guid size: selector: size + infohash: + selector: attr[name="infohash"] + attribute: value + category: + selector: attr[name="category"] + attribute: value + size: + selector: attr[name="size"] + attribute: value seeders: - text: 1 + selector: attr[name="seeders"] + attribute: value leechers: - text: 1 - downloadvolumefactor: - text: 0 - uploadvolumefactor: - text: 1 + selector: attr[name="peers"] + attribute: value + files: + selector: attr[name="files"] + attribute: value + year: + selector: attr[name="year"] + attribute: value + imdb: + selector: attr[name="imdb"] + attribute: value + + # attributes generated by bitmagnet with no target prowlarr attribute + # magneturl: + # selector: attr[name="magneturl"] + # attribute: value + # publishdate: + # selector: attr[name="publishdate"] + # attribute: value + # season: + # selector: attr[name="season"] + # attribute: value + # episode: + # selector: attr[name="episode"] + # attribute: value + # video: + # selector: attr[name="video"] + # attribute: value + # resolution: + # selector: attr[name="resolution"] + # attribute: value + # team: + # selector: attr[name="team"] + # attribute: value # torznab xml From 68fdc9e2e2272e5a87c13de9fa17f8dfb1e769f2 Mon Sep 17 00:00:00 2001 From: rraymondgh <42769112+rraymondgh@users.noreply.github.com> Date: Sat, 18 Jan 2025 11:37:35 +0000 Subject: [PATCH 2/6] prepend Co-authored-by: Bogdan --- definitions/v10/bitmagnet.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/definitions/v10/bitmagnet.yml b/definitions/v10/bitmagnet.yml index c6344b46b..9921ec294 100644 --- a/definitions/v10/bitmagnet.yml +++ b/definitions/v10/bitmagnet.yml @@ -110,7 +110,10 @@ search: title: selector: title details: - text: "/webui/torrents/permalink/{{ .Result._guid }}" + selector: guid + filters: + - name: prepend + args: "/webui/torrents/permalink/" date: selector: pubDate size: From 1c2c120a5e9e38b3d0f0d9c126a8db80731e6d74 Mon Sep 17 00:00:00 2001 From: rraymondgh <42769112+rraymondgh@users.noreply.github.com> Date: Sat, 18 Jan 2025 11:38:06 +0000 Subject: [PATCH 3/6] not needed with prepend Co-authored-by: Bogdan --- definitions/v10/bitmagnet.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/definitions/v10/bitmagnet.yml b/definitions/v10/bitmagnet.yml index 9921ec294..b1c5a6486 100644 --- a/definitions/v10/bitmagnet.yml +++ b/definitions/v10/bitmagnet.yml @@ -105,8 +105,6 @@ search: selector: rss > channel > item fields: - _guid: - selector: guid title: selector: title details: From d53689b81139bd56ce7a9322ddff2f084400626a Mon Sep 17 00:00:00 2001 From: rraymondgh <42769112+rraymondgh@users.noreply.github.com> Date: Sat, 18 Jan 2025 11:38:33 +0000 Subject: [PATCH 4/6] whitespace cleanup Co-authored-by: Bogdan --- definitions/v10/bitmagnet.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/definitions/v10/bitmagnet.yml b/definitions/v10/bitmagnet.yml index b1c5a6486..ee82f88a1 100644 --- a/definitions/v10/bitmagnet.yml +++ b/definitions/v10/bitmagnet.yml @@ -103,7 +103,6 @@ search: rows: selector: rss > channel > item - fields: title: selector: title From 942b1e90846e330c99a43909d31ed9affc4f1761 Mon Sep 17 00:00:00 2001 From: rraymondgh Date: Sat, 18 Jan 2025 17:56:30 +0000 Subject: [PATCH 5/6] "prettier" applied as linter --- definitions/v10/bitmagnet.yml | 43 ++++++++++++++++------------------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/definitions/v10/bitmagnet.yml b/definitions/v10/bitmagnet.yml index ee82f88a1..86ade22db 100644 --- a/definitions/v10/bitmagnet.yml +++ b/definitions/v10/bitmagnet.yml @@ -57,25 +57,25 @@ links: caps: categorymappings: - - {id: 2000, cat: Movies, desc: "movie"} - - {id: 2030, cat: Movies/SD, desc: "movie_sd"} # unverified - - {id: 2040, cat: Movies/HD, desc: "movie_hd"} # unverified - - {id: 2045, cat: Movies/UHD, desc: "movie_uhd"} # unverified - - {id: 2060, cat: Movies/3D, desc: "movie_3d"} # unverified - - {id: 3000, cat: Audio, desc: "music"} - - {id: 3030, cat: Audio/Audiobook, desc: "audiobook"} - - {id: 4000, cat: PC, desc: "software"} - - {id: 4050, cat: PC/Games, desc: "game"} # unverified - - {id: 5000, cat: TV, desc: "tv_show"} - - {id: 5030, cat: TV/SD, desc: "tv_show_sd"} # unverified - - {id: 5040, cat: TV/HD, desc: "tv_show_hd"} # unverified - - {id: 5045, cat: TV/UHD, desc: "tv_show_uhd"} # unverified - - {id: 6000, cat: XXX, desc: "xxx"} - - {id: 6070, cat: XXX/Other, desc: "xxx_other"} # unverified - - {id: 7000, cat: Books, desc: "book"} # unverified - - {id: 7020, cat: Books/EBook, desc: "ebook"} - - {id: 7030, cat: Books/Comics, desc: "comic"} - - {id: 8000, cat: Other, desc: "Unknown"} + - { id: 2000, cat: Movies, desc: "movie" } + - { id: 2030, cat: Movies/SD, desc: "movie_sd" } # unverified + - { id: 2040, cat: Movies/HD, desc: "movie_hd" } # unverified + - { id: 2045, cat: Movies/UHD, desc: "movie_uhd" } # unverified + - { id: 2060, cat: Movies/3D, desc: "movie_3d" } # unverified + - { id: 3000, cat: Audio, desc: "music" } + - { id: 3030, cat: Audio/Audiobook, desc: "audiobook" } + - { id: 4000, cat: PC, desc: "software" } + - { id: 4050, cat: PC/Games, desc: "game" } # unverified + - { id: 5000, cat: TV, desc: "tv_show" } + - { id: 5030, cat: TV/SD, desc: "tv_show_sd" } # unverified + - { id: 5040, cat: TV/HD, desc: "tv_show_hd" } # unverified + - { id: 5045, cat: TV/UHD, desc: "tv_show_uhd" } # unverified + - { id: 6000, cat: XXX, desc: "xxx" } + - { id: 6070, cat: XXX/Other, desc: "xxx_other" } # unverified + - { id: 7000, cat: Books, desc: "book" } # unverified + - { id: 7020, cat: Books/EBook, desc: "ebook" } + - { id: 7030, cat: Books/Comics, desc: "comic" } + - { id: 8000, cat: Other, desc: "Unknown" } modes: search: [q] @@ -94,7 +94,7 @@ search: inputs: t: "{{ .Query.Type }}" q: "{{ .Keywords }}" - cat: "{{ join .Categories \",\" }}" + cat: '{{ join .Categories "," }}' imdbId: "{{ .Query.IMDBIDShort }}" tmdbId: "{{ .Query.TMDBID }}" season: "{{ .Query.Season }}" @@ -121,9 +121,6 @@ search: category: selector: attr[name="category"] attribute: value - size: - selector: attr[name="size"] - attribute: value seeders: selector: attr[name="seeders"] attribute: value From aed90b759ea19765265801d81467729d38cf0e4e Mon Sep 17 00:00:00 2001 From: rraymondgh Date: Sun, 19 Jan 2025 09:58:26 +0000 Subject: [PATCH 6/6] yamllint as linter --- definitions/v10/bitmagnet.yml | 44 ++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/definitions/v10/bitmagnet.yml b/definitions/v10/bitmagnet.yml index 86ade22db..7c1413964 100644 --- a/definitions/v10/bitmagnet.yml +++ b/definitions/v10/bitmagnet.yml @@ -57,25 +57,25 @@ links: caps: categorymappings: - - { id: 2000, cat: Movies, desc: "movie" } - - { id: 2030, cat: Movies/SD, desc: "movie_sd" } # unverified - - { id: 2040, cat: Movies/HD, desc: "movie_hd" } # unverified - - { id: 2045, cat: Movies/UHD, desc: "movie_uhd" } # unverified - - { id: 2060, cat: Movies/3D, desc: "movie_3d" } # unverified - - { id: 3000, cat: Audio, desc: "music" } - - { id: 3030, cat: Audio/Audiobook, desc: "audiobook" } - - { id: 4000, cat: PC, desc: "software" } - - { id: 4050, cat: PC/Games, desc: "game" } # unverified - - { id: 5000, cat: TV, desc: "tv_show" } - - { id: 5030, cat: TV/SD, desc: "tv_show_sd" } # unverified - - { id: 5040, cat: TV/HD, desc: "tv_show_hd" } # unverified - - { id: 5045, cat: TV/UHD, desc: "tv_show_uhd" } # unverified - - { id: 6000, cat: XXX, desc: "xxx" } - - { id: 6070, cat: XXX/Other, desc: "xxx_other" } # unverified - - { id: 7000, cat: Books, desc: "book" } # unverified - - { id: 7020, cat: Books/EBook, desc: "ebook" } - - { id: 7030, cat: Books/Comics, desc: "comic" } - - { id: 8000, cat: Other, desc: "Unknown" } + - {id: 2000, cat: Movies, desc: "movie"} + - {id: 2030, cat: Movies/SD, desc: "movie_sd"} # unverified + - {id: 2040, cat: Movies/HD, desc: "movie_hd"} # unverified + - {id: 2045, cat: Movies/UHD, desc: "movie_uhd"} # unverified + - {id: 2060, cat: Movies/3D, desc: "movie_3d"} # unverified + - {id: 3000, cat: Audio, desc: "music"} + - {id: 3030, cat: Audio/Audiobook, desc: "audiobook"} + - {id: 4000, cat: PC, desc: "software"} + - {id: 4050, cat: PC/Games, desc: "game"} # unverified + - {id: 5000, cat: TV, desc: "tv_show"} + - {id: 5030, cat: TV/SD, desc: "tv_show_sd"} # unverified + - {id: 5040, cat: TV/HD, desc: "tv_show_hd"} # unverified + - {id: 5045, cat: TV/UHD, desc: "tv_show_uhd"} # unverified + - {id: 6000, cat: XXX, desc: "xxx"} + - {id: 6070, cat: XXX/Other, desc: "xxx_other"} # unverified + - {id: 7000, cat: Books, desc: "book"} # unverified + - {id: 7020, cat: Books/EBook, desc: "ebook"} + - {id: 7030, cat: Books/Comics, desc: "comic"} + - {id: 8000, cat: Other, desc: "Unknown"} modes: search: [q] @@ -136,8 +136,8 @@ search: imdb: selector: attr[name="imdb"] attribute: value - - # attributes generated by bitmagnet with no target prowlarr attribute + # yamllint disable rule:comments-indentation + # unmapped attributes # magneturl: # selector: attr[name="magneturl"] # attribute: value @@ -159,4 +159,6 @@ search: # team: # selector: attr[name="team"] # attribute: value + # yamllint enable rule:comments-indentation + # torznab xml