From 084983ac1841cc4b4dd62031f806bc45a3783a42 Mon Sep 17 00:00:00 2001
From: Michal Rentka <michalrentka@gmail.com>
Date: Mon, 15 Jul 2024 12:31:06 +0200
Subject: [PATCH] build fixes, bug fixes

---
 .../HtmlEpubDocumentViewController.swift      | 10 +++----
 ci_scripts/ci_pre_xcodebuild.sh               |  2 ++
 reader                                        |  2 +-
 scripts/bundle_reader.sh                      | 26 +++++++++----------
 4 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/Zotero/Scenes/Detail/HTML:EPUB/Views/HtmlEpubDocumentViewController.swift b/Zotero/Scenes/Detail/HTML:EPUB/Views/HtmlEpubDocumentViewController.swift
index 0833030c7..5322fedad 100644
--- a/Zotero/Scenes/Detail/HTML:EPUB/Views/HtmlEpubDocumentViewController.swift
+++ b/Zotero/Scenes/Detail/HTML:EPUB/Views/HtmlEpubDocumentViewController.swift
@@ -76,7 +76,7 @@ class HtmlEpubDocumentViewController: UIViewController {
 
         func load() {
             guard let readerUrl = Bundle.main.url(forResource: "view", withExtension: "html", subdirectory: "Bundled/reader") else {
-                DDLogError("HtmlEpubReaderViewController: can't load reader view.html")
+                DDLogError("HtmlEpubDocumentViewController: can't load reader view.html")
                 return
             }
             webViewHandler.load(fileUrl: readerUrl).subscribe().disposed(by: disposeBag)
@@ -138,7 +138,7 @@ class HtmlEpubDocumentViewController: UIViewController {
             webViewHandler.call(javascript: "search({ term: \(WebViewEncoder.encodeForJavascript(term.data(using: .utf8))) });")
                 .observe(on: MainScheduler.instance)
                 .subscribe(onFailure: { error in
-                    DDLogError("HtmlEpubReaderViewController: searching document failed - \(error)")
+                    DDLogError("HtmlEpubDocumentViewController: searching document failed - \(error)")
                 })
                 .disposed(by: disposeBag)
         }
@@ -147,7 +147,7 @@ class HtmlEpubDocumentViewController: UIViewController {
             webViewHandler.call(javascript: "select({ key: '\(key)' });")
                 .observe(on: MainScheduler.instance)
                 .subscribe(onFailure: { error in
-                    DDLogError("HtmlEpubReaderViewController: navigating to \(key) failed - \(error)")
+                    DDLogError("HtmlEpubDocumentViewController: navigating to \(key) failed - \(error)")
                 })
                 .disposed(by: disposeBag)
         }
@@ -159,7 +159,7 @@ class HtmlEpubDocumentViewController: UIViewController {
             webViewHandler.call(javascript: "updateAnnotations({ deletions: \(encodedDeletions), insertions: \(encodedInsertions), modifications: \(encodedModifications)});")
                 .observe(on: MainScheduler.instance)
                 .subscribe(onFailure: { error in
-                    DDLogError("HtmlEpubReaderViewController: updating document failed - \(error)")
+                    DDLogError("HtmlEpubDocumentViewController: updating document failed - \(error)")
                 })
                 .disposed(by: disposeBag)
         }
@@ -181,7 +181,7 @@ class HtmlEpubDocumentViewController: UIViewController {
             webViewHandler.call(javascript: javascript)
                 .observe(on: MainScheduler.instance)
                 .subscribe(onFailure: { error in
-                    DDLogError("HtmlEpubReaderViewController: loading document failed - \(error)")
+                    DDLogError("HtmlEpubDocumentViewController: loading document failed - \(error)")
                 })
                 .disposed(by: disposeBag)
         }
diff --git a/ci_scripts/ci_pre_xcodebuild.sh b/ci_scripts/ci_pre_xcodebuild.sh
index c49fb091a..998db0e3d 100755
--- a/ci_scripts/ci_pre_xcodebuild.sh
+++ b/ci_scripts/ci_pre_xcodebuild.sh
@@ -18,3 +18,5 @@ plist='<?xml version="1.0" encoding="UTF-8"?>
 </plist>'
 echo "$plist" > licenses/licenses.plist
 rm -rf pdf-keys
+
+brew install node
\ No newline at end of file
diff --git a/reader b/reader
index 4b37e0e23..bac736c8a 160000
--- a/reader
+++ b/reader
@@ -1 +1 @@
-Subproject commit 4b37e0e23ae5749421acf46dc3bb73525622ae45
+Subproject commit bac736c8acad9c42673592554d4f1512eca8bb36
diff --git a/scripts/bundle_reader.sh b/scripts/bundle_reader.sh
index 1b66cda94..3ed5c9ae1 100755
--- a/scripts/bundle_reader.sh
+++ b/scripts/bundle_reader.sh
@@ -1,18 +1,18 @@
 #!/bin/bash
 
- realpath() {
-     [[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}"
- }
+realpath() {
+    [[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}"
+}
 
- SCRIPT_PATH=`realpath "$0"`
- SCRIPT_DIR=`dirname "$SCRIPT_PATH"`
- READER_DIR="$SCRIPT_DIR/../bundled/reader"
+SCRIPT_PATH=`realpath "$0"`
+SCRIPT_DIR=`dirname "$SCRIPT_PATH"`
+READER_DIR="$SCRIPT_DIR/../bundled/reader"
 
- if [ -d "$READER_DIR" ]; then
-     rm -rf "$READER_DIR"
- fi
+if [ -d "$READER_DIR" ]; then
+ rm -rf "$READER_DIR"
+fi
 
- cd "$SCRIPT_DIR/../reader"
- npm ci
- npm run build:ios
- mv "$SCRIPT_DIR/../reader/build/ios" "$READER_DIR"
\ No newline at end of file
+cd "$SCRIPT_DIR/../reader"
+NODE_OPTIONS=--openssl-legacy-provider npm ci
+NODE_OPTIONS=--openssl-legacy-provider npm run build:ios
+mv "$SCRIPT_DIR/../reader/build/ios" "$READER_DIR"
\ No newline at end of file