Merge branch 'master' of tardis:/dotfiles

diff --git a/flexget/config.yml b/flexget/config.yml
index e2431bd741ed39991f48cb734a4c0e5dec022551..cf45208103a1ab95638f45308782284dc0a0ec35 100644 (file)
--- a/flexget/config.yml
+++ b/flexget/config.yml
@@ -66,6 +66,19 @@ tasks:
 
     move:
       to: "/mnt/Skaro/Series/{{series_name_tvdb}}/Season {{tvdb_season}}/"
-      filename: "{{tvdb_season}}x{{tvdb_episode|pad(2)}} {{ep_name}} ({{ep_air_date|formatdate('%Y')}}){{'{'}}{{quality}}{{'}'}}[en]{{location|pathext}}"
+      filename: "{{tvdb_season}}x{{tvdb_episode|pad(2)}} {{ep_name|replace('/','-')}} ({{ep_air_date|formatdate('%Y')}}){{'{'}}{{quality|replace(' ','}{')}}{{'}'}}[en]{{location|pathext}}"
+
+  move-movies:
+    tmdb_lookup: yes
+    accept_all: yes
+
+    find:
+      path: /mnt/Skaro/Movies.carsten
+      recursive: yes
+      regexp: '.*\.mkv$'
+
+    move:
+      to: "/mnt/Skaro/Movies.flexed"
+      filename: "{{tmdb_name}} ({{tmdb_year}}){{'{'}}{{quality|replace(' ','}{')}}{{'}'}}[en][de].mkv"
 
 # vim: sts=2 ts=2 sw=2 et