Merge pull request #779 from wutschel/globalsearch_load

Improvement: Align GlobalSearch thumb size and content
xbmc · Nov 20, 2022 · 9354ff6 · 9354ff6
2 parents 78298b0 + 0e5bdc4
commit 9354ff6
Showing 1 changed file with 23 additions and 38 deletions.
diff --git a/XBMC Remote/DetailViewController.m b/XBMC Remote/DetailViewController.m
@@ -413,6 +413,25 @@ - (void)updateSyncDate:(NSString*)filePath {
 
 #pragma mark - Utility
 
+- (void)addExtraProperties:(NSMutableArray*)mutableProperties newParams:(NSMutableDictionary*)mutableParameters params:(NSDictionary*)parameters {
+    if ([parameters[@"FrodoExtraArt"] boolValue] && AppDelegate.instance.serverVersion > 11) {
+        [mutableProperties addObject:@"art"];
+    }
+    if (parameters[@"kodiExtrasPropertiesMinimumVersion"] != nil) {
+        for (id key in parameters[@"kodiExtrasPropertiesMinimumVersion"]) {
+            if (AppDelegate.instance.serverVersion >= [key integerValue]) {
+                id arrayProperties = parameters[@"kodiExtrasPropertiesMinimumVersion"][key];
+                for (id value in arrayProperties) {
+                    [mutableProperties addObject:value];
+                }
+            }
+        }
+    }
+    if (mutableProperties != nil) {
+        mutableParameters[@"properties"] = mutableProperties;
+    }
+}
+
 - (UIViewController*)topMostController {
     UIViewController *topController = UIApplication.sharedApplication.keyWindow.rootViewController;
 
@@ -574,6 +593,7 @@ - (CGPoint)getGlobalSearchThumbsize:(NSDictionary*)item {
     CGPoint thumbSize = CGPointMake(53, 53);
     if ([item[@"family"] isEqualToString:@"movieid"] ||
         [item[@"family"] isEqualToString:@"setid"] ||
+        [item[@"family"] isEqualToString:@"musicvideoid"] ||
         [item[@"family"] isEqualToString:@"tvshowid"]) {
         thumbSize.x = 53;
         thumbSize.y = 76;
@@ -1261,22 +1281,7 @@ - (IBAction)changeTab:(id)sender {
     [activeLayoutView setContentOffset:[(UITableView*)activeLayoutView contentOffset] animated:NO];
     NSString *labelText = parameters[@"label"];
     [self setFilternameLabel:labelText runFullscreenButtonCheck:YES forceHide:NO];
-    if ([parameters[@"FrodoExtraArt"] boolValue] && AppDelegate.instance.serverVersion > 11) {
-        [mutableProperties addObject:@"art"];
-    }
-    if (parameters[@"kodiExtrasPropertiesMinimumVersion"] != nil) {
-        for (id key in parameters[@"kodiExtrasPropertiesMinimumVersion"]) {
-            if (AppDelegate.instance.serverVersion >= [key integerValue]) {
-                id arrayProperties = parameters[@"kodiExtrasPropertiesMinimumVersion"][key];
-                for (id value in arrayProperties) {
-                    [mutableProperties addObject:value];
-                }
-            }
-        }
-    }
-    if (mutableProperties != nil) {
-        mutableParameters[@"properties"] = mutableProperties;
-    }
+    [self addExtraProperties:mutableProperties newParams:mutableParameters params:parameters];
     if ([parameters[@"blackTableSeparator"] boolValue] && ![Utilities getPreferTvPosterMode]) {
         blackTableSeparator = YES;
         dataList.separatorColor = [Utilities getGrayColor:38 alpha:1];
@@ -4474,22 +4479,7 @@ - (void)startRetrieveDataWithRefresh:(BOOL)forceRefresh {
     NSDictionary *parameters = [Utilities indexKeyedDictionaryFromArray:menuItem.mainParameters[choosedTab]];
     NSMutableDictionary *mutableParameters = [parameters[@"parameters"] mutableCopy];
     NSMutableArray *mutableProperties = [parameters[@"parameters"][@"properties"] mutableCopy];
-    if ([parameters[@"FrodoExtraArt"] boolValue] && AppDelegate.instance.serverVersion > 11) {
-        [mutableProperties addObject:@"art"];
-    }
-    if (parameters[@"kodiExtrasPropertiesMinimumVersion"] != nil) {
-        for (id key in parameters[@"kodiExtrasPropertiesMinimumVersion"]) {
-            if (AppDelegate.instance.serverVersion >= [key integerValue]) {
-                id arrayProperties = parameters[@"kodiExtrasPropertiesMinimumVersion"][key];
-                for (id value in arrayProperties) {
-                    [mutableProperties addObject:value];
-                }
-            }
-        }
-    }
-    if (mutableProperties != nil) {
-        mutableParameters[@"properties"] = mutableProperties;
-    }
+    [self addExtraProperties:mutableProperties newParams:mutableParameters params:parameters];
     NSString *methodToCall = methods[@"method"];
     if (parameters[@"exploreCommand"] != nil) {
         methodToCall = parameters[@"exploreCommand"];
@@ -4575,12 +4565,7 @@ - (void)loadDetailedData:(NSArray*)itemsAndTabs index:(int)index results:(NSMuta
     NSString *methodToCall = methods[@"method"];
     NSMutableDictionary *mutableParameters = [parameters[@"parameters"] mutableCopy];
     NSMutableArray *mutableProperties = [parameters[@"parameters"][@"properties"] mutableCopy];
-    if ([parameters[@"FrodoExtraArt"] boolValue] && AppDelegate.instance.serverVersion > 11) {
-        [mutableProperties addObject:@"art"];
-    }
-    if (mutableProperties != nil) {
-        mutableParameters[@"properties"] = mutableProperties;
-    }
+    [self addExtraProperties:mutableProperties newParams:mutableParameters params:parameters];
     [[Utilities getJsonRPC]
      callMethod:methodToCall
      withParameters:mutableParameters