fix multi-database - see isue #72

mikespub-org · Feb 15, 2024 · 2895552 · 2895552
1 parent 19d60cd
commit 2895552
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 51 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,9 +10,12 @@ x.x.x - TODO
 1.5.x - 2023xxxx Maintenance release for 1.x (PHP >= 7.4)
   * ...
 
-2.x.x - 2023xxxx To be continued (PHP >= 8.1)
+2.x.x - 2024xxxx To be continued (PHP >= 8.1)
   * TODO - Fix OPDS 2.0 pagination
 
+2.2.2 - 20240215 Fix multi-database for epub reader and email
+  * Error sending or reading book from additional dbs - see issue #72 from @malkavi
+
 2.2.1 - 20231116 Consolidate PRs for next release (PHP >= 8.1)
   * Support display settings for custom columns - see pull request #69 from @Mikescher
   * Add Japanese language file - see pull request #67 from @horus68 translated by Rentaro Yoshidumi

diff --git a/composer.lock b/composer.lock
diff --git a/lib/Input/Config.php b/lib/Input/Config.php
@@ -16,7 +16,7 @@
  */
 class Config
 {
-    public const VERSION = '2.2.1';
+    public const VERSION = '2.2.2';
     public const ENDPOINT = [
         "index" => "index.php",
         "feed" => "feed.php",

diff --git a/lib/Output/EPubReader.php b/lib/Output/EPubReader.php
@@ -83,7 +83,7 @@ public static function getComponentContent($book, $component, $params = [])
     public static function getContent($idData, $component, $request)
     {
         /** @var Book */
-        $book = Book::getBookByDataId($idData);
+        $book = Book::getBookByDataId($idData, $request->database());
         $params = ['data' => $idData, 'db' => $book->getDatabaseId()];
 
         $epub = new static::$epubClass($book->getFilePath('EPUB', $idData));
@@ -104,7 +104,7 @@ public static function getContent($idData, $component, $request)
      */
     public static function getReader($idData, $request)
     {
-        $book = Book::getBookByDataId($idData);
+        $book = Book::getBookByDataId($idData, $request->database());
         $params = ['data' => $idData, 'db' => $book->getDatabaseId()];
 
         try {

diff --git a/lib/Output/Mail.php b/lib/Output/Mail.php
@@ -10,6 +10,7 @@
 namespace SebLucas\Cops\Output;
 
 use SebLucas\Cops\Input\Config;
+use SebLucas\Cops\Input\Request;
 use PHPMailer\PHPMailer\PHPMailer;
 use SebLucas\Cops\Calibre\Book;
 
@@ -59,12 +60,13 @@ public static function checkRequest($idData, $emailDest)
      * Summary of sendMail
      * @param mixed $idData
      * @param string $emailDest
+     * @param Request $request
      * @param bool $dryRun
      * @return bool|string
      */
-    public static function sendMail($idData, $emailDest, $dryRun = false)
+    public static function sendMail($idData, $emailDest, $request, $dryRun = false)
     {
-        $book = Book::getBookByDataId($idData);
+        $book = Book::getBookByDataId($idData, $request->database());
         $data = $book->getDataById($idData);
 
         if (!file_exists($data->getLocalPath())) {

diff --git a/sendtomail.php b/sendtomail.php
@@ -18,7 +18,7 @@
     exit;
 }
 
-if ($error = Mail::sendMail($idData, $emailDest)) {
+if ($error = Mail::sendMail($idData, $emailDest, $request)) {
     echo localize("mail.messagenotsent");
     echo $error;
     exit;

diff --git a/test/mailTest.php b/test/mailTest.php
@@ -11,6 +11,7 @@
 require_once __DIR__ . '/config_test.php';
 use PHPUnit\Framework\TestCase;
 use SebLucas\Cops\Input\Config;
+use SebLucas\Cops\Input\Request;
 use SebLucas\Cops\Output\Mail;
 
 class MailTest extends TestCase
@@ -104,21 +105,24 @@ public function testCheckRequestEmailNotValid(): void
 
     public function testSendMailNotFound(): void
     {
-        $this->assertStringStartsWith("No", Mail::sendMail(12, "a@a.com"));
+        $request = Request::build([]);
+        $this->assertStringStartsWith("No", Mail::sendMail(12, "a@a.com", $request));
     }
 
     public function testSendMailTooBig(): void
     {
         $old = Mail::$maxSize;
         Mail::$maxSize = 0;
-        $this->assertStringStartsWith("No", Mail::sendMail(20, "a@a.com"));
+        $request = Request::build([]);
+        $this->assertStringStartsWith("No", Mail::sendMail(20, "a@a.com", $request));
         Mail::$maxSize = $old;
     }
 
     public function testSendMailSomeday(): void
     {
+        $request = Request::build([]);
         // use dryRun to run preSend() but not actually Send()
-        $error = Mail::sendMail(20, "a@a.com", true);
+        $error = Mail::sendMail(20, "a@a.com", $request, true);
         $this->assertFalse($error);
     }
 }
diff --git a/test/pageMultidatabaseTest.php b/test/pageMultidatabaseTest.php
@@ -83,6 +83,7 @@ public function providerSearch()
 
     public static function tearDownAfterClass(): void
     {
+        Config::set('calibre_directory', __DIR__ . "/BaseWithSomeBooks/");
         Database::clearDb();
     }
 }