ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/utils/cfutil.in
(Generate patch)

Comparing deliantra/server/utils/cfutil.in (file contents):
Revision 1.42 by root, Thu Jul 19 13:46:39 2007 UTC vs.
Revision 1.49 by root, Thu Aug 9 22:46:08 2007 UTC

388 388
389 $TRS .= $trs; 389 $TRS .= $trs;
390 } 390 }
391 } 391 }
392 392
393 my %FILECACHE;
394
395 sub load_cached($;$) {
396 unless (exists $FILECACHE{$_[0]}) {
397 my $data;
398 if (0 < aio_load $_[0], $data) {
399 if ($_[1]) {
400 $data = eval { $_[1]->($data) };
401 warn "$_[0]: $@" if $@;
402 }
403 }
404
405 $FILECACHE{$_[0]} = $data;
406 }
407
408 $FILECACHE{$_[0]}
409 }
410
393 sub process_res { 411 sub process_res {
394 while (@res) { 412 while (@res) {
395 my ($dir, $file) = @{pop @res}; 413 my ($dir, $file, $type) = @{pop @res};
396 414
397 my $data; 415 my $data;
398 aio_load "$dir/$file", $data; 416 aio_load "$dir/$file", $data;
399 417
400 my $copyright; 418 my $meta = load_cached "$dir/meta", sub { JSON::XS::from_json shift };
401 aio_load "$dir/copyright", $copyright; 419
420 return if $meta && !exists $meta->{$file};
421
422 $meta = {
423 %{ $meta->{"" } || {} },
424 %{ $meta->{$file} || {} },
425 };
426
427 if ($meta->{license} =~ s/^#//) {
428 $meta->{license} = ({
429 "pd" => "Public Domain",
430 "gpl" => "GNU General Public License, version 3.0 or any later",
431 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
432 "cc/by/2.5" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.5/",
433 "cc/by/3.0" => "Licensed under Creative Commons Attribution 3.0 http://creativecommons.org/licenses/by/3.0/",
434 })->{$meta->{license}}
435 || warn "$dir/$file: license tag '$meta->{license}' not found.";
436 }
402 437
403 $file =~ s/\.res$//; 438 $file =~ s/\.res$//;
404 $file =~ /\.([^.]+)$/ 439 $file =~ s/\.(ogg|wav|jpg|png)$//;
405 or next;
406
407 my $type = $1;
408 440
409 substr $dir, 0, 1 + length $PATH, ""; 441 substr $dir, 0, 1 + length $PATH, "";
410 442
411 $RESOURCE{"$dir/$file"} = { 443 $RESOURCE{"$dir/$file"} = {
412 type => $1, 444 type => (delete $meta->{type}) || $type,
413 copyright => $copyright,
414 data => $data, 445 data => $data,
415 chksum => Digest::MD5::md5 $data, 446 chksum => (Digest::MD5::md5 $data),
447 %$meta ? (meta => $meta) : (),
416 }; 448 };
417 } 449 }
418 } 450 }
419 451
420 sub find_files; 452 sub find_files;
426 my ($dirs, $nondirs) = @_; 458 my ($dirs, $nondirs) = @_;
427 459
428 find_files "$path/$_" 460 find_files "$path/$_"
429 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs; 461 for grep $_ !~ /^(?:CVS|dev)$/, @$dirs;
430 462
463 my $dir = $path;
464 substr $dir, 0, 1 + length $PATH, "";
465
431 for my $file (@$nondirs) { 466 for my $file (@$nondirs) {
467 if ($dir =~ /^music(?:\/|$)/) {
468 push @res, [$path, $file, 3] # FT_MUSIC
469 if $file =~ /\.(ogg)$/;
470
471 } elsif ($dir =~ /^sound(?:\/|$)/) {
472 push @res, [$path, $file, 5] # FT_SOUND
473 if $file =~ /\.(wav|ogg)$/;
474
475 } elsif ($dir =~ /^res(?:\/|$)/) {
476 push @res, [$path, $file, 0] # FT_FACE
477 if $file =~ /\.(jpg|png)$/;
478 push @res, [$path, $file, 7] # FT_RSRC
479 if $file =~ /\.(res)$/;
480
432 if ($file =~ /\.png$/) { 481 } elsif ($file =~ /\.png$/) {
433 push @png, ["$path/$file", 0]; 482 push @png, ["$path/$file", 0];
483
434 } elsif ($file =~ /\.trs$/) { 484 } elsif ($file =~ /\.trs$/) {
435 push @trs, [$path, $file]; 485 push @trs, [$path, $file];
486
436 } elsif ($file =~ /\.arc$/) { 487 } elsif ($file =~ /\.arc$/) {
437 push @arc, [$path, $file]; 488 push @arc, [$path, $file];
438 } elsif ($file =~ /\.(ogg|jpg|res)$/) { 489
439 push @res, [$path, $file];
440 } else { 490 } else {
441 warn "ignoring $path/$file\n" if $VERBOSE >= 3; 491 warn "ignoring $path/$file\n" if $VERBOSE >= 3;
442 } 492 }
443 } 493 }
444 }; 494 };

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines