flexget: split usenet and torrent move configs

diff --git a/flexget/config.yml b/flexget/config.yml
index 4579364350da4e19709563ed99eb8f2b2fbb8902..63af58eee7359020863e159796e82bf3b89ced43 100644 (file)
--- a/flexget/config.yml
+++ b/flexget/config.yml
@@ -250,6 +250,94 @@ templates: # {{{1
           list: collection
 
 
           list: collection
 
 

+  move-series: # {{{2
+    manual: yes
+    template:
+      - trakt-add-collection
+    disable:
+      - retry_failed
+      - seen
+      - seen_info_hash
+    no_entries_ok: yes
+
+    regexp:
+      reject:
+        - '[Ss]ample'
+
+    # 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
+    thetvdb_lookup: yes
+    require_field:
+      - tvdb_season
+      - tvdb_episode
+
+    set:
+      destination: '/mnt/series'
+      folder: "{{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(' ','}{')}}{{'}'}}[{{tvdb_language}}]"
+    move:
+      to: "/mnt/series/{{folder}}"
+      rename: "{{filename}}"
+      clean_source: 100   # removes dir if < [N] MB
+
+    # log: "<<<{{folder}}/{{filename}}>>>"
+    exec:
+      - echo "<<<{{folder}}/{{filename}}>>>"
+      - touch "{{destination}}/{{folder}}/{{filename}}{{location|pathext}}"
+    digest: move-tasks
+
+
+  move-movies: # {{{2
+    manual: yes
+    template:
+      - trakt-add-collection
+    disable:
+      - retry_failed
+      - seen
+      - seen_info_hash
+    no_entries_ok: yes
+
+    regexp:
+      reject:
+        - '[Ss]ample'
+
+    # 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
+      - imdb_year
+
+    set:
+      destination: '/mnt/movies'
+      filename: "{{imdb_name}} ({{imdb_year}}){{'{'}}{{quality|replace(' ','}{')}}{{'}'}}[en]"
+    move:
+      to: "/mnt/movies"
+      rename: "{{filename}}"
+      clean_source: 100   # removes dir if < [N] MB
+
+    exec:
+      - echo "<<<{{filename}}>>>"
+      - touch "{{destination}}/{{filename}}{{location|pathext}}"
+    digest: move-tasks
+
+

 tasks: # {{{1
   dl-series: # {{{2
     priority: 100
 tasks: # {{{1
   dl-series: # {{{2
     priority: 100


@@ -370,107 +458,50 @@ tasks: # {{{1
       - usenet-movies
 
 
       - usenet-movies
 
 

-  move-series: # {{{2
+  move-series-usenet: # {{{2

     manual: yes
     template:
     manual: yes
     template:

-      - trakt-add-collection
-    disable:
-      - retry_failed
-      - seen
-      - seen_info_hash
-    no_entries_ok: yes
-
+      - move-series

     filesystem:
       path:
         - /srv/usenet/done
     filesystem:
       path:
         - /srv/usenet/done

-        - /srv/torrents/done

       recursive: yes
       retrieve: files
       regexp: '.*\.(avi|mkv|mp4|mpg|divx|webm|flv)$'
 
       recursive: yes
       retrieve: files
       regexp: '.*\.(avi|mkv|mp4|mpg|divx|webm|flv)$'
 

-    regexp:
-      reject:
-        - '[Ss]ample'
-
-    # 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
-    thetvdb_lookup: yes
-    require_field:
-      - tvdb_season
-      - tvdb_episode
-
-    set:
-      destination: '/mnt/series'
-      folder: "{{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(' ','}{')}}{{'}'}}[{{tvdb_language}}]"
-    move:
-      to: "/mnt/series/{{folder}}"
-      rename: "{{filename}}"
-      clean_source: 100   # removes dir if < [N] MB

 
 

-    # log: "<<<{{folder}}/{{filename}}>>>"
-    exec:
-      - echo "<<<{{folder}}/{{filename}}>>>"
-      - touch "{{destination}}/{{folder}}/{{filename}}{{location|pathext}}"
-    digest: move-tasks
+  move-series-torrents: # {{{2
+    manual: yes
+    template:
+      - move-series
+    filesystem:
+      path:
+        - /srv/torrents/done
+      recursive: yes
+      retrieve: files
+      regexp: '.*\.(avi|mkv|mp4|mpg|divx|webm|flv)$'

 
 
 
 

-  move-movies: # {{{2
+  move-movies-usenet: # {{{2

     manual: yes
     template:
     manual: yes
     template:

-      - trakt-add-collection
-    disable:
-      - retry_failed
-      - seen
-      - seen_info_hash
-    no_entries_ok: yes
-
+      - move-movies

     filesystem:
       path:
         - /srv/usenet/done
     filesystem:
       path:
         - /srv/usenet/done

-        - /srv/torrents/done

       recursive: yes
       regexp: '.*\.(mkv|avi|mp4)$'
 
       recursive: yes
       regexp: '.*\.(mkv|avi|mp4)$'
 

-    regexp:
-      reject:
-        - '[Ss]ample'

 
 

-    # 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
-      - imdb_year
-
-    set:
-      destination: '/mnt/movies'
-      filename: "{{imdb_name}} ({{imdb_year}}){{'{'}}{{quality|replace(' ','}{')}}{{'}'}}[en]"
-    move:
-      to: "/mnt/movies"
-      rename: "{{filename}}"
-      clean_source: 100   # removes dir if < [N] MB
-
-    exec:
-      - echo "<<<{{filename}}>>>"
-      - touch "{{destination}}/{{filename}}{{location|pathext}}"
-    digest: move-tasks
+  move-movies-torrents: # {{{2
+    manual: yes
+    template:
+      - move-movies
+    filesystem:
+      path:
+        - /srv/torrents/done
+      recursive: yes
+      regexp: '.*\.(mkv|avi|mp4)$'

 
 
   daily-mail: # {{{2
 
 
   daily-mail: # {{{2