diff --git a/README.md b/README.md index f9f3118..8d573c4 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,7 @@ Made this simple multi chat-client bot to access radarr, sonarr, and lidarr with - [x] Radarr (v4) - [x] Sonarr (v4) - [x] Sonarr (v3) +- [x] Lidarr (v2) - [x] Lidarr (v1) - [x] Lidarr (v0) - [x] ~~Radarr (v3) - no longer supported~~ diff --git a/src/main/java/com/botdarr/api/lidarr/LidarrApi.java b/src/main/java/com/botdarr/api/lidarr/LidarrApi.java index 67d018a..9fcc6e7 100644 --- a/src/main/java/com/botdarr/api/lidarr/LidarrApi.java +++ b/src/main/java/com/botdarr/api/lidarr/LidarrApi.java @@ -286,7 +286,7 @@ private CommandResponse addArtist(LidarrArtist lidarrArtist) { LIDARR_CACHE.addArtist(lidarrArtist); LogManager.getLogger("AuditLog").info("User " + username + " added " + lidarrArtist.getArtistName()); apiRequests.auditRequest(apiRequestType, username, lidarrArtist.getArtistName()); - return new SuccessResponse("Artist " + lidarrArtist.getArtistName() + " added, lidarr-detail=" + response.getStatusLine().getReasonPhrase()); + return new SuccessResponse("Artist " + lidarrArtist.getArtistName() + " was added successfully!"); } } catch (IOException e) { LOGGER.error("Error trying to add artist", e); diff --git a/src/main/java/com/botdarr/api/lidarr/LidarrArtist.java b/src/main/java/com/botdarr/api/lidarr/LidarrArtist.java index 9a017de..a3f6949 100644 --- a/src/main/java/com/botdarr/api/lidarr/LidarrArtist.java +++ b/src/main/java/com/botdarr/api/lidarr/LidarrArtist.java @@ -111,9 +111,11 @@ public String getRemoteImage() { return lidarrImage.getRemoteUrl(); } } - for (LidarrImage lidarrImage : this.lastAlbum.getImages()) { - if (lidarrImage.getCoverType().equals("cover") && !Strings.isEmpty(lidarrImage.getUrl())) { - return lidarrImage.getUrl(); + if (this.lastAlbum != null) { + for (LidarrImage lidarrImage : this.lastAlbum.getImages()) { + if (lidarrImage.getCoverType().equals("cover") && !Strings.isEmpty(lidarrImage.getUrl())) { + return lidarrImage.getUrl(); + } } } } diff --git a/src/main/java/com/botdarr/api/lidarr/LidarrStatistics.java b/src/main/java/com/botdarr/api/lidarr/LidarrStatistics.java index 1c19013..6b5897a 100644 --- a/src/main/java/com/botdarr/api/lidarr/LidarrStatistics.java +++ b/src/main/java/com/botdarr/api/lidarr/LidarrStatistics.java @@ -49,10 +49,10 @@ public void setPercentOfTracks(Double percentOfTracks) { this.percentOfTracks = percentOfTracks; } - private Integer albumCount; - private Integer trackFileCount; - private Integer trackCount; - private Integer totalTrackCount; - private Integer sizeOnDisk; - private Double percentOfTracks; + private Integer albumCount = 0; + private Integer trackFileCount = 0; + private Integer trackCount = 0; + private Integer totalTrackCount = 0; + private Integer sizeOnDisk = 0; + private Double percentOfTracks = 0.0; } diff --git a/src/main/java/com/botdarr/api/radarr/RadarrApi.java b/src/main/java/com/botdarr/api/radarr/RadarrApi.java index 2608615..72a390a 100644 --- a/src/main/java/com/botdarr/api/radarr/RadarrApi.java +++ b/src/main/java/com/botdarr/api/radarr/RadarrApi.java @@ -267,7 +267,7 @@ private CommandResponse addMovie(RadarrMovie radarrMovie) { RADARR_CACHE.add(radarrMovie); LogManager.getLogger("AuditLog").info("User " + username + " added " + radarrMovie.getTitle()); apiRequests.auditRequest(apiRequestType, username, radarrMovie.getTitle()); - return new SuccessResponse("Movie " + radarrMovie.getTitle() + " added, radarr-detail=" + response.getStatusLine().getReasonPhrase()); + return new SuccessResponse("Movie " + radarrMovie.getTitle() + " was added successfully!"); } } catch (IOException e) { LOGGER.error("Error trying to add movie", e); diff --git a/src/main/java/com/botdarr/api/sonarr/SonarrApi.java b/src/main/java/com/botdarr/api/sonarr/SonarrApi.java index 268f454..0d9e739 100644 --- a/src/main/java/com/botdarr/api/sonarr/SonarrApi.java +++ b/src/main/java/com/botdarr/api/sonarr/SonarrApi.java @@ -337,7 +337,7 @@ private CommandResponse addShow(SonarrShow sonarrShow) { SONARR_CACHE.add(sonarrShow); LogManager.getLogger("AuditLog").info("User " + username + " added " + title); apiRequests.auditRequest(apiRequestType, username, title); - return new SuccessResponse("Show " + title + " added, sonarr-detail=" + response.getStatusLine().getReasonPhrase()); + return new SuccessResponse("Show " + title + " was added successfully!"); } } catch (IOException e) { LOGGER.error("Error trying to add show=" + title, e); diff --git a/src/main/java/com/botdarr/clients/ChatClientBootstrap.java b/src/main/java/com/botdarr/clients/ChatClientBootstrap.java index f091475..8efa95b 100644 --- a/src/main/java/com/botdarr/clients/ChatClientBootstrap.java +++ b/src/main/java/com/botdarr/clients/ChatClientBootstrap.java @@ -86,6 +86,8 @@ protected void runAndProcessCommands(String prefi chatSender.send(clientResponse); } } + } catch (Throwable throwable) { + LOGGER.error("Error caught processing command", throwable); } finally { CommandContext.end(); } diff --git a/src/main/resources/version.txt b/src/main/resources/version.txt index db4dd40..1c3c447 100644 --- a/src/main/resources/version.txt +++ b/src/main/resources/version.txt @@ -1 +1 @@ -5.6.14 \ No newline at end of file +5.6.15 \ No newline at end of file