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.139 by root, Sun Jul 29 18:22:34 2007 UTC vs.
Revision 1.140 by root, Sun Jul 29 18:56:02 2007 UTC

735 735
736 CFPlus::DB::get tilecache => $id, $cb; 736 CFPlus::DB::get tilecache => $id, $cb;
737 737
738 } elsif ($face->{type} & 1) { # with metadata 738 } elsif ($face->{type} & 1) { # with metadata
739 #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." }); 739 #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
740 CFPlus::DB::get "res-metadata" => $face->{name}, $cb; 740 CFPlus::DB::get res_meta => $face->{name}, $cb;
741 } 741 }
742} 742}
743 743
744sub face_update { 744sub face_update {
745 my ($self, $facenum, $face, $changed) = @_; 745 my ($self, $facenum, $face, $changed) = @_;
750 750
751 $self->set_texture ($face->{id} => delete $face->{data}); 751 $self->set_texture ($face->{id} => delete $face->{data});
752 752
753 } elsif ($face->{type} & 1) { # split metadata 753 } elsif ($face->{type} & 1) { # split metadata
754 my $cb = sub { }; 754 my $cb = sub { };
755 my $path;
756 755
757 if ($face->{type} == 3) { # FT_MUSIC 756 if ($face->{type} == 3) { # FT_MUSIC
758 # store externally
759 $path = CFPlus::DB::path_of_res $face->{name};
760
761 $cb = sub { 757 $cb = sub {
762 $self->{music_meta}{$facenum} = $face; 758 $self->{music_meta}{$facenum} = $face;
763 759
764 ::message ({ markup => "downloaded song #$facenum" }) 760 ::message ({ markup => "downloaded song #$facenum" })
765 if $changed; 761 if $changed;
778 774
779 775
780 if ($changed) { # new data 776 if ($changed) { # new data
781 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; 777 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
782 778
783 my $put_cb = sub { 779 CFPlus::DB::put res_data => $face->{name} => $data, sub {
784 CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub { 780 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub {
785 $face->{meta} = $self->{json_coder}->decode ($meta_json); 781 $face->{meta} = $self->{json_coder}->decode ($meta_json);
786 $face->{path} = $path;
787 782
788 $cb->(); 783 $cb->();
789 }; 784 };
790 }; 785 };
791 786
792 if (defined $path) {
793 CFPlus::DB::write_file $path, $data, $put_cb;
794 } else {
795 CFPlus::DB::put "res-data" => $face->{name} => $data, $put_cb;
796 }
797 } else { 787 } else {
798 $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); 788 $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
799 $face->{path} = $path;
800 $cb->(); 789 $cb->();
801 } 790 }
802 } 791 }
803} 792}
804 793

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines