diff --git a/config.yml b/config.yml index 87b7cdd..e346f88 100644 --- a/config.yml +++ b/config.yml @@ -1,3 +1,4 @@ + variables: variables.yml schedules: - tasks: Lostfilm @@ -9,44 +10,39 @@ schedules: - tasks: Tapochek interval: minutes: 10 - - tasks: Kinozal - interval: - minutes: 10 templates: global: pathscrub: windows - deluge: - host: 172.17.0.1 - username: server - password: '2638' + transmission: + host: 172.17.0.2 tvshows: metainfo_series: yes trakt_lookup: yes - quality: 720p - deluge: - path: /mnt/sdb1/plex/TV Shows/{{series_name}}/Season {{series_season|pad(2)}} + quality: 1080p + transmission: + path: /downloads/plex/TV Shows/{{series_name}}/Season {{series_season|pad(2)}} exec: allow_background: yes auto_escape: yes on_exit: for_accepted: - - echo " `date +'%Y-%m-%d %H:%M:%S'` % {{task}} % ACCEPTED % {{series_name}} S{{series_season|pad(2)}}E{{series_episode}} {{quality}}" >> '{? path.a ?}' + - echo " `date +'%Y-%m-%d %H:%M:%S'`%{{task}}%{{series_name}} S{{series_season|pad(2)}}E{{series_episode}} {{quality}}" >> '{? path.a ?}' films: - deluge: - path: /mnt/sdb1/plex/Films/{{ movie_name }} ({{ movie_year }}) + transmission: + path: /downloads/plex/Films/{{ movie_name }} ({{ movie_year }}) trakt_lookup: account: _rik_ imdb_lookup: yes imdb: - min_score: 7 + min_score: 6 min_votes: 5000 - quality: 720p-1080p + quality: 1080p upgrade: tracking: yes - target: 1080p h265 + target: h265 list_match: remove_on_match: no from: @@ -59,12 +55,13 @@ templates: auto_escape: yes on_exit: for_accepted: - - echo " `date +'%Y-%m-%d %H:%M:%S'` % {{task}} % ACCEPTED % {{imdb_name}} ({{imdb_year}}) {{quality}}" >> '{? path.a ?}' + - echo " `date +'%Y-%m-%d %H:%M:%S'`%{{task}}%{{imdb_name}} ({{imdb_year}}) {{quality}}" >> '{? path.a ?}' + on_exit: + for_entries: + - echo "{{original_title}} | {{title}}" >> '{? path.e ?}' lostfilm: lostfilm: yes - deluge: - label: lostfilm headers: cookie: '{? lostfilm.cookie ?}' include: lostfilm.yml @@ -72,8 +69,6 @@ templates: baibako: rss: '{? RRSUrls.baibako ?}' - deluge: - label: baibako manipulate: - title: replace: @@ -95,13 +90,15 @@ templates: template: tvshows accept_all: yes if: - - "'Доктор Хто' in title": reject + - "'Доктор Хто' in original_title": reject tapochek_films: template: films - deluge: - label: tapochek rss: '{? RRSUrls.tapochek ?}' + if: + - "'[HDrezka Studio]' in original_title": reject + - "'[Line]' in original_title": reject + - "'[Flarrow Films]' in original_title": reject manipulate: - title: replace: @@ -109,7 +106,7 @@ templates: format: ' H265' - title: replace: - regexp: '(60 fps|iTunes|IMAX Edition|Open Matte|IMAX| г\.)' + regexp: '(60 fps|iTunes|IMAX Edition|HDRezka Studio|СВ Студия|Open Matte|Лицензия|IMAX| г\.)' format: '' - title: replace: @@ -124,38 +121,6 @@ templates: regexp: '(.*) \((.*)\) \[(.[0-9]*)(.[А-Яа-я\,\ ]*)(.[a-zA-Z0-9\-\ ]*)\] \[(.*)\]' format: '\1 (\3) - \5' - kinozal: - deluge: - label: kiozal - template: films - # rss: http://kinozal.tv/rss.xml - headers: - cookie: uid=***; pass=***; countrys=ru - html: - url: http://kinozal.tv/browse.php?s=hevc+1080p&g=0&c=1002&v=3&d=0&w=0&t=0&f=0 - title_from: link - urlrewrite: - sitename: - regexp: 'http://kinozal.tv/details.php\?id=(?P\d+).*' - format: 'http://dl.kinozal.tv/download.php?id=\g' - manipulate: - - title: - extract: (.*)\[[*]*\] - - title: - replace: - regexp: 'HEVC' - format: 'H265' - - title: - replace: - regexp: '(.*) / (.*) / (.*[0-9\-]) / (.*) / (.*) / (.*) \((.*)\)' - # Репродукция / Replicas / 2018 / ДБ, СТ / HEVC / BDRip (1080p) - format: '\2 (\3) - \5 \6 \7' - - title: - replace: - regexp: '(.*) / (.*[0-9\-]) / (.*) / (.*) / (.*) \((.*)\)' - # Replicas / 2018 / ДБ, СТ / HEVC / BDRip (1080p) - format: '\1 (\2) - \4 \5 \6' - tasks: Lostfilm: template: lostfilm @@ -163,20 +128,6 @@ tasks: template: baibako Tapochek: template: tapochek_films - Kinozal: - template: kinozal - # sort-series: - # metainfo_series: yes - # trakt_lookup: yes - # filesystem: - # path: /mnt/sdb1/plex/unsorted/ - # regexp: '.*\.(avi|mkv|mp4)$' - # recursive: yes - # seen: local - # require_field: series_name - # accept_all: yes - # move: - # to: /mnt/sdb1/plex/TV Shows/{{ series_name }}/Season {{series_season|pad(2)}} web_server: bind: 0.0.0.0