Merge pull request #1055 from wutschel/feature_hideemptytvshow

xbmc · May 11, 2024 · 1e9c6b7 · 1e9c6b7
2 parents eb72b3d + 40d1d5a
commit 1e9c6b7
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 5 deletions.
diff --git a/XBMC Remote/AppDelegate.h b/XBMC Remote/AppDelegate.h
@@ -120,6 +120,7 @@
 @property (nonatomic, assign) int APIpatchVersion;
 @property (nonatomic, assign) BOOL isIgnoreArticlesEnabled;
 @property (nonatomic, assign) BOOL isGroupSingleItemSetsEnabled;
+@property (nonatomic, assign) BOOL isShowEmptyTvShowsEnabled;
 @property (nonatomic, copy) NSArray *KodiSorttokens;
 @property (nonatomic, strong) GlobalData *obj;
 

diff --git a/XBMC Remote/AppDelegate.m b/XBMC Remote/AppDelegate.m
@@ -3564,6 +3564,7 @@ - (BOOL)application:(UIApplication*)application didFinishLaunchingWithOptions:(N
                         @"thumbnail",
                         @"genre",
                         @"studio",
+                        @"episode",
                 ],
             }, @"parameters",
             @{

diff --git a/XBMC Remote/DetailViewController.m b/XBMC Remote/DetailViewController.m
@@ -4661,6 +4661,9 @@ - (void)retrieveData:(NSString*)methodToCall parameters:(NSDictionary*)parameter
          // are movie sets, enable the postprocessing to ignore movies sets with only 1 movie.
          BOOL ignoreSingleMovieSets = !AppDelegate.instance.isGroupSingleItemSetsEnabled && [methodToCall isEqualToString:@"VideoLibrary.GetMovieSets"];
 
+         // If the feature to list empty TV Shows is disabled and the current results are TV Shows, ignore TV Shows without any episode.
+         BOOL ignoreEmptyTvShows = !AppDelegate.instance.isShowEmptyTvShowsEnabled && [methodToCall isEqualToString:@"VideoLibrary.GetTVShows"];
+
          // If we are reading PVR recordings or PVR timers, we need to filter them for the current mode in
          // postprocessing. Ignore Radio recordings/timers, if we are in TV mode. Or ignore TV recordings/timers,
          // if we are in Radio mode.
@@ -4709,12 +4712,12 @@ - (void)retrieveData:(NSString*)methodToCall parameters:(NSDictionary*)parameter
 
                              // Check if we need to ignore the current item
                              BOOL isRadioItem = [item[@"radio"] boolValue] ||
-                             [item[@"isradio"] boolValue];
+                                                [item[@"isradio"] boolValue];
                              BOOL isTimerRule = [item[@"istimerrule"] boolValue];
                              BOOL ignorePvrItem = (ignoreRadioItems && isRadioItem) ||
-                             (ignoreTvItems && !isRadioItem) ||
-                             (ignoreTimerRulesItems && isTimerRule) ||
-                             (ignoreTimerItems && !isTimerRule);
+                                                  (ignoreTvItems && !isRadioItem) ||
+                                                  (ignoreTimerRulesItems && isTimerRule) ||
+                                                  (ignoreTimerItems && !isTimerRule);
 
                              // Postprocessing of movie sets lists to ignore 1-movie-sets
                              if (ignoreSingleMovieSets) {
@@ -4738,6 +4741,9 @@ - (void)retrieveData:(NSString*)methodToCall parameters:(NSDictionary*)parameter
                              else if (ignorePvrItem) {
                                  NSLog(@"Ignore PVR item as not matching current TV/Radio mode.");
                              }
+                             else if (ignoreEmptyTvShows && [item[@"episode"] intValue] == 0) {
+                                 // Do nothing
+                             }
                              else {
                                  [resultStoreArray addObject:newDict];
                              }

diff --git a/XBMC Remote/VersionCheck.h b/XBMC Remote/VersionCheck.h
@@ -13,6 +13,7 @@
 
 + (BOOL)hasRecordingIdPlaylistSupport;
 + (BOOL)hasGroupSingleItemSetsSupport;
++ (BOOL)hasShowEmptyTvShowsSupport;
 + (BOOL)hasSortTokenReadSupport;
 + (BOOL)hasPvrSortSupport;
 + (BOOL)hasAlbumArtistOnlySupport;

diff --git a/XBMC Remote/VersionCheck.m b/XBMC Remote/VersionCheck.m
@@ -24,6 +24,13 @@ + (BOOL)hasGroupSingleItemSetsSupport {
            (AppDelegate.instance.APImajorVersion == 6 && AppDelegate.instance.APIminorVersion == 32 && AppDelegate.instance.APIpatchVersion >= 4);
 }
 
++ (BOOL)hasShowEmptyTvShowsSupport {
+    // ShowEmptyTvShows is enabled (supported from API 6.32.1 on)
+    return (AppDelegate.instance.APImajorVersion >= 7) ||
+           (AppDelegate.instance.APImajorVersion == 6 && AppDelegate.instance.APIminorVersion >= 33) ||
+           (AppDelegate.instance.APImajorVersion == 6 && AppDelegate.instance.APIminorVersion == 32 && AppDelegate.instance.APIpatchVersion >= 1);
+}
+
 + (BOOL)hasSortTokenReadSupport {
     // Sort token can be read from API 9.5.0 on
     return (AppDelegate.instance.APImajorVersion == 9 && AppDelegate.instance.APIminorVersion >= 5) ||

diff --git a/XBMC Remote/tcpJSONRPC.m b/XBMC Remote/tcpJSONRPC.m
@@ -279,10 +279,12 @@ - (void)readJSONRPCAPIVersion {
                 AppDelegate.instance.APIpatchVersion = 0;
             }
         }
-        // Read the sorttokens
         [self readSorttokens];
+
         // Read 1-movie-set setting
         [self readGroupSingleItemSets];
+
+        [self readShowEmptyTvShows];
     }];
 }
 
@@ -307,6 +309,27 @@ - (void)readGroupSingleItemSets {
     }
 }
 
+- (void)readShowEmptyTvShows {
+    // Check if ShowEmptyTvShows is enabled
+    if ([VersionCheck hasShowEmptyTvShowsSupport]) {
+        [[Utilities getJsonRPC]
+         callMethod:@"Settings.GetSettingValue"
+         withParameters:@{@"setting": @"videolibrary.showemptytvshows"}
+         withTimeout: SERVER_TIMEOUT
+         onCompletion:^(NSString *methodName, NSInteger callId, id methodResult, DSJSONRPCError *methodError, NSError *error) {
+            if (!error && !methodError && [methodResult isKindOfClass:[NSDictionary class]]) {
+                AppDelegate.instance.isShowEmptyTvShowsEnabled = [methodResult[@"value"] boolValue];
+            }
+            else {
+                AppDelegate.instance.isShowEmptyTvShowsEnabled = YES;
+            }
+        }];
+    }
+    else {
+        AppDelegate.instance.isShowEmptyTvShowsEnabled = YES;
+    }
+}
+
 - (void)readSorttokens {
     NSArray *defaultTokens = @[@"The ", @"The.", @"The_"];
     // Read sort token from properties