From 13467a8b92160b3924c3522e554424d71884d92a Mon Sep 17 00:00:00 2001
From: root <holta@users.noreply.github.com>
Date: Wed, 29 Nov 2023 16:44:29 -0500
Subject: [PATCH] Calibre-Web prereqs for audio/video + set app.db log to
 /var/log/calibre-web.log

---
 roles/calibre-web/files/app.db                | Bin 94208 -> 126976 bytes
 roles/calibre-web/tasks/enable-or-disable.yml |  18 +++++++++++++++++-
 roles/calibre-web/tasks/install.yml           |  15 ++++++++++++---
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/roles/calibre-web/files/app.db b/roles/calibre-web/files/app.db
index 31a8b716a1427cd61610ed5f5c68253fe452aea8..01c0f038338a22ada9d7caaceb4b65880e84d183 100644
GIT binary patch
delta 3325
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
Yd#TxazjQ=u=Sd*&Limu+)pB6rzoLm6iU0rr

delta 748
zcmZ8f&ubG=5Z>8My4$szx1o)Tjlpf9Hj!4-ScR5KyNOF18aHihJ@isH?W07KP05dn
z6`^Ymy@(h*>|dY<1tBdo7e(n^#e;_)gj_sGa}Ww8P*C5lqz4BE-uJ!ln_-68YOq@k
z_jAA3Pf?UavK?Y|=xVp0x;%N{CKR9(`@@G$c0qiKJUya7AdQwNWTK^-siCm}8c|Y!
z76dQd-6@cmF5_a!$WP&%p2<Q#HrD^>+3aHwDM_HsxZq{}>8$Dp$nAXum)rs9m_o;-
zMHA5+?6#78<5G(f=?zMFhrXa!!o9AIGe7vByoY<we(I>Z-?)yL*UTCb{6ej&d6%v*
zRWt2Et&Z<C^9j_|Q7Ce}`H*ELNrK9}wLbwhYkUkQ>)&p`0fZ`Rz)C(JY>$-mbQYJ3
zxL_w8OR36&DlaI}geu#N^>qv+Yv&OBQJL>FGAs8DJ%{BxN-8#^q=MH+LqmjjW<4cG
zB4LLu<g-}5eM?Cs;@W~Ov-%Y1vBV~v3lo&hujoY3E){V+#mp*B>xJcw41ORJn>wwg
z9P3;Y&W{pTPA`=UczGpnl(12fqse4KRWw_&ij53jT`uWs#dcB0xzz+8V|U-a2^Xwd
z69O7Ri&}hsQI&)3k(};r(wWC$Vl!%NRu2BxHLl6Q@Q^$b3h|*q#+p5ZJ}zRf%QZ;b
z=;8oF?u4^%$37Sr(@S|ag^8}W<Z&8ovS$9K`4`?ERtf~*Wx4)n3Zk5qj=<UaXAL4y
zKMF&N*_#8m==N-q5;b$((_3L6N(}=y+&6uV+}#xbjx&+KfnfFLV9-Tz0%zrOutRn|
HZosp@Y-_?J

diff --git a/roles/calibre-web/tasks/enable-or-disable.yml b/roles/calibre-web/tasks/enable-or-disable.yml
index b196176f9..c15fda0da 100644
--- a/roles/calibre-web/tasks/enable-or-disable.yml
+++ b/roles/calibre-web/tasks/enable-or-disable.yml
@@ -23,12 +23,28 @@
     dest: "{{ nginx_conf_dir }}/calibre-web-nginx.conf"    # /etc/nginx/conf.d
   when: calibreweb_enabled
 
+- name: If enabling with Calibre-Web enhanced for large audio/video "books" too, also append onto calibre-web-nginx.conf AND symlink /library/www/html/calibre-web -> /library/calibre-web (WIP)
+  shell: |
+    if [ -f {{ calibreweb_venv_path }}/scripts/calibre-web-nginx.conf ]; then
+        cat {{ calibreweb_venv_path }}/scripts/calibre-web-nginx.conf >> {{ nginx_conf_dir }}/calibre-web-nginx.conf
+        ln -sf {{ calibreweb_home }} {{ doc_root }}/calibre-web
+    fi
+  when: calibreweb_enabled
+
+
 - name: Disable http://box{{ calibreweb_url1 }} via NGINX, by removing {{ nginx_conf_dir }}/calibre-web-nginx.conf
   file:
-    path: "{{ nginx_conf_dir }}/calibre-web-nginx.conf"    # /etc/nginx/conf.d
+    path: "{{ nginx_conf_dir }}/calibre-web-nginx.conf"
     state: absent
   when: not calibreweb_enabled
 
+- name: If disabling, also remove symlink /library/www/html/calibre-web (WIP)
+  file:
+    path: "{{ doc_root }}/calibre-web"    # /library/www/html
+    state: absent
+  when: not calibreweb_enabled
+
+
 - name: Restart 'nginx' systemd service
   systemd:
     name: nginx
diff --git a/roles/calibre-web/tasks/install.yml b/roles/calibre-web/tasks/install.yml
index 7f778a38f..7f6644980 100644
--- a/roles/calibre-web/tasks/install.yml
+++ b/roles/calibre-web/tasks/install.yml
@@ -3,10 +3,9 @@
   register: df1
 
 
-- name: "Install packages: ffmpeg, imagemagick, python3-netifaces"
+- name: "Install packages: imagemagick, python3-netifaces"
   package:
     name:
-      - ffmpeg    # 2023-07-15: @deldesir requests this, so usability can be improved!
       - imagemagick
       - python3-netifaces
     state: present
@@ -57,7 +56,17 @@
     dest: "{{ calibreweb_venv_path }}"
     force: yes
     #depth: 1    # 2023-11-04: Full clone for now, to help @deldesir & wider community testing
-    version: "{{ calibreweb_version }}"    # e.g. master, 0.6.20
+    version: "{{ calibreweb_version }}"    # e.g. master, 0.6.21
+
+- name: If Calibre-Web is being enhanced with audio/video "books" too, install additional prereqs (CAN TAKE 3+ MINUTES, WIP)
+  shell: |
+    if [ -f {{ calibreweb_venv_path }}/scripts/lb-wrapper ]; then
+        apt install ffmpeg pipx -y
+        pipx install xklb
+        ln -s /root/.local/bin/lb /usr/local/bin/lb
+        cp {{ calibreweb_venv_path }}/scripts/lb-wrapper /usr/local/bin/lb-wrapper
+        chmod a+x /usr/local/bin/lb-wrapper
+    fi
 
 - name: Download Calibre-Web dependencies from 'requirements.txt' into python3 virtual environment {{ calibreweb_venv_path }}
   pip: