refactor: properly store season metadata in tv library

Author: G4Vi

App-MHFS/lib/MHFS/Kodi/Season.pm

@@ -43,12 +43,13 @@ sub _read_season_dir {
 }
 
 sub Format {
-    my ($seeason, $id, $sourcemap, $meta) = @_;
+    my ($seeason, $id, $sourcemap) = @_;
+    my $editions = $seeason->{editions};
     my @unsorted;
-    foreach my $path (keys %$seeason) {
+    foreach my $path (keys %$editions) {
         my ($source, $item) = split('/', $path, 2);
-        if (!$seeason->{$path}{isdir}) {
-            push @unsorted, _encode_item("$source/".encode_base64url($item), $seeason->{$path}{name});
+        if (!$editions->{$path}{isdir}) {
+            push @unsorted, _encode_item("$source/".encode_base64url($item), $editions->{$path}{name});
             next;
         }
         my $b_path = $sourcemap->{$source}{folder}."/$item";
@@ -58,7 +59,8 @@ sub Format {
         fold_case($a->{name}) cmp fold_case($b->{name})
     } @unsorted;
     my %season = (id => $id+0, items => \@items, name => "Season $id");
-    if ($meta) {
+    if (exists $seeason->{meta}) {
+        my $meta = $seeason->{meta};
         $season{plot} = $meta->{overview};
         my %seen;
         foreach my $item (@items) {
@@ -85,12 +87,12 @@ sub Format {
 
 sub TO_JSON {
     my ($self) = @_;
-    {season => Format($self->{season}, $self->{id}, $self->{sourcemap}, $self->{meta})}
+    {season => Format($self->{season}, $self->{id}, $self->{sourcemap})}
 }
 
 sub TO_HTML {
     my ($self) = @_;
-    my $season = Format($self->{season}, $self->{id}, $self->{sourcemap}, $self->{meta});
+    my $season = Format($self->{season}, $self->{id}, $self->{sourcemap});
     my $buf = '<style>ul{list-style: none;} li{margin: 10px 0;}</style><ul>';
     foreach my $item (@{$season->{items}}) {
         $buf .= html_list_item($item->{name}, 1);

App-MHFS/lib/MHFS/Kodi/SeasonLite.pm

@@ -6,20 +6,15 @@ use MIME::Base64 qw(encode_base64url);
 
 sub Format {
     my ($seeason, $id) = @_;
-    my $plot;
-    # HACK: grab the season plot from a season item and apply to the season
-    while(my ($key, $value) = each %{$seeason}) {
-        $plot = $value->{plot} if (exists $value->{plot});
-        last;
-    }
+    my $plot = exists $seeason->{meta} && exists $seeason->{meta}{overview} && $seeason->{meta}{overview};
+    my $editions = $seeason->{editions};
     my @sorteditems = sort {
-        $seeason->{$a}{name} cmp $seeason->{$b}{name}
-    } keys %{$seeason};
+        $editions->{$a}{name} cmp $editions->{$b}{name}
+    } keys %{$editions};
     my @items = map {
         my ($source, $item) = split('/', $_, 2);
-        my %item = %{$seeason->{$_}};
+        my %item = %{$editions->{$_}};
         $item{id} = "$source/".encode_base64url($item);
-        delete $item{plot}; # HACK: remove the plot from the season item
         \%item
     } @sorteditems;
     {id => $id+0, items => \@items, name => "Season $id", ($plot ? (plot => $plot) : ())}

App-MHFS/lib/MHFS/Plugin/Kodi.pm

@@ -30,6 +30,16 @@ BEGIN {
     }
 }
 
+sub _read_season_meta {
+    my ($self, $showid, $seasonid) = @_;
+    try {
+        my $bytes = read_file($self->{tvmeta}."/$showid/$seasonid/season.json");
+        my $meta = decode_json($bytes);
+        return $meta;
+    } catch($e) {}
+    return;
+}
+
 sub readtvdir {
     my ($self, $tvshows, $source, $b_tvdir) = @_;
     my $dh;
@@ -63,8 +73,14 @@ sub readtvdir {
             catch($e) {}
             $tvshows->{$showid} = \%show;
         }
-        $tvshows->{$showid}{seasons}{$season} //= {};
-        $tvshows->{$showid}{seasons}{$season}{"$source/$b_filename"} = {name => $filename, isdir => (-d _ // 0)+0};
+        $tvshows->{$showid}{seasons}{$season} //= {
+            editions => {},
+            do {
+                my $meta = $self->_read_season_meta($showid, $season);
+                $meta ? (meta => $meta) : ()
+            },
+        };
+        $tvshows->{$showid}{seasons}{$season}{editions}{"$source/$b_filename"} = {name => $filename, isdir => (-d _ // 0)+0};
     }
     closedir($dh);
 }
@@ -80,21 +96,6 @@ sub _build_tv_library {
         my $b_tvdir = $self->{server}{settings}{SOURCES}{$source}{folder};
         $self->readtvdir(\%tvshows, $source, $b_tvdir);
     }
-    # load the season metadata, maybe remove this if we allow querying a show without a season
-    while (my ($showid, $show) = each %tvshows) {
-        while (my ($seasonid, $season) = each %{$show->{seasons}}) {
-            my $meta;
-            try {
-                my $bytes = read_file($self->{tvmeta}."/$showid/$seasonid/season.json");
-                $meta = decode_json($bytes);
-            } catch($e) {}
-            $meta or next;
-            # HACK: modifies each season item as there isn't a season object
-            foreach my $value (values %$season) {
-                $value->{plot} = $meta->{overview};
-            }
-        }
-    }
     \%tvshows
 }
 
@@ -104,15 +105,15 @@ sub _get_tv_item {
     exists $tvshows->{$showid}{seasons}{$seasonid} or die "season $seasonid does not exist";
     my $seasonitem = $tvshows->{$showid}{seasons}{$seasonid};
     my $sourcemap = $self->{server}{settings}{SOURCES};
-    my $meta;
-    try {
-        my $bytes = read_file($self->{tvmeta}."/$showid/$seasonid/season.json");
-        $meta = decode_json($bytes);
-    } catch($e) {}
-    $source or return bless {season => $seasonitem, id => $seasonid, sourcemap => $sourcemap, ($meta ? (meta => $meta) : ())}, 'MHFS::Kodi::Season';
+    # TODO: Instead of updating the tv library here, the library should be updated when new metadata is loaded
+    if (!exists $seasonitem->{meta}) {
+        my $meta = $self->_read_season_meta($showid, $seasonid);
+        $seasonitem->{meta} = $meta if $meta;
+    }
+    $source or return bless {season => $seasonitem, id => $seasonid, sourcemap => $sourcemap}, 'MHFS::Kodi::Season';
     $b64_item or die "b64_item not provided";
     my $path = abs_path($self->{server}{settings}{SOURCES}{$source}{folder} .'/' . decode_base64url($b64_item));
-    if (!$path || rindex($path, $self->{server}{settings}{SOURCES}{$source}{folder}, 0) != 0, ! -f $path) {
+    if (!$path || rindex($path, $self->{server}{settings}{SOURCES}{$source}{folder}, 0) != 0 || ! -f $path) {
         die "item not found";
     }
     {b_path => $path}