diff --git a/src/Jackett.Common/Definitions/yggcookie.yml b/src/Jackett.Common/Definitions/yggcookie.yml index 8444bea2e..d7ddb06d0 100644 --- a/src/Jackett.Common/Definitions/yggcookie.yml +++ b/src/Jackett.Common/Definitions/yggcookie.yml @@ -7,7 +7,7 @@ type: semi-private encoding: UTF-8 followredirect: true links: - - https://www2.yggtorrent.si/ + - https://www4.yggtorrent.li/ legacylinks: - https://yggtorrent.com/ - https://ww1.yggtorrent.com/ @@ -37,6 +37,7 @@ legacylinks: - https://ww3.yggtorrent.si/ - https://yggtorrent.si/ - http://www2.yggtorrent.si/ + - https://www2.yggtorrent.si/ caps: categorymappings: @@ -157,10 +158,6 @@ settings: type: checkbox label: Enhance sonarr compatibility with anime by renaming episode (xxx to exxx). Works only if episode is at the end of the query. Can disturb movies search. (back to the future 3 -> back to the future e3) default: false - - name: betasearchengine - type: checkbox - label: "Use Beta Search engine URL (Less restrictive) / SonarrV3 Full Series Search NEW" - default: false - name: sort type: select label: Sort requested from site @@ -213,10 +210,10 @@ search: args: [" ", " "] - name: trim paths: - - path: "{{ if .Config.betasearchengine }}new_search{{ else }}engine{{ end }}/search?category={{ .Config.category }}&name={{ if .Config.betasearchengine }}{{ .Keywords }}{{ else }}{{ re_replace .Keywords \"\\b[^\\s]+\\b\" \"\"$&\"\"}}{{ end }}&description=&file=&uploader=&sub_category=&do=search&order={{ .Config.type }}&sort={{ .Config.sort }}" + - path: "engine/search?category={{ .Config.category }}&name={{ .Keywords }}&description=&file=&uploader=&sub_category=&do=search&order={{ .Config.type }}&sort={{ .Config.sort }}" followredirect: true # Saison Word - - path: "{{ if .Config.betasearchengine }}new_search{{ else }}engine{{ end }}/search?category={{ .Config.category }}&name={{ if .Keywords }}{{ re_replace .Keywords \"[sS]0(\\d{1,2})\" \"Saison.$1\"}}{{ else }}&page=50{{ end }}&description=&file=&uploader=&sub_category=&do=search&order={{ .Config.type }}&sort={{ .Config.sort }}" + - path: "engine/search?category={{ .Config.category }}&name={{ if .Keywords }}{{ re_replace .Keywords \"[sS]0(\\d{1,2})\" \"Saison.$1\"}}{{ else }}&page=50{{ end }}&description=&file=&uploader=&sub_category=&do=search&order={{ .Config.type }}&sort={{ .Config.sort }}" followredirect: true rows: diff --git a/src/Jackett.Common/Definitions/yggtorrent.yml b/src/Jackett.Common/Definitions/yggtorrent.yml index 9d45acea0..929497a95 100644 --- a/src/Jackett.Common/Definitions/yggtorrent.yml +++ b/src/Jackett.Common/Definitions/yggtorrent.yml @@ -7,7 +7,7 @@ type: semi-private encoding: UTF-8 followredirect: true links: - - https://www2.yggtorrent.si/ + - https://www4.yggtorrent.li/ legacylinks: - https://yggtorrent.com/ - https://ww1.yggtorrent.com/ @@ -37,6 +37,7 @@ legacylinks: - https://ww3.yggtorrent.si/ - https://yggtorrent.si/ - http://www2.yggtorrent.si/ + - https://www2.yggtorrent.si/ caps: categorymappings: @@ -148,10 +149,6 @@ settings: type: checkbox label: Enhance sonarr compatibility with anime by renaming episode (xxx to exxx). Works only if episode is at the end of the query. Can disturb movies search. (back to the future 3 -> back to the future e3) default: false - - name: betasearchengine - type: checkbox - label: "Use Beta Search engine URL (Less restrictive) / SonarrV3 Full Series Search NEW" - default: false - name: sort type: select label: Sort requested from site @@ -221,10 +218,10 @@ search: args: [" ", " "] - name: trim paths: - - path: "{{ if .Config.betasearchengine }}new_search{{ else }}engine{{ end }}/search?category={{ .Config.category }}&name={{ if .Config.betasearchengine }}{{ .Keywords }}{{ else }}{{ re_replace .Keywords \"\\b[^\\s]+\\b\" \"\"$&\"\"}}{{ end }}&description=&file=&uploader=&sub_category=&do=search&order={{ .Config.type }}&sort={{ .Config.sort }}" + - path: "engine/search?category={{ .Config.category }}&name={{ .Keywords }}&description=&file=&uploader=&sub_category=&do=search&order={{ .Config.type }}&sort={{ .Config.sort }}" followredirect: true # Saison Word - - path: "{{ if .Config.betasearchengine }}new_search{{ else }}engine{{ end }}/search?category={{ .Config.category }}&name={{ if .Keywords }}{{ re_replace .Keywords \"[sS]0(\\d{1,2})\" \"Saison.$1\"}}{{ else }}&page=50{{ end }}&description=&file=&uploader=&sub_category=&do=search&order={{ .Config.type }}&sort={{ .Config.sort }}" + - path: "engine/search?category={{ .Config.category }}&name={{ if .Keywords }}{{ re_replace .Keywords \"[sS]0(\\d{1,2})\" \"Saison.$1\"}}{{ else }}&page=50{{ end }}&description=&file=&uploader=&sub_category=&do=search&order={{ .Config.type }}&sort={{ .Config.sort }}" followredirect: true rows: