From d2fa75dee5969b6edc9f179d89f167dcf7f6f5ac Mon Sep 17 00:00:00 2001 From: ta264 Date: Thu, 6 Aug 2020 21:18:28 +0100 Subject: [PATCH] New: Support digest authentication with Calibre --- src/NzbDrone.Core/Books/Calibre/CalibreProxy.cs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/NzbDrone.Core/Books/Calibre/CalibreProxy.cs b/src/NzbDrone.Core/Books/Calibre/CalibreProxy.cs index c1432e5a2..a7643a16a 100644 --- a/src/NzbDrone.Core/Books/Calibre/CalibreProxy.cs +++ b/src/NzbDrone.Core/Books/Calibre/CalibreProxy.cs @@ -13,7 +13,6 @@ using NzbDrone.Core.MediaCover; using NzbDrone.Core.MediaFiles; using NzbDrone.Core.RemotePathMappings; -using NzbDrone.Core.Rest; namespace NzbDrone.Core.Books.Calibre { @@ -70,7 +69,7 @@ public CalibreImportJob AddBook(BookFile book, CalibreSettings settings) return _httpClient.Post(request).Resource; } - catch (RestException ex) + catch (HttpException ex) { throw new CalibreException("Unable to add file to calibre library: {0}", ex, ex.Message); } @@ -177,7 +176,7 @@ public CalibreBookData GetBookData(int calibreId, CalibreSettings settings) return _httpClient.Get(request).Resource; } - catch (RestException ex) + catch (HttpException ex) { throw new CalibreException("Unable to add file to calibre library: {0}", ex, ex.Message); } @@ -199,7 +198,7 @@ public long ConvertBook(int calibreId, CalibreConversionOptions options, Calibre return jobId; } - catch (RestException ex) + catch (HttpException ex) { throw new CalibreException("Unable to start calibre conversion: {0}", ex, ex.Message); } @@ -221,7 +220,7 @@ public CalibreBook GetBook(int calibreId, CalibreSettings settings) return book; } - catch (RestException ex) + catch (HttpException ex) { throw new CalibreException("Unable to connect to calibre library: {0}", ex, ex.Message); } @@ -256,7 +255,7 @@ public List GetAllBookFilePaths(CalibreSettings settings) return result; } - catch (RestException ex) + catch (HttpException ex) { throw new CalibreException("Unable to connect to calibre library: {0}", ex, ex.Message); } @@ -270,7 +269,7 @@ public void GetLibraryInfo(CalibreSettings settings) var request = builder.Build(); var response = _httpClient.Execute(request); } - catch (RestException ex) + catch (HttpException ex) { throw new CalibreException("Unable to connect to calibre library: {0}", ex, ex.Message); }