… | |
… | |
15 | package CFPlus; |
15 | package CFPlus; |
16 | |
16 | |
17 | use Carp (); |
17 | use Carp (); |
18 | |
18 | |
19 | BEGIN { |
19 | BEGIN { |
20 | $VERSION = '0.98'; |
20 | $VERSION = '0.9960'; |
21 | |
21 | |
22 | use XSLoader; |
22 | use XSLoader; |
23 | XSLoader::load "CFPlus", $VERSION; |
23 | XSLoader::load "CFPlus", $VERSION; |
24 | } |
24 | } |
25 | |
25 | |
… | |
… | |
28 | use AnyEvent (); |
28 | use AnyEvent (); |
29 | use Pod::POM (); |
29 | use Pod::POM (); |
30 | use File::Path (); |
30 | use File::Path (); |
31 | use Storable (); # finally |
31 | use Storable (); # finally |
32 | use Fcntl (); |
32 | use Fcntl (); |
33 | |
33 | use JSON::XS qw(encode_json decode_json); |
34 | BEGIN { |
|
|
35 | use Crossfire::Protocol::Base (); |
|
|
36 | *to_json = \&Crossfire::Protocol::Base::to_json; |
|
|
37 | *from_json = \&Crossfire::Protocol::Base::from_json; |
|
|
38 | } |
|
|
39 | |
34 | |
40 | =item guard { BLOCK } |
35 | =item guard { BLOCK } |
41 | |
36 | |
42 | Returns an object that executes the given block as soon as it is destroyed. |
37 | Returns an object that executes the given block as soon as it is destroyed. |
43 | |
38 | |
… | |
… | |
170 | if ($CFG =~ /^---/) { ## TODO compatibility cruft, remove |
165 | if ($CFG =~ /^---/) { ## TODO compatibility cruft, remove |
171 | require YAML; |
166 | require YAML; |
172 | utf8::decode $CFG; |
167 | utf8::decode $CFG; |
173 | $::CFG = YAML::Load ($CFG); |
168 | $::CFG = YAML::Load ($CFG); |
174 | } elsif ($CFG =~ /^\{/) { |
169 | } elsif ($CFG =~ /^\{/) { |
175 | $::CFG = from_json $CFG; |
170 | $::CFG = decode_json $CFG; |
176 | } else { |
171 | } else { |
177 | $::CFG = eval $CFG; ## todo comaptibility cruft |
172 | $::CFG = eval $CFG; ## todo comaptibility cruft |
178 | } |
173 | } |
179 | } |
174 | } |
180 | |
175 | |
… | |
… | |
183 | |
178 | |
184 | $::CFG->{VERSION} = $::VERSION; |
179 | $::CFG->{VERSION} = $::VERSION; |
185 | |
180 | |
186 | open my $fh, ">:utf8", $file |
181 | open my $fh, ">:utf8", $file |
187 | or return; |
182 | or return; |
188 | print $fh to_json $::CFG; |
183 | print $fh encode_json $::CFG; |
189 | } |
184 | } |
190 | |
185 | |
191 | sub http_proxy { |
186 | sub http_proxy { |
192 | my @proxy = win32_proxy_info; |
187 | my @proxy = win32_proxy_info; |
193 | |
188 | |