changeset 138:f963d52c031a

Merge.
author Edho Arief <edho@myconan.net>
date Wed, 02 Nov 2011 22:12:16 +0700
parents 983beb13c736 (diff) cf328bd06078 (current diff)
children 9ff99d9bf388
files bash bin/ren hg inputrc tcsh tmux vim zsh
diffstat 1 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/bin/ren	Mon Oct 31 11:54:49 2011 +0700
+++ b/bin/ren	Wed Nov 02 22:12:16 2011 +0700
@@ -16,7 +16,7 @@
   $newname =~ s/\[t-n\]/[T-N]/i;
   #TITLE AND NAMES
   $newname =~ s/^(\(|\[)W B(\)|\])/[W_B]/;
-  if ($newname =~ m/\[Doremi/) {
+  if ($newname =~ m/\[(Doremi|Elysium)/) {
     $newname =~ s/\.([a-z0-9]+)$/,$1/i;
     $newname =~ s/\./ /g;
     $newname =~ s/,([a-z0-9]+)$/.$1/i;
@@ -40,6 +40,8 @@
   $newname =~ s/\] *Pocket Monsters - (\d+) - .*\[(H264 |)SUB\]/] Pokemon - $1 /i;
   $newname =~ s/\] Fafner - /] Soukyuu no Fafner - /;
   $newname =~ s/\] Mashiro iro symphony - /] Mashiro-iro Symphony - /i;
+  $newname =~ s/\] To Aru Kagaku no Railgun /] Toaru Kagaku no Railgun /i;
+  $newname =~ s/\] To Aru Majutsu no Index /] Toaru Majutsu no Index /i;
   $newname =~ s/\] Shakugan no Shana III /] Shakugan no Shana Final /i;
   $newname =~ s/\] Boku Ha Tomodachi Ga Sukunai - /] Boku wa Tomodachi ga Sukunai - /i;
   $newname =~ s/\] Seikon no Qwaser II BD - (\d+) \[720p\]/] Seikon no Qwaser II - $1 [720p BD]/i;
@@ -56,6 +58,7 @@
   $newname =~ s/\] Maji de Watashi ni Koi Shinasai!! /] Maji de Watashi ni Koi Shinasai! /i;
   $newname =~ s/\] Sei Juushi Bismarck /] Sei Juushi Bismark /i;
   $newname =~ s/\] Tamayura - hitotose - /] Tamayura ~hitotose~ - /i;
+  $newname =~ s/\] Yumekui Merry /] Dream Eater Merry /i;
   $newname =~ s/^Arigatou\.Tsubasa\.Chronicles\.(|2\.)(\d{2})(|v2)\./[Arigatou] Tsubasa Chronicles $1 - $2$3/;
   $newname =~ s/^Niea\.Under\.Seven\.(\d+)\.\(Dual\.Audio\)\.XVID\.\[AM\]/[AM] Niea Under Seven - $1/;
   $newname =~ s/ Tsubasa Chronicles 2\. - / Tsubasa Chronicles 2 /;
@@ -205,7 +208,7 @@
   $newname =~ s/Naruto (\d+-\d+) /Naruto - $1 /;
   $newname =~ s/Lupin III Series 1 - (\d+) - .+ \[neo1024\]/[neo1024] Lupin III - $1 /;
   $newname =~ s/Mitsudomoe Picture Drama - 0/Mitsudomoe Picture Drama - /;
-  $newname =~ s/^(Star Driver .*)(\[AtsA\])/$2 $1 /i;
+  $newname =~ s/^(Fullmetal Alchemist Brotherhood .*|Star Driver .*)(\[AtsA\])/$2 $1 /i;
   $newname =~ s/(Sora no Woto|Ichiban Ushiro no Daimaou|Mayoi Neko Overrun!) - ([^ ]+|OP Clean|ED Clean|Theater [a-z0-9]+) \[BD 1080p\]\[AtsA\]/[AtsA] $1 - $2 [1080p BD]/;
   $newname =~ s/(Sora no Woto|Ichiban Ushiro no Daimaou|Mayoi Neko Overrun!) ([^ ]+|Opening Clean|Ending Clean|Theater - [a-z0-9]+) \[1080p BD\]\[AtsA\]/[AtsA] $1 - $2 [1080p BD]/;
   $newname =~ s/Battle\.Programmer\.Shirase\./Battle Programmer Shirase /;
@@ -261,7 +264,7 @@
   $newname =~ s/ OP(\d+[a-z]*)/ - Opening $1 /i;
   $newname =~ s/ ED / - Ending /;
   $newname =~ s/ Clean (Opening|Ending) v2/ - $1 (Clean) [v2]/i;
-  $newname =~ s/ Creditless Opening (\d+) / - Opening $1 (Clean) /i;
+  $newname =~ s/ Creditless (Opening|Ending) (\d+) / - $1 $2 (Clean) /i;
   $newname =~ s/ Ep(\d+) Creditless Ending / - Ending $1 (Clean) /i;
   $newname =~ s/ (NCED|Ending Clean) / - Ending (Clean) /i;
   $newname =~ s/ NCED(\d+) / - Ending $1 (Clean) /i;
@@ -277,7 +280,8 @@
   $newname =~ s/(\(|\[) *(DVD H264 720x480 AAC|DVD 704x480 H264 AC3|DVD 704x480|DVDRip\.Xvid\.864x480\.Vorbis|DVD H264 848x480|DVD 720x480|DVD H264 720x480|DVD, wmv, mp3) *(\)|\])/[DVD]/i;
   $newname =~ s/(\(|\[) *(BD\]\[1080p-FLAC|1920x1080 Hi10p h264 AAC|BD 1920x1080 x264 AAC|BD 1080p Hi10P|BDRip 1080p x264 FLAC|BD-1080p-|BD-1080p-FLAC|1920x1038 Blu-Ray FLAC|1920x1080 Blu-Ray FLAC|1920x1080 h264 BD FLAC|1920x1080 BD|BD\.1080p\.FLAC|BD 1080p H\.264 AAC 5\.1|BD 1080p) *(\)|\])/[1080p BD]/i;
   $newname =~ s/(\(|\[) *(Hi10P 1280x720 H264|Hi10P 1280x720|1280x720 Hi10P|1280x720 5\.1|1280x720 x264 AAC|1280x720 H264 AAC|720p H264 AAC|1280x720|1280x720 H\.?264 AAC) *(\)|\])/[720p]/i;
-  $newname =~ s/(\(|\[) *(BD, 720p,|BD 720p H264-AAC|BDRip 720p|BD, 720p, ,|1280x720 BD|BD 1280x720 H264 AAC|BD 720p|BD 720p FLAC|BD 1280x720 H264 AAC) *(\)|\])/[720p BD]/i;
+  $newname =~ s/(\(|\[) *(BDrip 720p Vorbis|BD 720p Hi10P AAC|BD, 720p,|BD 720p H264-AAC|BDRip 720p|BD, 720p, ,|1280x720 BD|BD 1280x720 H264 AAC|BD 720p|BD 720p FLAC|BD 1280x720 H264 AAC) *(\)|\])/[720p BD]/i;
+  $newname =~ s/(\(|\[) *(BD 540p) *(\)|\])/[BD]/i;
   $newname =~ s/(\(|\[) *(1024x576|H264 1024x576) *(\)|\])/[576p]/i;
   $newname =~ s/(\(|\[) *(1920x1080) *(\)|\])/[1080p]/i;
   ##SLICED BREAD pt.2
@@ -428,6 +432,8 @@
   $newname =~ s/ SP0/ - Special /;
   $newname =~ s/ SP(\d+) / - Special $1 /;
   $newname =~ s/ Special - / - Special /;
+  $newname =~ s/ Animated Commentary - / - Animated Commentary /;
+  $newname =~ s/ Fullmetal Alchemist Brotherhood (- |)Skit - / Fullmetal Alchemist Brotherhood - Skit /i;
   $newname =~ s/ - Picture Drama - / - Picture Drama /;
   $newname =~ s/ (Mayoi Neko Overrun! - Theater) - / $1 /;
   $newname =~ s/ Opening - / Opening /;