Lucas/PoorBooru
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

backend: make SeaweedFS::Client::url_for accept a scalar too

Browse Source
This commit is contained in:
Lucas 2023-03-21 21:43:42 +00:00
parent 396ab297a8
commit aa3e60d188
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/PoorBooru/Backend/Controller/Media.pm
View File

@ -5,7 +5,6 @@ use warnings;
use Mojo::Base "Mojolicious::Controller"; use Mojo::Base "Mojolicious::Controller";
use Mojo::JSON qw(decode_json); use Mojo::JSON qw(decode_json);
use SeaweedFS::FID;
sub list ($self) sub list ($self)
{ {
@ -24,9 +23,7 @@ sub list ($self)
$self->title("Pooru~"); $self->title("Pooru~");
my @media = map +{ my @media = map +{
media_link => $self->url_for("media_show", media_id => $_->{media_id}), media_link => $self->url_for("media_show", media_id => $_->{media_id}),
media_src => $self->seaweed->url_for( media_src => $self->seaweed->url_for($_->{seaweedfs_fid}),
SeaweedFS::FID->from_string($_->{seaweedfs_fid})
),
}, $res->json->{media}->@*; }, $res->json->{media}->@*;
return $self->render( return $self->render(
@ -51,8 +48,7 @@ sub show ($self)
return $self->render(status => $res->code) if $res->is_error; return $self->render(status => $res->code) if $res->is_error;
my $media = $res->json; my $media = $res->json;
$media->{download} = $self->seaweed->url_for(SeaweedFS::FID $media->{download} = $self->seaweed->url_for($media->{download});
->from_string($media->{download}));
return $self->render( return $self->render(
template => "media", template => "media",

5
lib/PoorBooru/Backend/Controller/Tags.pm
View File

@ -5,7 +5,6 @@ use warnings;
use Mojo::Base "Mojolicious::Controller"; use Mojo::Base "Mojolicious::Controller";
use Mojo::JSON qw(decode_json); use Mojo::JSON qw(decode_json);
use SeaweedFS::FID;
sub list ($self) sub list ($self)
{ {
@ -51,9 +50,7 @@ sub show ($self)
$self->title($res->json->{name}); $self->title($res->json->{name});
my @media = map +{ my @media = map +{
media_link => $self->url_for("media_show", media_id => $_->{media_id}), media_link => $self->url_for("media_show", media_id => $_->{media_id}),
media_src => $self->seaweed->url_for( media_src => $self->seaweed->url_for($_->{seaweedfs_fid}),
SeaweedFS::FID->from_string($_->{seaweedfs_fid})
),
}, $res->json->{media}->@*; }, $res->json->{media}->@*;
return $self->render( return $self->render(

14
lib/SeaweedFS/Client.pm
View File

@ -5,7 +5,7 @@ use warnings;
use Carp; use Carp;
use List::Util qw(sample); use List::Util qw(sample);
use Scalar::Util qw(openhandle); use Scalar::Util qw(blessed);
use Mojo::UserAgent; use Mojo::UserAgent;
use SeaweedFS::FID; use SeaweedFS::FID;
@ -30,8 +30,18 @@ sub get
sub url_for sub url_for
{ {
my ($self, $fid) = @_; my ($self, $p) = @_;
my $fid;
if (defined(blessed $p) && $p->can("volume_id")) {
$fid = $p;
} elsif (!defined(blessed $p)) {
eval {
$fid = SeaweedFS::FID->from_string($p);
} or $fid = SeaweedFS::FID->from_bin($p);
} else {
croak "Unsupported FID type " . blessed($p);
}
my $vid = $fid->volume_id; my $vid = $fid->volume_id;
if (!defined($self->{_vurls}{$vid}) || $self->{_vurls}{$vid}->@* == 0) { if (!defined($self->{_vurls}{$vid}) || $self->{_vurls}{$vid}->@* == 0) {