diff --git a/src/Jackett.Common/Definitions/dariustracker.yml b/src/Jackett.Common/Definitions/dariustracker.yml index c5aebca10..c4eaebdb7 100644 --- a/src/Jackett.Common/Definitions/dariustracker.yml +++ b/src/Jackett.Common/Definitions/dariustracker.yml @@ -132,7 +132,7 @@ search: poster: selector: a.preview attribute: href - imdb: + imdbid: selector: a[href*="imdb.com/title/tt"] attribute: href files: diff --git a/src/Jackett.Common/Definitions/dark-shadow.yml b/src/Jackett.Common/Definitions/dark-shadow.yml index 72771a903..87d923202 100644 --- a/src/Jackett.Common/Definitions/dark-shadow.yml +++ b/src/Jackett.Common/Definitions/dark-shadow.yml @@ -214,14 +214,14 @@ search: poster: selector: div[id^="details"] img attribute: src - imdb: + imdbid: selector: a[href*="imdb.com/title/tt"] attribute: href size: selector: div.selection_unter_ad grabs: selector: div.selection_unter_ae - date: + date_day: # Heute 13:30:04 # Gestern 09:10:10 selector: div.selection_unter_ab:not(:contains(".")) @@ -233,7 +233,7 @@ search: args: ["Gestern", "Yesterday"] - name: append args: " +01:00" # CET - date: + date_year: # 30.02.2018 um 23:12:50 selector: div.selection_unter_ab:contains(".") optional: true @@ -244,9 +244,10 @@ search: args: " +01:00" # CET - name: dateparse args: "02.01.2006 15:04:05 -07:00" + date: + text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}" description: selector: selection_unter_af - optional: true seeders: selector: div.selection_unter_aa leechers: diff --git a/src/Jackett.Common/Definitions/demonoid.yml b/src/Jackett.Common/Definitions/demonoid.yml index 8c96a95ae..b0f89fa54 100644 --- a/src/Jackett.Common/Definitions/demonoid.yml +++ b/src/Jackett.Common/Definitions/demonoid.yml @@ -365,12 +365,14 @@ search: args: ["on ", ""] fields: - title: + title_default: selector: a[href^="/files/details/"] - title: + title_optional: selector: a[href^="/files/details/"] optional: true attribute: title + title: + text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}" category: selector: span.torrent__table-info > a:nth-child(2) attribute: href diff --git a/src/Jackett.Common/Definitions/desireleasers.yml b/src/Jackett.Common/Definitions/desireleasers.yml index e8f408dad..07e5b7cab 100644 --- a/src/Jackett.Common/Definitions/desireleasers.yml +++ b/src/Jackett.Common/Definitions/desireleasers.yml @@ -112,7 +112,7 @@ search: args: "&w=180&h=270" # for display on dashboard - name: replace args: ["https://images.weserv.nl/?url=https://via.placeholder.com/600x900&w=180&h=270", ""] - imdb: + imdbid: selector: a[href*="imdb.com/title/tt"] attribute: href tmdbid: diff --git a/src/Jackett.Common/Definitions/desitorrents.yml b/src/Jackett.Common/Definitions/desitorrents.yml index f7bdd6a9f..102258bd5 100644 --- a/src/Jackett.Common/Definitions/desitorrents.yml +++ b/src/Jackett.Common/Definitions/desitorrents.yml @@ -167,7 +167,6 @@ search: case: i[class*="fa-id-badge"]: 0 # 24 Hour FreeLeech From BON Store i[class*="fa-trophy"]: 0 # Special FreeLeech For Certain User Groups - i[class*="fa-star"]: 0 # Freeleech From Token i[class*="fa-coins"]: 0 # Freeleech From Token i[class*="fa-globe"]: 0 # Global Freeleech i[class*="fa-star"]: 0 # Freeleech diff --git a/src/Jackett.Common/Definitions/devilsplayground.yml b/src/Jackett.Common/Definitions/devilsplayground.yml index cdfb677fd..7a97bbfbb 100644 --- a/src/Jackett.Common/Definitions/devilsplayground.yml +++ b/src/Jackett.Common/Definitions/devilsplayground.yml @@ -120,15 +120,15 @@ search: filters: - name: querystring args: category - a_title: + title_default: # is often abbreviated selector: a[href*="details.php?id="] - d_title: + title_optional: # usually longer than details title selector: div[id^="port-content-"] div optional: true title: - text: "{{ if .Result.d_title }}{{ .Result.d_title }}{{ else }}{{ .Result.a_title }}{{ end }}" + text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}" details: selector: a[href*="details.php?id="] attribute: href diff --git a/src/Jackett.Common/Definitions/discfan.yml b/src/Jackett.Common/Definitions/discfan.yml index 3aef824b6..528e940b0 100644 --- a/src/Jackett.Common/Definitions/discfan.yml +++ b/src/Jackett.Common/Definitions/discfan.yml @@ -113,12 +113,14 @@ search: filters: - name: querystring args: cat - title: + title_default: selector: a[href^="details.php?id="] - title: + title_optional: optional: true selector: a[title][href^="details.php?id="] attribute: title + title: + text: "{{ if .Result.title_optional }}{{ .Result.title_optional }}{{ else }}{{ .Result.title_default }}{{ end }}" details: selector: a[href^="details.php?id="] attribute: href @@ -128,7 +130,7 @@ search: imdb: selector: a[href*="imdb.com/title/tt"] attribute: href - date: + date_elapsed: # time type: time elapsed (default) selector: td:nth-child(4) > span[title] attribute: title @@ -138,7 +140,7 @@ search: args: " +08:00" # CST - name: dateparse args: "2006-01-02 15:04:05 -07:00" - date: + date_added: # time added selector: td:nth-child(4):not(:has(span)) optional: true @@ -147,6 +149,8 @@ search: args: " +08:00" # CST - name: dateparse args: "2006-01-0215:04:05 -07:00" + 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: diff --git a/src/Jackett.Common/Definitions/divteam.yml b/src/Jackett.Common/Definitions/divteam.yml index 985e14be8..8e438d797 100644 --- a/src/Jackett.Common/Definitions/divteam.yml +++ b/src/Jackett.Common/Definitions/divteam.yml @@ -116,13 +116,13 @@ search: download: selector: a[href^="download.php?id="] attribute: href - title: + title_vose: selector: a[href^="index.php?page=torrent-details"][onmouseover]:contains("VOSE") optional: true filters: - name: append args: " English" - title: + title_notvose: selector: a[href^="index.php?page=torrent-details"][onmouseover]:not(:contains("VOSE")) optional: true filters: @@ -136,6 +136,8 @@ search: args: ["UHDRip", "Bluray-2160p"] # Fix for Radarr - name: replace args: ["2160p BDRip", "Bluray-2160p"] # Fix for Radarr + title: + text: "{{ if .Result.title_vose }}{{ .Result.title_vose }}{{ else }}{{ .Result.title_notvose }}{{ end }}" poster: selector: a[onmouseover][href^="index.php?page=torrent-details"] attribute: onmouseover diff --git a/src/Jackett.Common/Definitions/dragonworldreloaded.yml b/src/Jackett.Common/Definitions/dragonworldreloaded.yml index 15437f9a2..862dbc7a1 100644 --- a/src/Jackett.Common/Definitions/dragonworldreloaded.yml +++ b/src/Jackett.Common/Definitions/dragonworldreloaded.yml @@ -192,7 +192,7 @@ search: selector: div.selection_unter_aa leechers: selector: div.selection_unter_aaa - date: + date_day: # Heute 13:30:04 # Gestern 09:10:10 selector: div.selection_unter_ab:not(:contains(".")) @@ -202,7 +202,7 @@ search: args: ["Heute", "Today"] - name: replace args: ["Gestern", "Yesterday"] - date: + date_year: # 30.02.2018 um 23:12:50 selector: div.selection_unter_ab:contains(".") optional: true @@ -213,9 +213,10 @@ search: args: " +01:00" # CET - name: dateparse args: "02.01.2006 15:04:05 -07:00" + date: + text: "{{ if or .Result.date_year .Result.date_day }}{{ or .Result.date_year .Result.date_day }}{{ else }}now{{ end }}" description: selector: selection_unter_af - optional: true downloadvolumefactor: case: ":root:has(div.onlyup)": 0