--- deliantra/server/ext/map-random.ext	2008/05/08 20:03:50	1.31
+++ deliantra/server/ext/map-random.ext	2010/04/13 03:24:32	1.42
@@ -56,41 +56,40 @@
    1
 }
 
-sub clean_random_maps {
-   my $files = Coro::AIO::aio_readdir $cf::RANDOMDIR
-      or return;
+sub select_random_map {
+   my ($maps, $difficulty) = @_;
 
-   my $META_TIMEOUT = $cf::CFG{map_random_meta_timeout} || 86400 * 7;
+   # because I am lazy, I ignore the weighting
 
-   for my $file (@$files) {
-      next unless $file =~ /\.meta$/;
+   my @maps = keys %$maps;
 
-      Coro::AIO::aio_stat "$cf::RANDOMDIR/$file"
-         and next;
-
-      my $age = $cf::NOW - (stat _)[8];
-
-      if ($age > $META_TIMEOUT) {
-         warn "resetting random meta data for $file";
-         IO::AIO::aio_unlink "$cf::RANDOMDIR/$file";
-      }
-   }
+   cf::map::find "/styles/$maps[cf::rmg_rndm scalar @maps]"
 }
 
 # called by the random map generator
 sub find_style_;
-sub find_style_($$) {
-   my ($path, $difficulty) = @_;
+sub find_style_($$$) {
+   my ($path, $difficulty, $recurse) = @_;
 
    my $map;
 
+   # see if there is a metafile
+   if (0 < aio_load "$cf::MAPDIR/$path.rmg", my $meta) {
+      $meta = cf::decode_json $meta;
+
+      # only "maps" is supported
+      if ($meta->{maps}) {
+         $map = select_random_map $meta->{maps}, $difficulty;
+      }
+   }
+
    $map = cf::map::find $path
       unless aio_stat "$cf::MAPDIR/$path.map";
 
    unless ($map) {
       # search files and/or dirs
       if (my ($dirs, $nondirs) = aio_scandir "$cf::MAPDIR/$path/", 1) {
-         my @entries = sort grep s/\.map$//, @$nondirs;
+         my @entries = sort grep s/\.(?:map|rmg)$//, @$nondirs;
 
          if ($difficulty < 0) {
             # pick a fully random map, but only a map, do not recurse
@@ -99,13 +98,13 @@
          } else {
             # pick a map with nearest difficulty value ("mapname_<difficulty>.map")
             @entries = sort @$dirs
-               unless @entries;
+               unless @entries || !$recurse;
 
             my $min_diff = 1e99;
 
             for my $name (@entries) {
                if ($name =~ /_(\d+)$/) {
-                  my $diff = abs $difficulty - $1 + 0.5; # prefer the more difficult version
+                  my $diff = abs $difficulty - $1 + 0.25 + 0.25 * cf::rmg_rndm; # prefer the more difficult version
                   ($map, $min_diff) = ($name, $diff) if $diff < $min_diff;
                }
             }
@@ -124,12 +123,19 @@
    $map
 }
 
-sub find_style($$$) {
-   my ($dir, $name, $difficulty) = @_;
-   
+sub find_style($$$$) {
+   my ($dir, $name, $difficulty, $recurse) = @_;
+
    cf::cede_to_tick;
 
-   my $map = find_style_ $name ? "$dir/$name" : $dir, $difficulty;
+   my $map;
+   
+   if ($name) {
+      $map = find_style_ "$dir/$name", $difficulty, $recurse;
+   } else {
+      $map = (find_style_ "$dir/default", $difficulty, $recurse)
+             || (find_style_ $dir, $difficulty, $recurse);
+   }
 
    if ($map) {
       $map->load;
@@ -140,9 +146,34 @@
    $map
 }
 
-# clean up old temp maps regularly
-our $CLEAN_RANDOM_MAPS = cf::periodic 3600, Coro::unblock_sub {
-   clean_random_maps;
+cf::async_ext {
+   eCoro::current->{desc} = "random map meta file cleaner";
+   $Coro::current->nice (1);
+
+   while () {
+      my $META_TIMEOUT = $cf::CFG{map_random_meta_timeout} || 86400 * 7;
+
+      Coro::AnyEvent::idle_upto $META_TIMEOUT / 10 * 2;
+
+      my ($files) = Coro::AIO::aio_readdirx $cf::RANDOMDIR, IO::AIO::READDIR_STAT_ORDER
+         or return;
+
+      for my $file (@$files) {
+         next unless $file =~ /\.meta$/;
+
+         Coro::AIO::aio_stat "$cf::RANDOMDIR/$file"
+            and next;
+
+         my $age = $cf::NOW - (stat _)[8];
+
+         if ($age > $META_TIMEOUT) {
+            warn "resetting random meta data for $file";
+            IO::AIO::aio_unlink "$cf::RANDOMDIR/$file";
+         }
+      }
+
+      Coro::AnyEvent::sleep $META_TIMEOUT / 10;
+   }
 };
 
 # map generator stresstest, NEVER enable under normal circumstances
@@ -175,6 +206,26 @@
       }
    };
 }
+
+# save test
+if (0) {
+   cf::async {
+      # 0.080
+      Coro::Timer::sleep 2;
+      my $map = cf::map::find "/mlab/citydeclouds2";
+      $map->load_header;
+      $map->load;
+      $map->post_load_original;
+      my $m=100;
+      for (1..50) {
+         my $t=AE::time;
+         $map->_save_objects ("/tmp/x", cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
+         $t = AE::time-$t;
+         $m=$t if $m>$t;
+         warn $m;
+      }
+   };
+}
 
 1