From 0e48baf9f95d7b9c10f4f984a3e4609297a27b6c Mon Sep 17 00:00:00 2001
From: Veloman Yunkan <veloman.yunkan@gmail.com>
Date: Wed, 20 Oct 2021 22:20:04 +0400
Subject: [PATCH] Simplified Library::getReaderById()

Reused `Library::getArchiveById()` in `Library::getReaderById()`.
---
 src/library.cpp | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/library.cpp b/src/library.cpp
index 1882574d6..c411f56f4 100644
--- a/src/library.cpp
+++ b/src/library.cpp
@@ -148,19 +148,11 @@ std::shared_ptr<Reader> Library::getReaderById(const std::string& id)
     return m_readers.at(id);
   } catch (std::out_of_range& e) {}
 
-  try {
-    auto reader = make_shared<Reader>(m_archives.at(id));
-    m_readers[id] = reader;
-    return reader;
-  } catch (std::out_of_range& e) {}
-
-  auto book = getBookById(id);
-  if (!book.isPathValid())
+  const auto archive = getArchiveById(id);
+  if ( !archive )
     return nullptr;
 
-  auto archive = make_shared<zim::Archive>(book.getPath());
-  m_archives[id] = archive;
-  auto reader = make_shared<Reader>(archive);
+  const auto reader = make_shared<Reader>(archive);
   m_readers[id] = reader;
   return reader;
 }