From 0c11a2a4d676e9fe1338b9beaff52a1d0bad865a Mon Sep 17 00:00:00 2001
From: Jagandeep Brar <me@jagandeepbrar.io>
Date: Tue, 31 Dec 2019 00:04:12 -0600
Subject: [PATCH] [Radarr] Show announced titles on missing page

---
 lib/logic/automation/radarr/api.dart          | 41 ++++++++++-----
 .../automation/radarr/entry/missing.dart      | 52 +++++++++++--------
 2 files changed, 58 insertions(+), 35 deletions(-)

diff --git a/lib/logic/automation/radarr/api.dart b/lib/logic/automation/radarr/api.dart
index c24cb17e..4e97fa45 100644
--- a/lib/logic/automation/radarr/api.dart
+++ b/lib/logic/automation/radarr/api.dart
@@ -388,6 +388,7 @@ class RadarrAPI {
                 if(response.statusCode == 200) {
                     List<RadarrMissingEntry> _availableEntries = [];
                     List<RadarrMissingEntry> _cinemaEntries = [];
+                    List<RadarrMissingEntry> _announcedEntries = [];
                     List body = json.decode(response.body);
                     for(var entry in body) {
                         if(!entry['downloaded'] && entry['monitored']) {
@@ -423,27 +424,41 @@ class RadarrAPI {
                                     ),
                                 );
                             }
+                            if(entry['status'] == 'announced') {
+                                _announcedEntries.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',
+                                    ),
+                                );
+                            }
                         }
                     }
+                    //Sort the lists by the appropriate dates
                     _availableEntries.sort((a,b) {
-                        if(a.physicalReleaseObject == null) {
-                            return 1;
-                        }
-                        if(b.physicalReleaseObject == null) {
-                            return -1;
-                        }
+                        if(a.physicalReleaseObject == null) return 1;
+                        if(b.physicalReleaseObject == null) return -1;
                         return b.physicalReleaseObject.compareTo(a.physicalReleaseObject);
                     });
                     _cinemaEntries.sort((a,b) {
-                        if(a.physicalReleaseObject == null) {
-                            return 1;
-                        }
-                        if(b.physicalReleaseObject == null) {
-                            return -1;
-                        }
+                        if(a.physicalReleaseObject == null) return 1;
+                        if(b.physicalReleaseObject == null) return -1;
                         return a.physicalReleaseObject.compareTo(b.physicalReleaseObject);
                     });
-                    return [_availableEntries, _cinemaEntries].expand((x) => x).toList();
+                    _announcedEntries.sort((a,b) {
+                        if(a.inCinemasObject == null) return 1;
+                        if(b.inCinemasObject == null) return -1;
+                        return a.inCinemasObject.compareTo(b.inCinemasObject);
+                    });
+                    return [_availableEntries, _cinemaEntries, _announcedEntries].expand((x) => x).toList();
                 }
             }
         } catch (e) {
diff --git a/lib/logic/automation/radarr/entry/missing.dart b/lib/logic/automation/radarr/entry/missing.dart
index 43dad330..390ae991 100644
--- a/lib/logic/automation/radarr/entry/missing.dart
+++ b/lib/logic/automation/radarr/entry/missing.dart
@@ -62,29 +62,37 @@ class RadarrMissingEntry {
             TextSpan(
                 text: '$year$runtimeString$profileString',
             ),
-            status == 'inCinemas' ? (
-                TextSpan(
-                    text: physicalReleaseObject != null ?
-                        physicalReleaseObject.difference(now).inDays == 0 ?
-                        '\nAvailable Today' :
-                        '\nAvailable in ${physicalReleaseObject.difference(now).inDays} Days' :
-                        '\nAvailability Unknown',
-                    style: TextStyle(
-                        color: Colors.blue,
-                        fontWeight: FontWeight.bold,
-                    ),
+            if(status == 'released') TextSpan(
+                text: physicalReleaseObject != null ? 
+                    now.difference(physicalReleaseObject).inDays == 0 ?
+                        '\nReleasing Today' :
+                        '\nReleased ${now.difference(physicalReleaseObject).inDays} Days Ago' :
+                        '\nReleased',
+                style: TextStyle(
+                    color: Colors.red,
+                    fontWeight: FontWeight.bold,
                 )
-            ) : (
-                TextSpan(
-                    text: physicalReleaseObject != null ? 
-                        now.difference(physicalReleaseObject).inDays == 0 ?
-                            '\nReleasing Today' :
-                            '\nReleased ${now.difference(physicalReleaseObject).inDays} Days Ago' :
-                            '\nReleased',
-                    style: TextStyle(
-                        color: Colors.red,
-                        fontWeight: FontWeight.bold,
-                    )
+            ),
+            if(status == 'inCinemas') TextSpan(
+                text: physicalReleaseObject != null ?
+                    physicalReleaseObject.difference(now).inDays == 0 ?
+                    '\nAvailable Today' :
+                    '\nAvailable in ${physicalReleaseObject.difference(now).inDays} Days' :
+                    '\nAvailability Unknown',
+                style: TextStyle(
+                    color: Colors.blue,
+                    fontWeight: FontWeight.bold,
+                ),
+            ),
+            if(status == 'announced') TextSpan(
+                text: inCinemasObject != null ? 
+                    now.difference(inCinemasObject).inDays == 0 ?
+                        '\nIn Cinemas Today' :
+                        '\nIn Cinemas in ${inCinemasObject.difference(now).inDays} Days' :
+                        '\nIn Cinemas Later',
+                style: TextStyle(
+                    color: Colors.orange,
+                    fontWeight: FontWeight.bold,
                 )
             ),
         ];