… | |
… | |
16 | use List::Util qw(min max); |
16 | use List::Util qw(min max); |
17 | |
17 | |
18 | use Crossfire; |
18 | use Crossfire; |
19 | use Crossfire::MapWidget; |
19 | use Crossfire::MapWidget; |
20 | use File::Spec::Functions; |
20 | use File::Spec::Functions; |
|
|
21 | use File::Basename; |
|
|
22 | use File::Path; |
|
|
23 | use HTTP::Request::Common; |
21 | use Cwd 'abs_path'; |
24 | use Cwd 'abs_path'; |
22 | |
25 | |
23 | our @EXPORT = qw(insert_arch_stack_layer replace_arch_stack_layer new_arch_pb |
26 | our @EXPORT = qw(insert_arch_stack_layer replace_arch_stack_layer new_arch_pb |
24 | fill_pb_from_arch arch_is_floor stack_find_floor stack_find_wall |
27 | fill_pb_from_arch arch_is_floor stack_find_floor stack_find_wall |
25 | stack_find arch_is_wall arch_is_monster add_table_widget quick_msg |
28 | stack_find arch_is_wall arch_is_monster add_table_widget quick_msg |
… | |
… | |
71 | my ($dest, $mape) = @_; |
74 | my ($dest, $mape) = @_; |
72 | |
75 | |
73 | $mappath = abs_path $mappath; |
76 | $mappath = abs_path $mappath; |
74 | my $dir; |
77 | my $dir; |
75 | if (File::Spec->file_name_is_absolute($dest)) { |
78 | if (File::Spec->file_name_is_absolute($dest)) { |
76 | $dir = catdir ($::CFG->{MAPDIR}, $dest); |
79 | $dir = catdir ($::MAPDIR, $dest); |
77 | } else { |
80 | } else { |
78 | my ($v, $p, $f) = File::Spec->splitpath ($mape->{path}); |
81 | my ($v, $p, $f) = File::Spec->splitpath ($mape->{path}); |
79 | $dir = File::Spec->rel2abs ($dest, File::Spec->catpath ($v, $p)); |
82 | $dir = File::Spec->rel2abs ($dest, File::Spec->catpath ($v, $p)); |
80 | } |
83 | } |
81 | return $dir; |
84 | return $dir; |
… | |
… | |
156 | } |
159 | } |
157 | |
160 | |
158 | sub arch_is_floor { |
161 | sub arch_is_floor { |
159 | my ($a) = @_; |
162 | my ($a) = @_; |
160 | my $ar = Crossfire::arch_attr $a; |
163 | my $ar = Crossfire::arch_attr $a; |
161 | warn "NAME: $ar->{name}\n"; |
|
|
162 | return ( |
164 | return ( |
163 | (substr $ar->{name}, 0, 5) eq 'Floor' |
165 | (substr $ar->{name}, 0, 5) eq 'Floor' |
164 | or (substr $ar->{name}, 0, 10) eq 'Shop Floor' |
166 | or (substr $ar->{name}, 0, 10) eq 'Shop Floor' |
165 | ) |
167 | ) |
166 | } |
168 | } |
… | |
… | |
352 | } |
354 | } |
353 | |
355 | |
354 | return \@outstack; |
356 | return \@outstack; |
355 | } |
357 | } |
356 | |
358 | |
|
|
359 | sub upload { |
|
|
360 | my ($login, $password, $srcrep, $path, $rev, $mapdata) = @_; |
|
|
361 | require LWP::UserAgent; |
|
|
362 | my $ua = LWP::UserAgent->new ( |
|
|
363 | agent => "gcrossedit", |
|
|
364 | keep_alive => 1, |
|
|
365 | env_proxy => 1, |
|
|
366 | timeout => 30, |
|
|
367 | ); |
|
|
368 | require HTTP::Request::Common; |
|
|
369 | |
|
|
370 | my $res = $ua->post ( |
|
|
371 | $ENV{CFPLUS_UPLOAD}, |
|
|
372 | Content_Type => 'multipart/form-data', |
|
|
373 | Content => [ |
|
|
374 | path => $path, |
|
|
375 | mapdir => $srcrep, |
|
|
376 | map => $mapdata, |
|
|
377 | revision => $rev, |
|
|
378 | cf_login => $login, #ENV{CFPLUS_LOGIN}, |
|
|
379 | cf_password => $password, #ENV{CFPLUS_PASSWORD}, |
|
|
380 | comment => "", |
|
|
381 | ] |
|
|
382 | ); |
|
|
383 | |
|
|
384 | if ($res->is_error) { |
|
|
385 | # fatal condition |
|
|
386 | warn $res->status_line; |
|
|
387 | } else { |
|
|
388 | # script replies are marked as {{..}} |
|
|
389 | my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g; |
|
|
390 | warn map "$_\n", @msgs; |
|
|
391 | } |
|
|
392 | } |
|
|
393 | |
357 | =head1 AUTHOR |
394 | =head1 AUTHOR |
358 | |
395 | |
359 | Marc Lehmann <schmorp@schmorp.de> |
396 | Marc Lehmann <schmorp@schmorp.de> |
360 | http://home.schmorp.de/ |
397 | http://home.schmorp.de/ |
361 | |
398 | |