diff --git a/lib/logic/automation/radarr/api.dart b/lib/logic/automation/radarr/api.dart index 4215ac15..c24cb17e 100644 --- a/lib/logic/automation/radarr/api.dart +++ b/lib/logic/automation/radarr/api.dart @@ -407,25 +407,21 @@ class RadarrAPI { ), ); } - if(entry['status'] == 'inCinemas' && entry['physicalRelease'] != null) { - DateTime now = DateTime.now(); - DateTime release = DateTime.tryParse(entry['physicalRelease'] ?? '')?.toLocal(); - if(release != null && release.difference(now).inDays < 31) { - _cinemaEntries.add( - RadarrMissingEntry( - entry['id'] ?? -1, - entry['title'] ?? 'Unknown Title', - entry['sortTitle'] ?? 'Unknown Title', - entry['studio'] ?? 'Unknown Studio', - entry['physicalRelease'] ?? '', - entry['inCinemas'] ?? '', - entry['profileId'] != null ? _qualities[entry['qualityProfileId']].name : '', - entry['year'] ?? 0, - entry['runtime'] ?? 0, - entry['status'] ?? 'Unknown Status', - ), - ); - } + if(entry['status'] == 'inCinemas') { + _cinemaEntries.add( + RadarrMissingEntry( + entry['id'] ?? -1, + entry['title'] ?? 'Unknown Title', + entry['sortTitle'] ?? 'Unknown Title', + entry['studio'] ?? 'Unknown Studio', + entry['physicalRelease'] ?? '', + entry['inCinemas'] ?? '', + entry['profileId'] != null ? _qualities[entry['qualityProfileId']].name : '', + entry['year'] ?? 0, + entry['runtime'] ?? 0, + entry['status'] ?? 'Unknown Status', + ), + ); } } } @@ -440,10 +436,10 @@ class RadarrAPI { }); _cinemaEntries.sort((a,b) { if(a.physicalReleaseObject == null) { - return -1; + return 1; } if(b.physicalReleaseObject == null) { - return 1; + return -1; } return a.physicalReleaseObject.compareTo(b.physicalReleaseObject); }); diff --git a/lib/logic/automation/radarr/entry/missing.dart b/lib/logic/automation/radarr/entry/missing.dart index c1bed35b..43dad330 100644 --- a/lib/logic/automation/radarr/entry/missing.dart +++ b/lib/logic/automation/radarr/entry/missing.dart @@ -64,9 +64,11 @@ class RadarrMissingEntry { ), status == 'inCinemas' ? ( TextSpan( - text: physicalReleaseObject.difference(now).inDays == 0 ? + text: physicalReleaseObject != null ? + physicalReleaseObject.difference(now).inDays == 0 ? '\nAvailable Today' : - '\nAvailable in ${physicalReleaseObject.difference(now).inDays} Days', + '\nAvailable in ${physicalReleaseObject.difference(now).inDays} Days' : + '\nAvailability Unknown', style: TextStyle( color: Colors.blue, fontWeight: FontWeight.bold, @@ -74,10 +76,10 @@ class RadarrMissingEntry { ) ) : ( TextSpan( - text: physicalRelease != null ? - now.difference(inCinemasObject).inDays == 0 ? + text: physicalReleaseObject != null ? + now.difference(physicalReleaseObject).inDays == 0 ? '\nReleasing Today' : - '\nReleased ${now.difference(inCinemasObject).inDays} Days Ago' : + '\nReleased ${now.difference(physicalReleaseObject).inDays} Days Ago' : '\nReleased', style: TextStyle( color: Colors.red,