flexget: cleanup config

diff --git a/flexget/config.yml b/flexget/config.yml
index 33adee2ecd9e499a04eaae412bd6c59bb4f6226c..5abf670568137878ffc7066d567da534dbb3d351 100644 (file)
--- a/flexget/config.yml
+++ b/flexget/config.yml
@@ -1,11 +1,13 @@
 secrets: private.yml
 
+
 templates: # {{{1
   email: # {{{2
     email:
       from: flexget@tardis
       to: ramsi@localhost
 
+
   torrents: # {{{2
     inputs:
       - rss: { url: 'https://ezrss.it/feed/', silent: yes }
@@ -16,13 +18,13 @@ templates: # {{{1
       # - rss: { url: 'http://www.torlock.com/television/rss.xml', silent: yes }
       # - rss: { url: 'http://torrentz.eu/feed_verified?q=tv', silent: yes }
       # - rss: { url: 'http://rss.thepiratebay.org/208', silent: yes }
-
     transmission:
       host: localhost
       port: 9091
       path: /mnt/Skaro/torrents/done
       ratio: 0.0
 
+
   usenet-movies: # {{{2
     sabnzbd:
       key: '{{secrets.sabnzbd.key}}'
@@ -31,6 +33,7 @@ templates: # {{{1
     inputs:
       - rss: { url: 'https://www.usenet-crawler.com/rss?t=2040&dl=1&num=100{{secrets.crawler.api}}', silent: yes } # Movies HD
 
+
   usenet-tv: # {{{2
     sabnzbd:
       key: '{{secrets.sabnzbd.key}}'
@@ -40,6 +43,7 @@ templates: # {{{1
       - rss: { url: 'https://www.usenet-crawler.com/rss?t=5030&dl=1&num=100{{secrets.crawler.api}}', silent: yes } # TV SD
       - rss: { url: 'https://www.usenet-crawler.com/rss?t=5040&dl=1&num=100{{secrets.crawler.api}}', silent: yes } # TV HD
 
+
   filters: # {{{2
     content_filter:
       require:
@@ -67,6 +71,7 @@ templates: # {{{1
         - \bASAP\b:       {from: title}
         - \b Go\):        {from: title} # filter those misplaced french only movies
 
+
   tv: # {{{2
     series:
       normal:
@@ -106,6 +111,7 @@ templates: # {{{1
         - the wire:
             quality: 720p+
 
+
   movies: # {{{2
     imdb:
       min_score: 7.5
@@ -118,8 +124,15 @@ templates: # {{{1
       type: files
     seen_movies: strict
 
+
 tasks: # {{{1
   dl-tv: # {{{2
+    priority: 1
+    template:
+      - email
+      - tv
+      - filters
+      - usenet-tv
     series:
       settings:
         normal:
@@ -127,13 +140,6 @@ tasks: # {{{1
           target: 1080p webdl
           quality: 480p+
           upgrade: yes
-
-    priority: 1
-    template:
-      - email
-      - tv
-      - filters
-      - usenet-tv
     exists_series:
       path: '/mnt/Skaro/Series/{{tvdb_series_name}}'
       allow_different_qualities: better
@@ -142,6 +148,7 @@ tasks: # {{{1
       max: 6000
       strict: yes
 
+
   dl-movies-1080p: # {{{2
     priority: 1
     template:
@@ -155,6 +162,7 @@ tasks: # {{{1
       max: 15000
       strict: yes
 
+
   dl-movies-720p: # {{{2
     priority: 2
     template:
@@ -169,21 +177,14 @@ tasks: # {{{1
       max: 10000
       strict: yes
 
+
   move-tv: # {{{2
     priority: 2
-    email:
-      from: flexget@tardis
-      to: ramsi@localhost
-      template: move
-    thetvdb_lookup: yes
-    metainfo_series: yes
+
     seen: local
     retry_failed:
       max_retries: 0
     no_entries_ok: yes
-    all_series:
-      parse_only: yes
-    accept_all: yes
 
     find:
       path:
@@ -195,22 +196,28 @@ tasks: # {{{1
     regexp:
       reject:
         - '[Ss]ample'
+
+    thetvdb_lookup: yes
+    all_series:
+      parse_only: yes
+    accept_all: yes
+
     set:
       destination: '/mnt/Skaro/Series'
-
     move:
       to: "/mnt/Skaro/Series/{{tvdb_series_name}}/{% if tvdb_season == 0 %}Specials{% else %}Season {{tvdb_season}}{% endif %}/"
       filename: "{{tvdb_season}}x{{tvdb_episode|pad(2)}} {{tvdb_ep_name|replace('/','-')}} ({{tvdb_ep_air_date|formatdate('%Y')}}){{'{'}}{{quality|replace(' ','}{')}}{{'}'}}[en]"
       clean_source: 100   # removes dir if < [N] MB
 
-  move-movies: # {{{2
-    priority: 3
     email:
       from: flexget@tardis
       to: ramsi@localhost
       template: move
-    imdb_lookup: yes
-    accept_all: yes
+
+
+  move-movies: # {{{2
+    priority: 3
+
     seen: local
     retry_failed:
       max_retries: 0
@@ -222,6 +229,14 @@ tasks: # {{{1
         - /mnt/Skaro/torrents/done
       recursive: yes
       regexp: '.*\.(mkv|avi|mp4)$'
+
+    regexp:
+      reject:
+        - '[Ss]ample'
+
+    imdb_lookup: yes
+    accept_all: yes
+
     set:
       destination: '/mnt/Skaro/Movies'
     move:
@@ -229,14 +244,20 @@ tasks: # {{{1
       filename: "{{imdb_name}} ({{imdb_year}}){{'{'}}{{quality|replace(' ','}{')}}{{'}'}}[en]"
       clean_source: 100   # removes dir if < [N] MB
 
+    email:
+      from: flexget@tardis
+      to: ramsi@localhost
+      template: move
+
+
   seed-tv-db: # {{{2
     manual: yes
+
     find:
       path: '/mnt/Skaro/Series'
       regexp: '.*\.(avi|mkv|mp4|webm)$'
       recursive: yes
-    require_field:
-      - series_name
+
     manipulate:
       - title:
           from: location
@@ -251,9 +272,14 @@ tasks: # {{{1
           replace:
             regexp: '[\(\)\{\}]'
             format: ' '
+
     all_series: yes
     assume_quality: 480p
 
+    require_field:
+      - series_name
+
+
 schedules: # {{{1
   - tasks: ['dl-*', 'move-*']
     interval: