Mercurial > ec-dotfiles

changeset 87:c884853b25d1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Latestest ren.
author Genshiken Admin <admin@genshiken-itb.org>
date Wed, 19 Oct 2011 06:49:55 +0000
parents 4a22703b183c
children 917b525eaee0
files bin/ren
diffstat 1 files changed, 94 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/bin/ren	Sat Jul 09 15:39:00 2011 +0700
+++ b/bin/ren	Wed Oct 19 06:49:55 2011 +0000
@@ -11,8 +11,55 @@
   my $newname = $_;
   #START HERE
   $newname =~ s/_/ /g;
+  # GROUP NAMES
+  $newname =~ s/\[UTW Mazui\]/[UTW-Mazui]/i;
   #TITLE AND NAMES
+  $newname =~ s/^(\(|\[)W B(\)|\])/[W_B]/;
+  $newname =~ s/^Genesis of Aquarion - (\d+) \[3xR\]\[Blu-ray.720p.H264.FLAC.AC3\](v2|)/[3xR] Genesis of Aquarion - $1 [$2 720p BD]/;
+  $newname =~ s/^Otogi Zoshi Act\.(\d+)\[x264 AAC\]\[SSP-Corp\]/[SSP-Corp] Otogi Zoshi - $1 /;
+  $newname =~ s/Onii-chan no Koto Nanka Zenzen Suki Janain Dakara ne!! - (\d+) \[Uncut\]/Onii-chan no Koto Nanka Zenzen Suki Janain Dakara ne!! - $1 /;
+  $newname =~ s/^cor\.extras\.infinite\.ryvius\.textless\.opening(\d+)\./[cor] Infinite Ryvius - Opening $1 (Clean) /;
+  $newname =~ s/^cor\.extras\.infinite\.ryvius\.textless\.ending(\d+)\./[cor] Infinite Ryvius - Ending $1 (Clean) /;
+  $newname =~ s/^cor\.extras\.infinite\.ryvius\.art\.gallery\.and\.audio\.drama(\d+)\./[cor] Infinite Ryvius - Picture Drama $1 /;
+  $newname =~ s/^cor\.extras\.infinite\.ryvius\.ryvius\.vj\.mix(\d+)\./[cor] Infinite Ryvius - Ryvius VJ Mix $1 /;
+  $newname =~ s/^cor\.extras\.infinite\.ryvius\.ryvius\.illusion(\d+)\.mini-episode(\d+)\./[cor] Infinite Ryvius - Ryvius Illusion $1 - Mini Episode $2 /;
+  $newname =~ s/^cor\.extras\.infinite\.ryvius\.ryvius\.illusion(\d+)\.(introduction|ending)\./[cor] Infinite Ryvius - Ryvius Illusion $1 - $2 /;
+  $newname =~ s/ (Ryvius Illusion \d+) - ending / $1 - Ending /;
+  $newname =~ s/ (Ryvius Illusion \d+) - introduction / $1 - Introduction /;
+  $newname =~ s/^Arigatou\.Tokyo\.Majin\.Ep(\d+)\./[Arigatou] Tokyo Majin - $1 /;
+  $newname =~ s/ (Inazuma Eleven - )(\d{2}) / $1 0$2 /;
+  $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/\] 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;
+  $newname =~ s/\] Seikon no Qwaser Picture Drama - (\d+) /] Seikon no Qwaser - Picture Drama $1 /i;
+  $newname =~ s/\] Fortune Arterial Akai Yakusoku - /] Fortune Arterial - /;
+  $newname =~ s/\] Ookami to Koushinryou - /] Spice and Wolf - /;
+  $newname =~ s/\] Mobile Suit Gundam AGE - /] Gundam AGE - /i;
+  $newname =~ s/\] Soredemo Machi wa Mawatte Iru - /] Soredemo Machi wa Mawatteiru - /;
+  $newname =~ s/\] Spiral - (\d+) .* \[640 x 480\]\[H\.264\]/] Spiral - $1 /;
+  $newname =~ s/\] Mayo Chiki - / ] Mayo Chiki! - /i;
+  $newname =~ s/\] Naruto Shippuden - /] Naruto Shippuuden - /i;
+  $newname =~ s/\] Tamayura - hitotose - /] Tamayura ~hitotose~ - /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 /;
+  $newname =~ s/ *Moritasan wa Mukuchi */ Morita-san wa Mukuchi /i;
+  $newname =~ s/ Hanasakeru Seishonen / Hanasakeru Seishounen /i;
+  $newname =~ s/^YAMATO 3x(\d+).*/Yamato S3 - $1.mkv/i;
+  $newname =~ s/ - (Ending|Opening) (\d+ *[a-z]*) (Clean) / - $1 $2 ($3) /i;
+  $newname =~ s/^\[T-N\]Mirai Sentai TimeRanger (\d+)(\[[A-F0-9]{8}\])DVD(|ver2|ver3)(\.avi)$/[T-N] Mirai Sentai Time Ranger - $1 $3 [DVD]$2$4/;
+  $newname =~ s/^Yamato (\d+) - remaster \(Central Anime\)/[Central Anime] Yamato - $1 /i;
+  $newname =~ s/^Yamato S2 (\d+) - remaster \(Central Anime\)/[Central Anime] Yamato S2 - $1 /i;
+  $newname =~ s/\[TSuNDeRe\]Tsuyokiss\.(\d+)\./[Tsundere] Tsuyokiss - $1 /i;
+  $newname =~ s/\[RANDOMFAGGOTS\]/[Randomfaggots]/i;
+  $newname =~ s/\[Keroro\]\.(\d+)\.\[Xvid\.mp3\]\./[Keroro] Keroro Gunsou - $1 /i;
+  $newname =~ s/\[Keroro\] \.(\d+)\. \[\.mp3\] \. /[Keroro] Keroro Gunsou - $1 /i;
   $newname =~ s/\[WPP & T-N\]/[WPP T-N]/;
+  $newname =~ s/ Yuru Yuri / YuruYuri /i;
+  $newname =~ s/ Clannad - After Story / Clannad After Story /i;
+  $newname =~ s/ Manyuu Hikenchou - (\d+) ~DC~ / Manyuu Hikenchou - $1 [Uncut]/;
   $newname =~ s/\[Elysium\]K-ON!!\.EP(\d+)\(BD\.1080p\.FLAC\)/[Elysium] K-ON!! - $1 [1080p BD]/i;
   $newname =~ s/\[Elysium\]K-ON!!\.(ED|OP)(\d+)\(BD\.1080p\.FLAC\)/[Elysium] K-ON!! - $1 $2 [1080p BD]/i;
   $newname =~ s/\[Elysium\]K-ON!!\.SP\d+\[EP(\d+)\]\(BD\.1080p\.FLAC\)/[Elysium] K-ON!! - $1 [1080p BD]/i;
@@ -21,10 +68,12 @@
   $newname =~ s/\[a-s\] sakigake!! cromartie high school - (\d+) - .* /[a-S] Sakigake!! Cromartie High School - $1 /;
   $newname =~ s/zx\.tenchi-universe\./[zx] Tenchi Universe - /;
   $newname =~ s/\[Saizen & Shinsen-Subs\]/[Saizen-SHS]/i;
-  $newname =~ s/ ro-kyu-bu! / Ro-Kyu-Bu! /i;
+  $newname =~ s/ ro-kyu-bu(!)? / Ro-Kyu-Bu! /i;
+  $newname =~ s/^cor\.tv\.infinite\.ryvius\.(\d+)\./[cor] Infinite Ryvius - $1 /i;
   $newname =~ s/ Ore no Imouto ga Konna ni Kawaii Wake ga Nai / Ore no Imouto /i;
   $newname =~ s/ no 6 / No. 6 /i;
-  $newname =~ s/ THE iDOLM\@STER / The iDOLM\@STER /i;
+  $newname =~ s/\[ACX\]Gantz - (\d+) .* \[SaintDeath\] /[ACX] Gantz - $1 /i;
+  $newname =~ s/ THE iDOLM\@STER / The Idolm\@ster /i;
   $newname =~ s/^- (\d+) - (\[neo1024\])/$2 Luping III S3 - $2/i;
   $newname =~ s/ Luping III S3 / Lupin III S3 /i;
   $newname =~ s/( Transformers Headmasters - \d+) - .*\[/$1 [/i;
@@ -32,6 +81,8 @@
   $newname =~ s/^cor\.extras\.getbackers\.(opening|ending)(\d+)\./[cor] GetBackers - $1 $2 /;
   $newname =~ s/^Revolutionary Girl Utena /[Henshin] Revolutionary Girl Utena /;
   $newname =~ s/His and Her Circumstances/His and Her Circumstances/i;
+  $newname =~ s/ Lime-iro Senkitan / Lime-Colored War Tales /i;
+  $newname =~ s/(Ninja Scroll) TV Ep\.(\d+)\[.*(\[SSP-Corp\])/$3 $1 - $2 /i;
   $newname =~ s/Magical Girl Madoka Magica/Puella Magi Madoka Magica/i;
   $newname =~ s/ Pretty Rhythm Aurora Dream / Pretty Rhythm - Aurora Dream /i;
   $newname =~ s/(\[dvdrip\] Transformers \(1984\) -) E(\d+) .*(\.avi)/$1 $2 $3/;
@@ -40,6 +91,7 @@
   $newname =~ s/^\[RaX\] *Kiba - (\d+) - .* (\[v2\] \[|\[)/[RaX] Kiba - $1 $2/;
   $newname =~ s/ (Gosick - \d+) \(Batch\) / $1 /;
   $newname =~ s/ Clannad - After Story - / Clannad After Story - /;
+  $newname =~ s/ Ikoku Meiro no Croisée / Ikoku Meiro no Kurowaaze /i;
   $newname =~ s/^Mahoujin Guruguru TV2 - Doki Doki Densetsu Ep(\d+) \((Chamelenia)\)/[Chamelenia] Mahoujin Guruguru 2 - Doki Doki Densetsu - $1/i;
   $newname =~ s/\.divx5\.ogm$/.ogm/;
   #$newname =~ s/\[(neo1024)\] Lupin III - (\d+) - .+ \[/[$1] Lupin III S2 - $2 [/;
@@ -58,8 +110,10 @@
   $newname =~ s/^PitaTen.* Ep (\d+) .*\.avi/[Hnk] Pita Ten - $1.avi/;
   $newname =~ s/^\[a-S\] Inuyasha - (\d+|\d+-\d+) /Inuyasha - $1 [a-S]/;
   $newname =~ s/\[DVD\]\[AHQ\]/[AHQ][DVD]/;
+  $newname =~ s/\[THORA\]/[Thora]/i;
   $newname =~ s/\[subdesu\]/[SubDesu]/i;
   $newname =~ s/ Zettai Shougeki - Platonic Heart / Zettai Shougeki /i;
+  $newname =~ s/^ef a tale of memories (prologue|- Opening \d+|- Ending \d+|- \d+) .*THORA/[Thora] ef - a tale of memories - $1 [1080p BD]/i;
   $newname =~ s/ A-Channel / A Channel /i;
   $newname =~ s/^mars daybreak /[V-A] Mars Daybreak - /;
   $newname =~ s/ Shuffle! Episode / Shuffle! /;
@@ -72,6 +126,9 @@
   $newname =~ s/^(\[Kira-Fansub\]) Uchuu no (Stellvia) /$1 $2 /;
   $newname =~ s/^(\[RaX\])(Chobits) - (\d+`\d) .*\(x264 aac\) /$1 $2 - $3 /;
   $newname =~ s/ Maria( |†)Holic / Maria+Holic /i;
+  $newname =~ s/ C³ / C3 - Cube x Cursed x Curious /i;
+  $newname =~ s/ C3 Cube x Cursed x Curious / C3 - Cube x Cursed x Curious /i;
+  $newname =~ s/ Fate( ⁄ | )Zero / Fate-Zero /i;
   $newname =~ s/ Pollyanna Episode / Pollyanna /;
   $newname =~ s/^Legend of Galactic Heroes - (\d+) \(([A-F0-9]{8})\) \[Central Anime\]/[Central Anime] Legend of Galactic Heroes - $1 [$2]/;
   $newname =~ s/\[Hnk\]/[HnK]/;
@@ -81,8 +138,6 @@
   $newname =~ s/ Digimon Tamers - (\d)\./ Digimon Tamers - 0$1./;
   $newname =~ s/ Kore wa Zombie Desu ka / Kore wa Zombie desu ka /i;
   $newname =~ s/ Infinite Stratos - IS - / Infinite Stratos - /;
-  $newname =~ s/\[Keroro\]\.(\d+)\.\[Xvid\.mp3\]\./[Keroro] Keroro Gunsou - $1 /i;
-  $newname =~ s/\[Keroro\] \.(\d+)\. \[\.mp3\] \. /[Keroro] Keroro Gunsou - $1 /i;
   $newname =~ s/Shadow\.Star\.Narutaru\.(\d+)\.\(Dual\.Audio\)\.XVID\.\[AM\]/[AM] Narutaru - $1 /;
   $newname =~ s/Outlaw Star Remastered E(\d+) .*'/ Outlaw Star - $1 /;
   $newname =~ s/Ground Defense Force Mao-chan (\d+)\[h\.264-AAC\]\[SSP-Corp\]/[SSP-Corp] Mao-chan - $1 /;
@@ -105,6 +160,7 @@
   $newname =~ s/^\[Doremi\]\.HeartCatch\.PreCure!\.(\d+)\.\[1280x720\]\./[Doremi] HeartCatch PreCure! - $1 [720p]/;
   $newname =~ s/^\[Doremi-CureCom\]\.Suite\.PreCure!\.(\d+)\.\[1280x720\]\./[Doremi-CureCom] Suite PreCure! - $1 [720p]/;
   $newname =~ s/^\[Doremi\]\.Motto\.Ojamajo\.Doremi\.(\d+)\./[Doremi] Motto Ojamajo Doremi - $1 /;
+  $newname =~ s/^\[Doremi\] *\.Ojamajo\.Doremi\.Dokkaan!\.(\d+)\./[Doremi] Ojamajo Doremi Dokkaan! - $1 /;
   $newname =~ s/^\[HorribleSubs\] Lilpri /[HorribleSubs] Hime Chen! Otogi Chikku Idol Lilpri - /i;
   $newname =~ s/^\[Jumonji-Giri\] \[AnY\]/[Jumonji-Giri]/;
   $newname =~ s/\[(BWS|PM)\]Pocket Monsters Best Wishes (\d+) .+\[H264 /[$1] Pokemon Best Wishes - $2 [/;
@@ -112,6 +168,7 @@
   $newname =~ s/Les Miserables Shoujo Cosette /Les Miserables /;
   $newname =~ s/\[Elysium\]Baka\.to\.Test\.to\.Shoukanjuu\.(EP)?/[Elysium] Baka to Test to Shokanju/;
   $newname =~ s/\[Elysium\] Baka to Test to Shokanju/[Elysium] Baka to Test to Shokanju /;
+  $newname =~ s/ Baka to Test to Shou?kanjuu? / Baka to Test to Shokanju /;
   $newname =~ s/\(BD\.1080p\.FLAC\)/[1080p BD]/;
   $newname =~ s/Saizen & SD/Saizen-SD/;
   $newname =~ s/Bleach - (\d{2}) /Bleach - 0$1 /;
@@ -120,6 +177,7 @@
   $newname =~ s/\(B-A\)Great Teacher Onizuka - Lesson /[B-A] Great Teacher Onizuka - /;
   $newname =~ s/Xam'd Lost Memories - (\d+) .* \[1080p,BluRay,,DTS\] - THORA\.mkv/[THORA] Xam'd Lost Memories - $1 [1080p BD].mkv/;
   $newname =~ s/\(G P\) Escaflowne \(Remastered\)/[G_P] Escaflowne/;
+  $newname =~ s/^\(G P\) /[G_P] /;
   $newname =~ s/SD&Taka/SD-Taka/;
   $newname =~ s/Seikai no Senki/Banner of the Stars/;
   $newname =~ s/Onii-chan no Koto \.\.\. /Onii-chan no Koto Nanka Zenzen Suki Janain Dakara ne /;
@@ -132,7 +190,9 @@
   $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/Sora no Woto - ([^ ]+) \[BD 1080p\]\[AtsA\]/[AtsA] Sora no Woto - $1 [1080p BD]/;
+  $newname =~ s/^(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 /;
   $newname =~ s/Battle Programmer Shirase - 0/Battle Programmer Shirase - /;
   $newname =~ s/ Kuragehime / Princess Jellyfish /;
@@ -181,31 +241,33 @@
   $newname =~ s/ Ore No Imouto / Ore no Imouto /;
   $newname =~ s/ A Certain Magical Index II / Toaru Majutsu no Index II /i;
   $newname =~ s/ TV Broadcast \[720p/ [LQ 720p/;
-  $newname =~ s/ ED(\d)/ - Ending $1 /;
-  $newname =~ s/ OP(\d)/ - Opening $1 /;
+  $newname =~ s/ ED(\d+[a-z]*)/ - Ending $1 /i;
+  $newname =~ s/ OP(\d+[a-z]*)/ - Opening $1 /i;
   $newname =~ s/ ED / - Ending /;
-  $newname =~ s/ NCED / - Ending (Clean) /i;
+  $newname =~ s/ Creditless Opening (\d+) / - Opening $1 (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;
-  $newname =~ s/ NCOP / - Opening (Clean)/i;
+  $newname =~ s/ (NCOP|Opening Clean) / - Opening (Clean)/i;
   $newname =~ s/ OP / - Opening /;
-  $newname =~ s/ - - / - /;
+  $newname =~ s/ (\d+-\d+) / - $1 /;
+  $newname =~ s/ - - / - /g;
   $newname =~ s/ Ep / /ig;
-  #GENERAL RULES
-  $newname =~ s/\(1280x720 x264 AAC\)/[720p]/i;
-  $newname =~ s/\( *(1920x1038 Blu-Ray FLAC|1920x1080 h264 BD FLAC|1920x1080 BD) *\)/[1080p BD]/i;
-  $newname =~ s/\(BD\.1080p\.FLAC\)/[1080p BD]/;
   ##SLICED BREAD
-  $newname =~ s/\[(\d+th Release|xvid|divx5\.2\.1|divx5\.1|divx5\.05|divx5\.1\.1|h\.?264 AC3|848x480|H264 848x480|h264-480p AAC|h\.264-480p)\]//i;
-  $newname =~ s/\[(DVD 720x480|DVD H264 720x480)\]/[DVD]/i;
-  $newname =~ s/\[(1280x720 H264 AAC)\]/[720p]/i;
-  $newname =~ s/\[(BD 1280x720 H264 AAC)\]/[720p BD]/i;
-  $newname =~ s/\( *(BD 720p|BD 720p FLAC|BD 1280x720 H264 AAC) *\)/[720p BD]/i;
-  $newname =~ s/\( *(1280x720|1280x720 H\.?264 AAC) *\)/[720p]/i;
+  $newname =~ s/(\(|\[) *(h264\.aac|hi10p|10bit|\d+th Release|x264\.aac|xvid|divx5\.2\.1|divx5\.1|divx5\.05|divx5\.1\.1|h\.?264 AC3|848x480|H264 848x480|h264-480p AAC|h\.264-480p) *(\)|\])//i;
+  $newname =~ s/\[(DVD 10bit)\]/[DVD 10bit]/i;
+  $newname =~ s/(\(|\[) *(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 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/(\(|\[) *(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/(\(|\[) *(1024x576|H264 1024x576) *(\)|\])/[576p]/i;
+  $newname =~ s/(\(|\[) *(1920x1080) *(\)|\])/[1080p]/i;
   ##SLICED BREAD pt.2
   $newname =~ s/(\d+)v(\d+)/$1 [v$2]/i;
   $newname =~ s/\[BD\]\[1920x1080 H264-Flac\]/[1080p BD]/i;
+  $newname =~ s/\[BD\]\[720p-AAC\]/[720p BD]/i;
   $newname =~ s/\.DVD/[DVD]/;
-  $newname =~ s/ ~(.+)~ / - $1 /;
+  #$newname =~ s/ ~(.+)~ / - $1 /;
   $newname =~ s/v2 \(BD-1080p\) / [v2 1080p BD]/i;
   $newname =~ s/v2 \(BD H264 1280x960 24fps AAC\) / [v2 960p BD]/i;
   $newname =~ s/BD 1280x720 FLAC\]/ 720p BD]/i;
@@ -254,7 +316,6 @@
   $newname =~ s/\(1280x720\)/ [720p]/i;
   $newname =~ s/\(1920x1080\)/ [1080p]/i;
   $newname =~ s/\(1024x576\)/ [576p]/i;
-  $newname =~ s/\[1024x576\]/[576p]/i;
   $newname =~ s/\[v(\d+) 1024x576\]/[v$1 576p]/i;
   $newname =~ s/\(1280x720 h264\)/ [720p]/i;
   $newname =~ s/\(1280x720 ?(h264|x264)?( aac)?\)/ [720p]/i;
@@ -293,6 +354,7 @@
   $newname =~ s/\[720p\]\[v2\]/[v2 720p]/i;
   $newname =~ s/\[480p\]//i;
   $newname =~ s/\[v2\]\[720p\]/[v2 720p]/i;
+  $newname =~ s/\[(v\d)\]\[(\d+p)(| BD)\]/[$1 $2$3]/i;
   $newname =~ s/\[H264 - AAC\]//i;
   $newname =~ s/\[H264 1280x720 AAC\] /[720p]/i;
   $newname =~ s/\[DVD 480p\]/[DVD]/i;
@@ -325,8 +387,8 @@
   $newname =~ s/\]/] /g;
   $newname =~ s/\[/ [/g;
   $newname =~ s/\] +\[/][/g;
-  $newname =~ s/\[ +/[/g;
-  $newname =~ s/ +\]/]/g;
+  $newname =~ s/(\[|\() +/$1/g;
+  $newname =~ s/ +(\]|\))/$1/g;
   $newname =~ s/( -)+ / - /g;
   $newname =~ s/(\[|\()([0-9a-fA-F]{8})(\]|\))/[\U$2]/;
   $newname =~ s/ +(\.\w{3})$/$1/;
@@ -337,20 +399,27 @@
   $newname =~ s/^\[DB&L-E\]/[DB L-E]/;
   $newname =~ s/ VS Knight Lamune & - 40 fire / VS Knight Lamune & 40 fire /;
   $newname =~ s/ RAINBOW / Rainbow /;
+  $newname =~ s/ (Infinite Ryvius - Ryvius Illusion|Infinite Ryvius - Ryvius VJ Mix|Kara no Kyoukai - Cinema Intro) - / $1 /;
   $newname =~ s/ Golgo - 13 / Golgo 13 /;
   $newname =~ s/ Strike Witches - 2 / Strike Witches 2 - /;
   $newname =~ s/ 07-GHOST / 07-Ghost /;
   $newname =~ s/ K-ON!! B-Side Theater - Uraon!! - / K-ON!! B-Side Theater - Uraon!! /;
   $newname =~ s/ Captain Tsubasa Road to - 2002 / Captain Tsubasa Road to 2002 /;
   $newname =~ s/ Ultraviolet Code - 044 - / Ultraviolet Code 044 - /;
+  $newname =~ s/ Persona - 3 Picture Drama - She Goes For A Walk / Persona 3 Picture Drama - She Goes For A Walk - /;
   $newname =~ s/ SP0/ - Special /;
+  $newname =~ s/ SP(\d+) / - Special $1 /;
   $newname =~ s/ Special - / - Special /;
+  $newname =~ s/ - Picture Drama - / - Picture Drama /;
+  $newname =~ s/ (Mayoi Neko Overrun! - Theater) - / $1 /;
   $newname =~ s/ Opening - / Opening /;
   $newname =~ s/ Ending - / Ending /;
   $newname =~ s/ Hidamari Sketch Hoshimittsu - Special / Hidamari Sketch Hoshimittsu Special - /;
   $newname =~ s/ Spice and Wolf S2 - BD Menu - 0/ Spice and Wolf S2 - BD Menu /;
   $newname =~ s/ Canvas - 2 - / Canvas 2 - /;
+  $newname =~ s/ Tsubasa Chronicles - 2 (\d{2}) / Tsubasa Chronicles 2 - $1 /;
   $newname =~ s/ Mitsudomoe - 2 - / Mitsudomoe 2 - /;
+  $newname =~ s/ Morita-san wa Mukuchi - 2 / Morita-san wa Mukuchi 2 /i;
   $newname =~ s/ Eyeshield - 21 - / Eyeshield 21 - /;
   $newname =~ s/ - opening - (\d+) / - Opening $1 /i;
   $newname =~ s/ - ending - (\d+) / - Ending $1 /i;
@@ -360,6 +429,7 @@
   $newname =~ s/ Mahoujin Guruguru - 2 - Doki Doki Densetsu - / Mahoujin Guruguru 2 - Doki Doki Densetsu - /;
   $newname =~ s/ The World God Only Knows - 2 - / The World God Only Knows 2 - /;
   $newname =~ s/ Legend of Galactic Heroes Gaiden - 2 - / Legend of Galactic Heroes Gaiden 2 - /;
+  $newname =~ s/ Kara no Kyoukai - (\d+) / Kara no Kyoukai - Chapter $1/;
   $newname =~ s/\[G P\]/[G_P]/i;
   #SAFE CLEANUPS
   $newname =~ s/ +/ /g;