X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/e698c981d138063e81c6f330a6eb32096af8f22b..1529a3b60191542f2283015ec4bf1faea8f4725b:/flexget/config.yml

diff --git a/flexget/config.yml b/flexget/config.yml
index 0fd4e57..289b37f 100644
--- a/flexget/config.yml
+++ b/flexget/config.yml
@@ -1,11 +1,14 @@
-secrets: private.yml
+variables: private.yml
 
 
 templates: # {{{1
   email: # {{{2
-    email:
-      from: flexget@tardis
-      to: ramsi@localhost
+    notify:
+      task:
+        via:
+          - email:
+              from: flexget@tardis
+              to: ramsi@localhost
 
 
   torrents: # {{{2
@@ -27,22 +30,22 @@ templates: # {{{1
 
   usenet: # {{{2
     sabnzbd:
-      key: '{{secrets.sabnzbd.key}}'
-      url: '{{secrets.sabnzbd.url}}'
+      key: '{?sabnzbd.key?}'
+      url: '{?sabnzbd.url?}'
 
 
   usenet-movies: # {{{2
     inputs:
-      - rss: { url: 'https://www.usenet-crawler.com/rss?t=2040&dl=1&num=100{{secrets.crawler.api}}', silent: yes } # Movies HD
-      - rss: { url: 'https://newztown.co.za/rss?t=2040&dl=1&num=100{{secrets.newztown.api}}', silent: yes } # Movies HD
-      - rss: { url: 'https://api.drunkenslug.com/rss?t=2040&dl=1&num=100{{secrets.drunkenslug.api}}', silent: yes } # Movies HD
+      - rss: { url: 'https://api.drunkenslug.com/rss?t=2040&dl=1&num=100{?drunkenslug.api?}', silent: yes } # Movies HD
+      - rss: { url: 'https://www.usenet-crawler.com/rss?t=2040&dl=1&num=100{?crawler.api?}', silent: yes } # Movies HD
+      - rss: { url: 'https://newztown.co.za/rss?t=2040&dl=1&num=100{?newztown.api?}', silent: yes } # Movies HD
 
 
   usenet-tv: # {{{2
     inputs:
-      - rss: { url: 'https://www.usenet-crawler.com/rss?t=5030,5040&dl=1&num=100{{secrets.crawler.api}}', silent: yes } # TV SD/HD
-      - rss: { url: 'https://newztown.co.za/rss?t=5030,5040&dl=1&num=100{{secrets.newztown.api}}', silent: yes } # TV SD/HD
-      - rss: { url: 'https://api.drunkenslug.com/rss?t=2040&dl=1&num=100{{secrets.drunkenslug.api}}', silent: yes } # Movies HD
+      - rss: { url: 'https://api.drunkenslug.com/rss?t=5030,5040&dl=1&num=100{?drunkenslug.api?}', silent: yes } # Movies HD
+      - rss: { url: 'https://www.usenet-crawler.com/rss?t=5030,5040&dl=1&num=100{?crawler.api?}', silent: yes } # TV SD/HD
+      - rss: { url: 'https://newztown.co.za/rss?t=5030,5040&dl=1&num=100{?newztown.api?}', silent: yes } # TV SD/HD
 
 
   filters: # {{{2
@@ -71,7 +74,7 @@ templates: # {{{1
         - \[facepalm\]:   {from: title}
         - \bASAP\b:       {from: title}
         - \b Go\):        {from: title} # filter those misplaced french only movies
-        - \b(HEVC|x265)\b: {from: title} # don't get x265/HEVC
+        - \b(HEVC|[xXhH]265)\b: {from: title} # don't get x265/HEVC
 
 
   series: # {{{2
@@ -82,8 +85,8 @@ templates: # {{{1
         default: &default_settings
           identified_by: ep
           timeframe: 12 hours
-          target: 1080p webdl h264+
-          quality: 480p+ h264+
+          target: 1080p webdl h264 dts
+          quality: 720p+ h264+
           upgrade: yes
     exists_series:
       path:
@@ -100,7 +103,9 @@ templates: # {{{1
         - 8 out of 10 cats
         - american dad
         - archer 2009
+        - arrested development
         - better call saul
+        - black mirror
         - boardwalk empire
         - breaking bad
         - broadchurch
@@ -109,13 +114,15 @@ templates: # {{{1
         - community
         - danger 5: { quality: 720p+ }
         - dexter
+        - dirk gently's holistic detective agency
         - doctor who 2005
         - downton abbey
         - eureka
         - family guy
+        - fargo
         - foyle's war
         - futurama
-        - game of thrones: { timeframe: 9 hours }
+        - game of thrones: { timeframe: 9 hours, quality: dd5.1+ }
         - homeland
         - house of cards 2013: { alternate_name: house of cards us }
         - how i met your mother
@@ -123,9 +130,11 @@ templates: # {{{1
         - masters of sex
         - my little pony
         - mythbusters
+        - narcos
         - qi: { special_ids: 'uncut' }
         - ray donovan
         - red dwarf
+        - rick and morty
         - sherlock
         - suits
         - the big bang theory
@@ -133,18 +142,18 @@ templates: # {{{1
         - the blacklist redemption
         - the cleveland show
         - the walking dead
-        - two and a half men
         - the wire: { quality: 720p+ }
+        - two and a half men
         - vinyl
-        - westworld
+        - westworld: { timeframe: 9 hours, quality: dd5.1+ }
 
 
   series-trakt: # {{{2
     configure_series:
       from:
         trakt_list:
-          username: '{{secrets.trakt.username}}'
-          account: '{{secrets.trakt.account}}'
+          username: '{?trakt.username?}'
+          account: '{?trakt.account?}'
           list: followlist
           type: shows
       settings: *default_settings
