Forráskód Böngészése

Use JSON deserialization for NewSeriesProviderIds parameter

softworkz 9 éve
szülő
commit
b5c41d104c
1 módosított fájl, 8 hozzáadás és 13 törlés
  1. 8 13
      MediaBrowser.Api/Library/FileOrganizationService.cs

+ 8 - 13
MediaBrowser.Api/Library/FileOrganizationService.cs

@@ -6,6 +6,7 @@ using MediaBrowser.Model.Querying;
 using ServiceStack;
 using ServiceStack;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Serialization;
 
 
 namespace MediaBrowser.Api.Library
 namespace MediaBrowser.Api.Library
 {
 {
@@ -118,9 +119,14 @@ namespace MediaBrowser.Api.Library
     {
     {
         private readonly IFileOrganizationService _iFileOrganizationService;
         private readonly IFileOrganizationService _iFileOrganizationService;
 
 
-        public FileOrganizationService(IFileOrganizationService iFileOrganizationService)
+        /// The _json serializer
+        /// </summary>
+        private readonly IJsonSerializer _jsonSerializer;
+
+        public FileOrganizationService(IFileOrganizationService iFileOrganizationService, IJsonSerializer jsonSerializer)
         {
         {
             _iFileOrganizationService = iFileOrganizationService;
             _iFileOrganizationService = iFileOrganizationService;
+            _jsonSerializer = jsonSerializer;
         }
         }
 
 
         public object Get(GetFileOrganizationActivity request)
         public object Get(GetFileOrganizationActivity request)
@@ -161,18 +167,7 @@ namespace MediaBrowser.Api.Library
 
 
             if (!string.IsNullOrEmpty(request.NewSeriesProviderIds))
             if (!string.IsNullOrEmpty(request.NewSeriesProviderIds))
             {
             {
-                var str = request.NewSeriesProviderIds.Replace("{", "").Replace("}", "").Replace("\"", "");
-
-                foreach (var item in str.Split(','))
-                {
-                    var itemArr = item.Split(':');
-                    if (itemArr.Length > 1)
-                    {
-                        var key = itemArr[0].Trim();
-                        var val = itemArr[1].Trim();
-                        dicNewProviderIds.Add(key, val);
-                    }
-                }
+                dicNewProviderIds = _jsonSerializer.DeserializeFromString<Dictionary<string, string>>(request.NewSeriesProviderIds);
             }
             }
 
 
             var task = _iFileOrganizationService.PerformEpisodeOrganization(new EpisodeFileOrganizationRequest
             var task = _iFileOrganizationService.PerformEpisodeOrganization(new EpisodeFileOrganizationRequest