flexget: update config

diff --git a/flexget/config.yml b/flexget/config.yml
index baaa97558f4ce4807cf9c697794735c0277b05f1..34d5dcba4cc31df2f6823d43cc54788f75e6dad2 100644 (file)
--- a/flexget/config.yml
+++ b/flexget/config.yml
@@ -114,7 +114,7 @@ templates: # {{{1
         - homeland
         - house of cards 2013: { alternate_name: house of cards us }
         - how i met your mother
-        - last week tonight with john oliver
+        - last week tonight with john oliver: { timeframe: 10 hours }
         - masters of sex
         - my little pony
         - mythbusters
@@ -129,13 +129,15 @@ templates: # {{{1
         - the walking dead
         - two and a half men
         - the wire: { quality: 720p+ }
+        - vinyl
 
 
   series-trakt: # {{{2
     configure_series:
       from:
         trakt_list:
-          username: Ram-Z
+          username: '{{secrets.trakt.username}}'
+          account: '{{secrets.trakt.account}}'
           list: followlist
           type: shows
       settings: *default_settings
@@ -145,26 +147,34 @@ templates: # {{{1
     configure_series:
       from:
         trakt_list:
-          username: Ram-Z
+          username: '{{secrets.trakt.username}}'
+          account: '{{secrets.trakt.account}}'
           list: backfill
-          type: episodes
+          type: shows
       settings: # *default_settings
         identified_by: ep
         quality: 720p+ h264+
     discover:
       interval: 1 hours
       what:
+        - trakt_list:
+            username: '{{secrets.trakt.username}}'
+            account: '{{secrets.trakt.account}}'
+            list: backfill
+            type: episodes
         - emit_series:
             from_start: yes
       from:
         - newznab:
             url: 'https://www.usenet-crawler.com/api?apikey={{secrets.crawler.apikey}}&t=tvsearch&cat=5030,5040&extended=1'
             category: tv
+    all_series: yes
 
 
   movies: # {{{2
     set:
       category: 'movies'
+      priority: '-2'
     exists_movie:
       path:
         - '/mnt/Skaro/Movies'
@@ -210,8 +220,8 @@ templates: # {{{1
 
   trakt-add-collection: # {{{2
     trakt_add:
-      username: '{{secrets.trakt.login}}'
-      password: '{{secrets.trakt.passw}}'
+      username: '{{secrets.trakt.username}}'
+      account: '{{secrets.trakt.account}}'
       list: collection
 
 
@@ -228,26 +238,45 @@ tasks: # {{{1
       - usenet-tv
 
 
-  dl-series-trakt-backfill: # {{{2
-    priority: 110
-    template:
-      - series
-      - series-trakt-backfill
-      - filters
-      - usenet
-    digest: backfill
+  # dl-series-trakt-backfill: # {{{2
+  #   priority: 110
+  #   template:
+  #     - series
+  #     - series-trakt-backfill
+  #     - filters
+  #     - usenet
+  #   digest: backfill
 
 
   dl-movies-trakt: # {{{2
     priority: 10
     trakt_list:
-      username: Ram-Z
+      username: '{{secrets.trakt.username}}'
+      account: '{{secrets.trakt.account}}'
       list: watchlist
       type: movies
     accept_all: yes
     movie_queue: add
 
 
+  dl-movies-trakt-remove: # {{{2
+    priority: 20
+    disable:
+      - seen
+    emit_movie_queue: yes
+    crossmatch:
+      from:
+        - trakt_list:
+            username: '{{secrets.trakt.username}}'
+            account: '{{secrets.trakt.account}}'
+            list: watchlist
+            type: movies
+      fields: [imdb_id]
+      action: reject
+    accept_all: yes
+    movie_queue: remove
+
+
   dl-movies-discover-queue-1080p: # {{{2
     priority: 100
     template:
@@ -323,13 +352,15 @@ tasks: # {{{1
     seen: local
     disable:
       - retry_failed
+      - nzb_size
     no_entries_ok: yes
 
