… | |
… | |
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_json) = @_; |
72 | my ($meta_json) = @_; |
|
|
73 | my $path = CFPlus::DB::path_of_res $chksum; |
73 | |
74 | |
74 | if (defined $meta_json) { |
75 | if (defined $meta_json) { |
75 | my $meta = $self->{json_coder}->decode ($meta_json); |
76 | my $meta = $self->{json_coder}->decode ($meta_json); |
76 | $meta->{path} = CFPlus::DB::path_of_res $chksum; |
77 | $meta->{path} = $path; |
77 | $self->{music_meta}{$chksum} = $meta; |
78 | $self->{music_meta}{$chksum} = $meta; |
78 | } else { |
79 | } else { |
79 | ::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." }); |
80 | $self->ask_face ($face, -100 - $pri, undef, sub { |
81 | $self->ask_face ($face, -100 - $pri, undef, sub { |
81 | my $len = length $_[1]; |
82 | my $len = length $_[1]; |
82 | my ($meta_json, $data) = unpack "(w/a*)*", $_[1]; |
83 | my ($meta_json, $data) = unpack "(w/a*)*", $_[1]; |
83 | |
84 | |
84 | my $meta = $self->{json_coder}->decode ($meta_json); |
|
|
85 | $meta->{path} = CFPlus::DB::path_of_res $chksum; |
|
|
86 | $self->{music_meta}{$chksum} = $meta; |
|
|
87 | |
|
|
88 | CFPlus::DB::write_file $meta->{path}, $data, sub { }; |
85 | CFPlus::DB::write_file $path, $data, sub { |
89 | CFPlus::DB::put "res-metadata" => $chksum => $meta_json, sub { }; |
86 | CFPlus::DB::put "res-metadata" => $chksum => $meta_json, sub { |
|
|
87 | my $meta = $self->{json_coder}->decode ($meta_json); |
|
|
88 | $meta->{path} = $path; |
|
|
89 | $self->{music_meta}{$chksum} = $meta; |
90 | |
90 | |
91 | ::message ({ markup => "downloaded song #$face, size $len octets" }); |
91 | ::message ({ markup => "downloaded song #$face, size $len octets" }); |
|
|
92 | &::audio_music_set ($self->{songs}); |
|
|
93 | }; |
|
|
94 | }; |
92 | }); |
95 | }); |
93 | } |
96 | } |
94 | |
|
|
95 | &::audio_music_set ($self->{songs}); |
|
|
96 | } |
97 | } |
97 | } |
98 | } |
98 | } |
99 | } |
99 | |
100 | |
100 | if (my $play = $ev->{play}) { |
101 | if (my $play = $ev->{play}) { |