ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/Protocol.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.118 by root, Fri Jul 13 15:44:48 2007 UTC vs.
Revision 1.120 by root, Sat Jul 14 13:04:42 2007 UTC

67 $chksum = unpack "H*", $chksum; 67 $chksum = unpack "H*", $chksum;
68 $self->{music_map}{$face} = $chksum; 68 $self->{music_map}{$face} = $chksum;
69 69
70 # check if already cached 70 # check if already cached
71 CFPlus::DB::get "res-metadata" => $chksum, sub { 71 CFPlus::DB::get "res-metadata" => $chksum, sub {
72 my ($meta) = @_; 72 my ($meta_json) = @_;
73 my $path = CFPlus::DB::path_of_res $chksum;
73 74
74 if (defined $meta) { 75 if (defined $meta_json) {
75 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta); 76 my $meta = $self->{json_coder}->decode ($meta_json);
77 $meta->{path} = $path;
78 $self->{music_meta}{$chksum} = $meta;
76 } else { 79 } else {
77 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." }); 80 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
78 $self->ask_face ($face, -100 - $pri, undef, sub { 81 $self->ask_face ($face, -100 - $pri, undef, sub {
79 my $len = length $_[1]; 82 my $len = length $_[1];
80 my ($meta, $data) = unpack "(w/a*)*", $_[1]; 83 my ($meta_json, $data) = unpack "(w/a*)*", $_[1];
81 84
82 CFPlus::DB::write_file $chksum, $data, sub { }; 85 CFPlus::DB::write_file $path, $data, sub {
83 CFPlus::DB::put "res-metadata" => $chksum => $meta, sub { }; 86 CFPlus::DB::put "res-metadata" => $chksum => $meta_json, sub {
84
85 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta); 87 my $meta = $self->{json_coder}->decode ($meta_json);
88 $meta->{path} = $path;
89 $self->{music_meta}{$chksum} = $meta;
90
86 ::message ({ markup => "downloaded song #$face, size $len octets" }); 91 ::message ({ markup => "downloaded song #$face, size $len octets" });
87
88 &::audio_music_set ($self->{songs}); 92 &::audio_music_set ($self->{songs});
93 };
94 };
89 }); 95 });
90 } 96 }
91 } 97 }
92 } 98 }
93 } 99 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines