Changeset 759 for trunk

Timestamp:

Dec 11, 2012, 4:49:07 PM (12 years ago)

Author:

pfusik

Message:

new.m3u: corrected.

Location:

trunk

Files:

• asma/Docs/Asma.txt (modified) (1 diff)
• asma/new.m3u (modified) (4 diffs)
• tools/svn2new.pl (modified) (2 diffs)

trunk/asma/Docs/Asma.txt

@@ -18 +18 @@
 
                            Started on August 4, 1999
-                       Last updated on December 6, 2012
+                       Last updated on December ??, 2012
 
-                    Total number of songs: 4612 (300 new)
+                     Total number of songs: 4612 (297 new)
 
 

trunk/asma/new.m3u

@@ -25 +25 @@
 Composers/Chamberlain_Craig/Two_Part_Invention_no_13.sap
 Composers/Claas_Clever/Speed_Matter_Ingame.sap
+Composers/Daglish_Ben/Footballer_of_the_Year.sap
 Composers/Delooze_Chris/Death_Races.sap
 Composers/Delooze_Chris/Freaky_Factory.sap
 Composers/Delooze_Chris/War_Copter.sap
-Composers/Daglish_Ben/Footballer_of_the_Year.sap
 Composers/Duma_Dariusz/Disco_Beat.sap
 Composers/Duma_Dariusz/Out_of_Prison.sap
@@ -103 +103 @@
 Composers/Lis_Piotr/I_Love_You_True_Story.sap
 Composers/Luberda_Michal/Attention.sap
-Composers/Luberda_Michal/Hear_Me.sap
 Composers/Luberda_Michal/In_Space.sap
 Composers/Luberda_Michal/Moon.sap
@@ -279 +278 @@
 Unknown/March.sap
 Unknown/Musbox.sap
+Unknown/Music_2000_Menu.sap
 Unknown/No_Limit.sap
 Unknown/ORileys_Mine.sap
@@ -289 +289 @@
 Unknown/Rumad.sap
 Unknown/Sing_Hosanna.sap
-Unknown/Somebody.sap
 Unknown/Sorella.sap
 Unknown/Spaceship_Demo.sap
 Unknown/Streets_of_London.sap
 Unknown/Sweeney.sap
-Unknown/Tblues.sap
 Unknown/Telemann.sap
 Unknown/The_Holly_and_The_Ivy.sap
-Unknown/Walzer.sap
 Unknown/Young_Ones.sap

trunk/tools/svn2new.pl

@@ -2 +2 @@
 my @i = `svn log -qv -r $r:HEAD ../asma`;
 my (%a, %d);
+my @d;
 for (@i) {
-        if (m{^   A /trunk/asma/(\S+\.sap)(?: \(from /trunk/asma/(\S+\.sap)\))?}) {
+        if (m{^   A /trunk/asma/(\S+\.sap)(?: \(from /trunk/asma/(\S+\.sap):\d+\))?}) {
                 $a{$1} = 1, delete $d{$1} if !$2 || delete $a{$2};
         }
-        elsif (m{^   D /trunk/asma/(\S+\.sap)}) {
-                $d{$1} = 1;
-                delete $a{$1};
+        elsif (m{^   D /trunk/asma/(\S+)}) {
+                # postpone deletes after adds, so that copy+delete in one commit works
+                push @d, $1;
+        }
+        elsif (m{^---}) {
+                for (@d) {
+                        $d{$_} = 1;
+                        if (/\.sap$/) {
+                                delete $a{$_};
+                        }
+                        else {
+                                my $dir = $_;
+                                delete @a{grep m{^$dir/}, keys %a};
+                        }
+                }
+                @d = ();
         }
 }
@@ -15 +29 @@
 open F, ">deleted.txt" or die;
 print F "$_\n" for sort keys %d;
-printf "New: %d Deleted: %d\n", scalar %a, scalar %d;
+printf "New: %d Deleted: %d\n", scalar(keys %a), scalar(keys %d);