ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.198 by root, Sun Jan 28 01:58:37 2007 UTC vs.
Revision 1.200 by root, Mon Jan 29 17:57:22 2007 UTC

… …
82mkdir cf::localdir . "/" . cf::tmpdir; 82mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir; 83mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS; 84mkdir $RANDOM_MAPS;
85 85
86our $EMERGENCY_POSITION; 86our $EMERGENCY_POSITION;
87
88sub cf::map::normalise;
87 89
88############################################################################# 90#############################################################################
89 91
90=head2 GLOBAL VARIABLES 92=head2 GLOBAL VARIABLES
91 93
… …
774 } 776 }
775 } else { 777 } else {
776 aio_unlink $filename; 778 aio_unlink $filename;
777 aio_unlink "$filename.pst"; 779 aio_unlink "$filename.pst";
778 } 780 }
781
782 #d##TODO# nuke non .map-files if exist
783 if ($filename =~ s/\.map$//) {
784 aio_unlink $filename;
785 aio_unlink "$filename.pst";
786 }
779 } 787 }
780} 788}
781 789
782sub object_freezer_as_string { 790sub object_freezer_as_string {
783 my ($rdata, $objs) = @_; 791 my ($rdata, $objs) = @_;
… …
789 797
790sub object_thawer_load { 798sub object_thawer_load {
791 my ($filename) = @_; 799 my ($filename) = @_;
792 800
793 my ($data, $av); 801 my ($data, $av);
802
803 #d#TODO remove .map if file does not exist
804 aio_stat $filename and $filename =~ s/\.map$//;
794 805
795 (aio_load $filename, $data) >= 0 806 (aio_load $filename, $data) >= 0
796 or return; 807 or return;
797 808
798 unless (aio_stat "$filename.pst") { 809 unless (aio_stat "$filename.pst") {
… …
1078 for (@$files) { 1089 for (@$files) {
1079 utf8::decode $_; 1090 utf8::decode $_;
1080 next if /\.(?:pl|pst)$/; 1091 next if /\.(?:pl|pst)$/;
1081 next unless /^$PATH_SEP/o; 1092 next unless /^$PATH_SEP/o;
1082 1093
1083 s/\.map$//;
1084 push @paths, "~" . $pl->ob->name . "/" . $_; 1094 push @paths, cf::map::normalise "~" . $pl->ob->name . "/" . $_;
1085 } 1095 }
1086 1096
1087 \@paths 1097 \@paths
1088} 1098}
1089 1099
… …
1178sub normalise { 1188sub normalise {
1179 my ($path, $base) = @_; 1189 my ($path, $base) = @_;
1180 1190
1181 $path = "$path"; # make sure its a string 1191 $path = "$path"; # make sure its a string
1182 1192
1193 $path =~ s/\.map$//;
1194
1183 # map plan: 1195 # map plan:
1184 # 1196 #
1185 # /! non-realised random map exit (special hack!) 1197 # /! non-realised random map exit (special hack!)
1186 # {... are special paths that are not being touched 1198 # {... are special paths that are not being touched
1187 # ?xxx/... are special absolute paths 1199 # ?xxx/... are special absolute paths
… …
1248 1260
1249# the original (read-only) location 1261# the original (read-only) location
1250sub load_path { 1262sub load_path {
1251 my ($self) = @_; 1263 my ($self) = @_;
1252 1264
1253 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1265 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path}
1254} 1266}
1255 1267
1256# the temporary/swap location 1268# the temporary/swap location
1257sub save_path { 1269sub save_path {
1258 my ($self) = @_; 1270 my ($self) = @_;
1259 1271
1260 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1272 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1261 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1273 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path
1262} 1274}
1263 1275
1264# the unique path, undef == no special unique path 1276# the unique path, undef == no special unique path
1265sub uniq_path { 1277sub uniq_path {
1266 my ($self) = @_; 1278 my ($self) = @_;
… …
1282 my ($self) = @_; 1294 my ($self) = @_;
1283 1295
1284 utf8::encode (my $save = $self->save_path); 1296 utf8::encode (my $save = $self->save_path);
1285 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1297 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1286 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1298 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1299
1300 #d#TODO remove .map and also nuke
1301 $save =~ s/\.map// or return;#d#
1302 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1303 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1287} 1304}
1288 1305
1289sub load_header_from($) { 1306sub load_header_from($) {
1290 my ($self, $path) = @_; 1307 my ($self, $path) = @_;
1291 1308
1292 utf8::encode $path; 1309 utf8::encode $path;
1293 aio_open $path, O_RDONLY, 0 1310 #aio_open $path, O_RDONLY, 0
1294 or return; 1311 # or return;
1295 1312
1296 $self->_load_header ($path) 1313 $self->_load_header ($path)
1297 or return; 1314 or return;
1298 1315
1299 $self->{load_path} = $path; 1316 $self->{load_path} = $path;
… …
1628 for (@$files) { 1645 for (@$files) {
1629 utf8::decode $_; 1646 utf8::decode $_;
1630 next if /\.pst$/; 1647 next if /\.pst$/;
1631 next unless /^$PATH_SEP/o; 1648 next unless /^$PATH_SEP/o;
1632 1649
1633 s/\.map$//; 1650 push @paths, cf::map::normalise $_;
1634 push @paths, $_;
1635 } 1651 }
1636 1652
1637 \@paths 1653 \@paths
1638} 1654}
1639 1655

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines