From: Samir Benmendil <samir.benmendil@gmail.com>
Date: Thu, 28 Feb 2013 21:49:39 +0000 (+0100)
Subject: Merge branch 'master' of tardis:/dotfiles
X-Git-Url: https://git.rmz.io/dotfiles.git/commitdiff_plain/67480405d80eacad822bf853bf4600f77fd8c91e?hp=80f1f8d00292330e3454c6c34dec097d6b33cb75

Merge branch 'master' of tardis:/dotfiles
---

diff --git a/flexget/config.yml b/flexget/config.yml
index e2431bd..cf45208 100644
--- 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