-    find:
+    filesystem:
       path:
         - /mnt/Skaro/usenet/done
         - /mnt/Skaro/torrents/done
       recursive: yes
+      retrieve: files
       regexp: '.*\.(avi|mkv|mp4|mpg|divx|webm)$'
 
     regexp:
@@ -340,7 +371,7 @@ tasks: # {{{1
     all_series:
       parse_only: yes
     accept_all: yes
-    require_field: tvdb_series_name
+    require_field: tvdb_episode
 
     set:
       destination: '/mnt/Skaro/Series'
@@ -351,7 +382,10 @@ tasks: # {{{1
       filename: "{{filename}}"
       clean_source: 100   # removes dir if < [N] MB
 
-    exec: echo "<<<{{folder}}/{{filename}}>>>"
+    # log: "<<<{{folder}}/{{filename}}>>>"
+    exec:
+      - echo "<<<{{folder}}/{{filename}}>>>"
+      - touch "{{destination}}/{{folder}}/{{filename}}{{location|pathext}}"
     digest: move-tasks
 
 
@@ -362,9 +396,10 @@ tasks: # {{{1
     seen: local
     disable:
       - retry_failed
+      - nzb_size
     no_entries_ok: yes
 
-    find:
+    filesystem:
       path:
         - /mnt/Skaro/usenet/done
         - /mnt/Skaro/torrents/done
@@ -395,7 +430,9 @@ tasks: # {{{1
       filename: "{{filename}}"
       clean_source: 100   # removes dir if < [N] MB
 
-    exec: echo "<<<{{filename}}>>>"
+    exec:
+      - echo "<<<{{filename}}>>>"
+      - touch "{{destination}}/{{filename}}{{location|pathext}}"
     digest: move-tasks
 
 
@@ -424,24 +461,60 @@ tasks: # {{{1
     accept_all: yes
 
 
+  seed-series-db: # {{{2
+    manual: yes
+    seen: local
+
+    filesystem:
+      path:
+        - '/mnt/Skaro/Series'
+      recursive: yes
+      retrieve: files
+      regexp: '.*\.(avi|mkv|mp4|webm|m4v)$'
+
+    manipulate:
+      - title:
+          from: location
+          replace:
+            regexp: '.*/([^/]+)/[^/]+/(\d+)(?:x(\d+))+([^/]*)\.[^.]+$'
+            format: '\1 S\2E\3\4'
+      - title:
+          replace:
+            regexp: '\[.*\]'
+            format: ''
+      - title:
+          replace:
+            regexp: '[\(\)\{\}]'
+            format: ' '
+
+    metainfo_series: yes
+    thetvdb_lookup: yes
+    all_series:
+      tracking: no
+    assume_quality: 480p
+    accept_all: yes
+    require_field:
+      - tvdb_id
+
+
   seed-trakt-series: # {{{2
     manual: yes
     seen: local
     template:
-      - seed-search
       - trakt-add-collection
 
-    find:
+    filesystem:
       path:
         - '/mnt/Skaro/Series'
-      regexp: '.*\.(avi|mkv|mp4|webm|m4v)$'
       recursive: yes
+      retrieve: files
+      regexp: '.*\.(avi|mkv|mp4|webm|m4v)$'
 
     manipulate:
       - title:
           from: location
           replace:
-            regexp: '.*/([^/]+)/[^/]+/(\d+)x(\d+)([^/]*)\.[^.]+$'
+            regexp: '.*/([^/]+)/[^/]+/(\d+)(?:x(\d+))+([^/]*)\.[^.]+$'
             format: '\1 S\2E\3\4'
       - title:
           replace:
@@ -466,12 +539,12 @@ tasks: # {{{1
     seen: local
     template:
       - trakt-add-collection
-    seen: local
-    find:
+    filesystem:
       path:
         - '/mnt/Skaro/Movies'
-      regexp: '.*\.(avi|mkv|mp4|webm|m4v)$'
       recursive: yes
+      retrieve: files
+      regexp: '.*\.(avi|mkv|mp4|webm|m4v)$'
     imdb_lookup: yes
     accept_all: yes
     require_field: