diff bin/ren @ 400:657f787fbae8

Merge remote-tracking branch 'origin/master'
author Edho Arief <edho@myconan.net>
date Tue, 04 Sep 2012 10:23:37 +0700
parents 0051e1fccb40
children fcb116fc12f9
line wrap: on
line diff
--- a/bin/ren	Tue Sep 04 10:22:46 2012 +0700
+++ b/bin/ren	Tue Sep 04 10:23:37 2012 +0700
@@ -28,6 +28,9 @@
   $newname =~ s/(Ending) (\(Clean\)) - 0(\d+)/$1 $3 $2/;
   $newname =~ s/(Opening) (\(Clean\))0(\d+)/$1 $3 $2/;
   $newname =~ s/ A\+Channel / A Channel - Special /;
+  $newname =~ s/ Arcana✴Famiglia / Arcana Famiglia /i;
+  $newname =~ s/ Yuru Yuri♪♪ / Yuru Yuri S2 /i;
+  $newname =~ s/ Dog Days' / Dog Days S2 /i;
   $newname =~ s/\[commie\]/[Commie]/i;
   $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/^(Ayashi no Ceres|Chikyuu Shoujo Arjuna|Futari wa Precure  Splash Star) - (\d+)\[\d+\] - .*(\[DVD\])(\[[^]]+\])(\[[a-f0-9]{8}\]\.[^.]+)$/$4 $1 - $2 $3$5/i;
@@ -66,6 +69,7 @@
   $newname =~ s/\] Saint Seiya The Lost Canvas - /] Saint Seiya - The Lost Canvas - /;
   $newname =~ s/\] Love GetChu - /] Love Get Chu - /i;
   $newname =~ s/\] Kamen Rider Blade /] Kamen Rider Blade /i;
+  $newname =~ s/\] Lovedol ~ Lovely Idol - /] Lovedol ~Lovely Idol~ - /i;
   $newname =~ s/\] Mobile Suit Gundam AGE - /] Gundam AGE - /i;
   $newname =~ s/\] Kore wa Zombie Desu ka? of the Dead - /] Kore wa Zombie desu ka - of the Dead - /i;
   $newname =~ s/\] Kore wa Zombie Desu ka- of the Dead - /] Kore wa Zombie desu ka - of the Dead - /i;
@@ -214,6 +218,7 @@
   $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 [/;
+  $newname =~ s/\[(BWS|PM)\] *Pocket Monsters Best Wishes Season (- )?2 (\d+) .+\ \[/[$1] Pokemon Best Wishes 2 - $3 [/;
   $newname =~ s/ Ookiku Furikabutte - The Summer Tournament Chapter / Ookiku Furikabutte S2 /;
   $newname =~ s/Les Miserables Shoujo Cosette /Les Miserables /;
   $newname =~ s/\[Elysium\]Baka\.to\.Test\.to\.Shoukanjuu\.(EP)?/[Elysium] Baka to Test to Shokanju/;
@@ -314,15 +319,15 @@
   #nothing
   $newname =~ s/(\(|\[) *(divx5\.2|H264 704x400|640x480 DivX511 120fps mp3|640x480 DivX511 mp3|h\.264-Hi10P|720x480|10-?bit|10bit 480p H264|640x360|640x360 H264 AAC|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;
   #dvd
-  $newname =~ s/(\(|\[) *(DVD\]\[1024x576 -|DVD H264 Hi10P 640x480|DVD Hi10P 640x480|DVD-480p-AAC|DVD x264 10-bit AC3|DVD 10bit) *(\)|\])/[DVD]/i;
+  $newname =~ s/(\(|\[) *(DVDRip 640x480|DVDRip h264 640x480 AAC|DVD, 480p|DVD\]\[1024x576 -|DVD H264 Hi10P 640x480|DVD Hi10P 640x480|DVD-480p-AAC|DVD x264 10-bit AC3|DVD 10bit) *(\)|\])/[DVD]/i;
   #dvd again
   $newname =~ s/(\(|\[) *(R2 DVD\.H264\.AC3|DVD H264 720x480|DVD 720x480 x264 FLAC|R1DVD 720x480 x264 AC-3|DVD 712x480 AC-3|DVD 720x480 AC-3|R\d DVD\.H264\.AC3|DVD 1024x576 x264 FLAC|DVD H264 640x480|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;
   #1080p BD
   $newname =~ s/(\(|\[) *(BD\]\[10bit-1080p-AAC|BDRip 1080p x264 FLAC|BD Hi10P 1920x1080|BD Hi10P 1920x1080 H264 FLAC|BD 1920x1080 x264 Hi10P FLAC|BD 1920x1080 Hi10P|1920x1080 BD AAC|BD\]\[h264-1080p FLAC|BD-h264-10bit-1080p|BD\]\[1080p-FLAC|BD 1080|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;
   #720p
-  $newname =~ s/(\(|\[) *(1280x720 x264-Hi10P AAC|AT-X Hi10P 1280x720 H264|AT-X Hi10P 1280x720|1280x720 Hi10p|AT-X Hi10P 1280x720|1280x720 Hi10p AAC|AT-X 1280x720 H264|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 1280x720|1280x720 8bit|1280x720 x264-Hi10P AAC|AT-X Hi10P 1280x720 H264|AT-X Hi10P 1280x720|1280x720 Hi10p|AT-X Hi10P 1280x720|1280x720 Hi10p AAC|AT-X 1280x720 H264|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;
   #720p BD
-  $newname =~ s/(\(|\[) *(BD\]\[720p-|BD, 720p, 10bit, AAC|BDRip 720p x264 FLAC|BDRip 720p|BD 720p DA|Blu-Ray 960x720 Dual Audio FLAC|BD, 720p|BD\]\[h264-720p\]\[FLAC|BD Hi10P 1280x720|BD, 720p, 10bit,|BD, 720, 10bit, AAC|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 10-bit 1280x720 x264 AAC|BD\]\[720p-|BD, 720p, 10bit, AAC|BDRip 720p x264 FLAC|BDRip 720p|BD 720p DA|Blu-Ray 960x720 Dual Audio FLAC|BD, 720p|BD\]\[h264-720p\]\[FLAC|BD Hi10P 1280x720|BD, 720p, 10bit,|BD, 720, 10bit, AAC|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;
   #BD
   $newname =~ s/(\(|\[) *(Blu-Ray|BD 540p) *(\)|\])/[BD]/i;
   #576p
@@ -476,7 +481,7 @@
   $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/ (Menu|Special) - / - $1 /;
   $newname =~ s/ Animated Commentary - / - Animated Commentary /;
   $newname =~ s/ Fullmetal Alchemist Brotherhood (- |)Skit - / Fullmetal Alchemist Brotherhood - Skit /i;
   $newname =~ s/ - Picture Drama - / - Picture Drama /;