From c39b589ab97c0a4f642a62607b59070491132203 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= Date: Mon, 8 Jul 2019 11:02:09 +0200 Subject: [PATCH] IMediaLibrary: Remove enableFailedThumbnailRegeneration Since we allow the re-generation of new thumbnails, this doesn't make much sense anymore --- include/medialibrary/IMediaLibrary.h | 8 -------- src/MediaLibrary.cpp | 5 ----- src/MediaLibrary.h | 2 -- src/Thumbnail.cpp | 7 ------- src/Thumbnail.h | 7 ------- 5 files changed, 29 deletions(-) diff --git a/include/medialibrary/IMediaLibrary.h b/include/medialibrary/IMediaLibrary.h index 4bf1a32b..e4748117 100644 --- a/include/medialibrary/IMediaLibrary.h +++ b/include/medialibrary/IMediaLibrary.h @@ -559,14 +559,6 @@ public: */ virtual void forceRescan() = 0; - /** - * @brief enableFailedThumbnailRegeneration Allow failed thumbnail attempt to be retried - * - * This will not attempt to regenerate the thumbnail immediatly, requestThumbnail - * still has to be called afterward. - */ - virtual void enableFailedThumbnailRegeneration() = 0; - virtual void addParserService( std::shared_ptr service ) = 0; virtual void addThumbnailer( std::shared_ptr thumbnailer ) = 0; diff --git a/src/MediaLibrary.cpp b/src/MediaLibrary.cpp index 77e953dd..4fecbb10 100644 --- a/src/MediaLibrary.cpp +++ b/src/MediaLibrary.cpp @@ -1737,11 +1737,6 @@ void MediaLibrary::forceRescan() } } -void MediaLibrary::enableFailedThumbnailRegeneration() -{ - Thumbnail::deleteFailureRecords( this ); -} - void MediaLibrary::addParserService( std::shared_ptr service ) { // For now we only support 1 external service of type MetadataExtraction diff --git a/src/MediaLibrary.h b/src/MediaLibrary.h index ffb7f7b3..717a4580 100644 --- a/src/MediaLibrary.h +++ b/src/MediaLibrary.h @@ -184,8 +184,6 @@ public: virtual void forceRescan() override; - virtual void enableFailedThumbnailRegeneration() override; - virtual void addParserService( std::shared_ptr service ) override; virtual void addThumbnailer( std::shared_ptr thumbnailer ) override; diff --git a/src/Thumbnail.cpp b/src/Thumbnail.cpp index 5f598d61..3c717836 100644 --- a/src/Thumbnail.cpp +++ b/src/Thumbnail.cpp @@ -225,13 +225,6 @@ int64_t Thumbnail::insert() return m_id; } -bool Thumbnail::deleteFailureRecords(MediaLibraryPtr ml) -{ - static const std::string req = "DELETE FROM " + Table::Name + - " WHERE mrl IS NULL"; - return sqlite::Tools::executeDelete( ml->getConn(), req ); -} - std::string Thumbnail::path( MediaLibraryPtr ml, int64_t thumbnailId ) { return ml->thumbnailPath() + std::to_string( thumbnailId ) + ".jpg"; diff --git a/src/Thumbnail.h b/src/Thumbnail.h index a49ac10c..03715bde 100644 --- a/src/Thumbnail.h +++ b/src/Thumbnail.h @@ -155,13 +155,6 @@ public: int64_t entityId, ThumbnailSizeType sizeType ); - /** - * @brief deleteFailureRecords Allow the thumbnail to retry any previously failed attempt - * - * This will delete all failure records - */ - static bool deleteFailureRecords( MediaLibraryPtr ml ); - static std::string path( MediaLibraryPtr ml, int64_t thumbnailId ); static const std::string EmptyMrl; -- GitLab