@@ -154,8 +163,8 @@ templates: # {{{1
     configure_series:
       from:
         trakt_list:
-          username: '{{secrets.trakt.username}}'
-          account: '{{secrets.trakt.account}}'
+          username: '{?trakt.username?}'
+          account: '{?trakt.account?}'
           list: backfill
           type: shows
       settings: # *default_settings
@@ -165,15 +174,15 @@ templates: # {{{1
       interval: 1 hours
       what:
         - trakt_list:
-            username: '{{secrets.trakt.username}}'
-            account: '{{secrets.trakt.account}}'
+            username: '{?trakt.username?}'
+            account: '{?trakt.account?}'
             list: backfill
             type: episodes
         - next_series_episodes:
             from_start: yes
       from:
         - newznab:
-            url: 'https://www.usenet-crawler.com/api?apikey={{secrets.crawler.apikey}}&t=tvsearch&cat=5030,5040&extended=1'
+            url: 'https://www.usenet-crawler.com/api?apikey={?crawler.apikey?}&t=tvsearch&cat=5030,5040&extended=1'
             category: tv
     all_series: yes
 
@@ -221,7 +230,7 @@ templates: # {{{1
   #       - emit_movie_queue: yes
   #     from:
   #       - newznab:
-  #           url: 'https://www.usenet-crawler.com/api?apikey={{secrets.crawler.apikey}}&t=movie&extended=1&cat=2040'
+  #           url: 'https://www.usenet-crawler.com/api?apikey={?crawler.apikey?}&t=movie&extended=1&cat=2040'
   #           category: movie
   #     interval: 7 days  # search each entry only once a week
 
@@ -229,8 +238,8 @@ templates: # {{{1
   trakt-add-collection: # {{{2
     list_add:
       - trakt_list:
-          username: '{{secrets.trakt.username}}'
-          account: '{{secrets.trakt.account}}'
+          username: '{?trakt.username?}'
+          account: '{?trakt.account?}'
           list: collection
 
 
@@ -260,8 +269,8 @@ tasks: # {{{1
   # dl-movies-trakt: # {{{2
   #   priority: 10
   #   trakt_list:
-  #     username: '{{secrets.trakt.username}}'
-  #     account: '{{secrets.trakt.account}}'
+  #     username: '{?trakt.username?}'
+  #     account: '{?trakt.account?}'
   #     list: watchlist
   #     type: movies
   #   accept_all: yes
@@ -276,8 +285,8 @@ tasks: # {{{1
   #   crossmatch:
   #     from:
   #       - trakt_list:
-  #           username: '{{secrets.trakt.username}}'
-  #           account: '{{secrets.trakt.account}}'
+  #           username: '{?trakt.username?}'
+  #           account: '{?trakt.account?}'
   #           list: watchlist
   #           type: movies
   #     fields: [imdb_id]
@@ -358,10 +367,10 @@ tasks: # {{{1
     manual: yes
     template:
       - trakt-add-collection
-    seen: local
     disable:
       - retry_failed
-      - nzb_size
+      - seen
+      - seen_info_hash
     no_entries_ok: yes
 
     filesystem:
@@ -370,13 +379,20 @@ tasks: # {{{1
         - /srv/torrents/done
       recursive: yes
       retrieve: files
-      regexp: '.*\.(avi|mkv|mp4|mpg|divx|webm)$'
+      regexp: '.*\.(avi|mkv|mp4|mpg|divx|webm|flv)$'
 
     regexp:
       reject:
         - '[Ss]ample'
 
-    thetvdb_lookup: yes
+    # guessit can extract info from full paths which may contain more info
+    manipulate:
+      - title:
+          from: location
+
+    parsing:
+      series: guessit
+
     all_series:
       parse_only: yes
     accept_all: yes
@@ -384,7 +400,6 @@ tasks: # {{{1
       - tvdb_season
       - tvdb_episode
       - tvdb_ep_name
-      - tvdb_ep_air_date
 
     set:
       destination: '/mnt/series'
@@ -406,10 +421,10 @@ tasks: # {{{1
     manual: yes
     template:
       - trakt-add-collection
-    seen: local
     disable:
       - retry_failed
-      - nzb_size
+      - seen
+      - seen_info_hash
     no_entries_ok: yes
 
     filesystem:
@@ -423,15 +438,15 @@ tasks: # {{{1
       reject:
         - '[Ss]ample'
 
-    imdb_lookup: yes
-    if:
-      - movie_name is None:
-          manipulate:
-            - title:
-                extract: 'done/([^/]*)/[^/]*$'
-                from: location
-          imdb_lookup: yes
+    # guessit can extract info from full paths which may contain more info
+    manipulate:
+      - title:
+          from: location
 
+    parsing:
+      movie: guessit
+
+    imdb_lookup: yes
     accept_all: yes
     require_field:
       - imdb_name
@@ -458,10 +473,13 @@ tasks: # {{{1
       list: move-tasks
     seen: local
     accept_all: yes
-    email:
-      from: flexget@tardis
-      to: ramsi@localhost
-      template: move
+    notify:
+      task:
+        template: move
+        via:
+          - email:
+              from: flexget@tardis
+              to: ramsi@localhost
 
 
   backfill-mail: # {{{2
@@ -487,6 +505,7 @@ tasks: # {{{1
       retrieve: files
       regexp: '.*\.(avi|mkv|mp4|webm|m4v)$'
 
+    #TODO use guessit like in move-series
     manipulate:
       - title:
           from: location
@@ -525,6 +544,7 @@ tasks: # {{{1
       retrieve: files
       regexp: '.*\.(avi|mkv|mp4|webm|m4v)$'
 
+    #TODO use guessit like in move-series
     manipulate:
       - title:
           from: location