Merge branch 'master' of tardis:/dotfiles

diff --git a/bin/mkvsettitle b/bin/mkvsettitle
index f9a8c8d356ea0dcfec88f054ed027faf083b91d4..26443fb9b70263a86cf355da0b13850145cdfef4 100755 (executable)
--- a/bin/mkvsettitle
+++ b/bin/mkvsettitle
@@ -10,5 +10,8 @@ for f in "$dir"/*; do
     esac
     t=$(basename "$f" "$ext")
     t=${t%.*}
+    # remove also (2013){1080p}[en] stuff
+    t=${t% (*)\{*\}*}
+    echo "Set title: $t"
     mkvpropedit --set title="$t" "$f" > /dev/null
 done

diff --git a/flexget/config.yml b/flexget/config.yml
index 714739aeba3c43aa663240817d580e871a78a690..e2431bd741ed39991f48cb734a4c0e5dec022551 100644 (file)
--- a/flexget/config.yml
+++ b/flexget/config.yml
@@ -50,7 +50,7 @@ tasks:
     transmission:
       host: localhost
       port: 9091
-      path: /home/ramsi/Torrents
+      path: /mnt/Skaro/Torrents.flex
       removewhendone: yes
       ratio: 0.0
 
@@ -60,12 +60,12 @@ tasks:
     accept_all: yes
 
     find:
-      path: /home/ramsi/Torrents
+      path: /mnt/Skaro/Torrents.flex
       recursive: yes
       regexp: '.*\.(avi|mkv|mp4)$'
 
     move:
       to: "/mnt/Skaro/Series/{{series_name_tvdb}}/Season {{tvdb_season}}/"
-      filename: "{{tvdb_season}}x{{tvdb_episode|pad(2)}} {{ep_name}}{{location|pathext}}"
+      filename: "{{tvdb_season}}x{{tvdb_episode|pad(2)}} {{ep_name}} ({{ep_air_date|formatdate('%Y')}}){{'{'}}{{quality}}{{'}'}}[en]{{location|pathext}}"
 
 # vim: sts=2 ts=2 sw=2 et