mirror of
https://github.com/Radarr/Radarr.git
synced 2024-09-11 12:02:35 +02:00
updated json serilizer to return defaults
use enum text instead of number
This commit is contained in:
parent
a6aba16902
commit
40f384968a
@ -1,6 +1,7 @@
|
||||
using System;
|
||||
using System.IO;
|
||||
using Newtonsoft.Json;
|
||||
using Newtonsoft.Json.Converters;
|
||||
using Newtonsoft.Json.Serialization;
|
||||
|
||||
namespace NzbDrone.Common
|
||||
@ -20,26 +21,18 @@ public class JsonSerializer : IJsonSerializer
|
||||
|
||||
public JsonSerializer()
|
||||
{
|
||||
var setting = new JsonSerializerSettings
|
||||
{
|
||||
DateTimeZoneHandling = DateTimeZoneHandling.Utc,
|
||||
NullValueHandling = NullValueHandling.Ignore,
|
||||
Formatting = Formatting.Indented,
|
||||
DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate
|
||||
};
|
||||
|
||||
_jsonNetSerializer = new Newtonsoft.Json.JsonSerializer()
|
||||
{
|
||||
DateTimeZoneHandling = setting.DateTimeZoneHandling,
|
||||
NullValueHandling = setting.NullValueHandling,
|
||||
Formatting = setting.Formatting,
|
||||
DefaultValueHandling = setting.DefaultValueHandling,
|
||||
DateTimeZoneHandling = DateTimeZoneHandling.Utc,
|
||||
NullValueHandling = NullValueHandling.Include,
|
||||
Formatting = Formatting.Indented,
|
||||
DefaultValueHandling = DefaultValueHandling.Include,
|
||||
ContractResolver = new CamelCasePropertyNamesContractResolver()
|
||||
};
|
||||
|
||||
_jsonNetSerializer.Converters.Add(new StringEnumConverter { CamelCaseText = true });
|
||||
}
|
||||
|
||||
|
||||
|
||||
public T Deserialize<T>(string json) where T : class, new()
|
||||
{
|
||||
return JsonConvert.DeserializeObject<T>(json);
|
||||
|
@ -17,9 +17,9 @@ public ModelEvent(T model, RepositoryAction action)
|
||||
|
||||
public enum RepositoryAction
|
||||
{
|
||||
Created,
|
||||
Updated,
|
||||
Deleted
|
||||
Created = 1,
|
||||
Updated = 2,
|
||||
Deleted = 3
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -11,12 +11,22 @@ define(['app', 'AddSeries/RootFolders/RootFolderCollection', 'AddSeries/New/Sear
|
||||
regions: {
|
||||
searchResult: '#search-result'
|
||||
},
|
||||
collection: new NzbDrone.Series.SeriesCollection(),
|
||||
|
||||
initialize: function () {
|
||||
|
||||
this.collection = new NzbDrone.Series.SeriesCollection();
|
||||
|
||||
this.collection.parse = function (response) {
|
||||
_.each(response, function (model) {
|
||||
model.id = null;
|
||||
});
|
||||
|
||||
return response;
|
||||
};
|
||||
|
||||
NzbDrone.AddSeries.New.AddNewSeriesContext = this;
|
||||
|
||||
NzbDrone.vent.on(NzbDrone.Events.SeriesAdded, function (options){
|
||||
NzbDrone.vent.on(NzbDrone.Events.SeriesAdded, function (options) {
|
||||
if (!options.existing) {
|
||||
NzbDrone.AddSeries.New.AddNewSeriesContext.ui.seriesSearch.val('');
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
"use strict";
|
||||
|
||||
Backbone.Collection.prototype.BindSignalR = function (options) {
|
||||
_.extend(Backbone.Collection.prototype, {BindSignalR: function (options) {
|
||||
|
||||
if (!options || !options.url) {
|
||||
console.assert(this.url, 'url must be provided or collection must have url');
|
||||
@ -34,14 +34,15 @@ Backbone.Collection.prototype.BindSignalR = function (options) {
|
||||
console.debug('{0} [{1}]'.format(options.url, _getStatus(change.newState)));
|
||||
});
|
||||
|
||||
connection.received(function () {
|
||||
connection.received(function (model) {
|
||||
console.debug(model);
|
||||
self.fetch();
|
||||
});
|
||||
|
||||
connection.start({ transport: ['longPolling'] });
|
||||
|
||||
return this;
|
||||
};
|
||||
}});
|
||||
|
||||
|
||||
|
||||
|
@ -33,11 +33,11 @@
|
||||
{{#if bestDateString}}
|
||||
<span class="label">{{bestDateString}}</span>
|
||||
{{else}}
|
||||
<span class="label label-inverse">{{statusText}}</span>
|
||||
<span class="label label-inverse">{{status}}</span>
|
||||
{{/if}}
|
||||
<span class="label label-info">Season {{seasonCount}}</span>
|
||||
{{else}}
|
||||
<span class="label label-important">{{statusText}}</span>
|
||||
<span class="label label-important">{{status}}</span>
|
||||
<span class="label label-info">{{seasonCount}} Seasons</span>
|
||||
{{/if}}
|
||||
</div>
|
||||
|
@ -26,7 +26,7 @@
|
||||
{{#if bestDateString}}
|
||||
<span class="label label-inverse air-date" title="{{shortDate}}">{{bestDateString}}</span>
|
||||
{{else}}
|
||||
<span class="label label-inverse">{{statusText}}</span>
|
||||
<span class="label label-inverse">{{status}}</span>
|
||||
{{/if}}
|
||||
<span class="label label-info">Season {{seasonCount}}</span>
|
||||
{{else}}
|
||||
|
@ -23,7 +23,7 @@ define(['app', 'Quality/QualityProfileCollection', 'AddSeries/RootFolders/RootFo
|
||||
},
|
||||
poster : function () {
|
||||
var poster = _.find(this.get('images'), function (image) {
|
||||
return image.coverType === 1;
|
||||
return image.coverType === 'poster';
|
||||
});
|
||||
|
||||
if (poster) {
|
||||
@ -47,14 +47,7 @@ define(['app', 'Quality/QualityProfileCollection', 'AddSeries/RootFolders/RootFo
|
||||
return "http://trakt.tv/show/" + this.get('titleSlug');
|
||||
},
|
||||
isContinuing : function () {
|
||||
return this.get('status') === 0;
|
||||
},
|
||||
statusText : function () {
|
||||
if (this.get('status') === 0) {
|
||||
return 'Continuing';
|
||||
}
|
||||
|
||||
return 'Ended';
|
||||
return this.get('status') === 'continuing';
|
||||
},
|
||||
shortDate : function () {
|
||||
var date = this.get('nextAiring');
|
||||
|
Loading…
Reference in New Issue
Block a user