From c657581e69a08fb78aab04aed0c43fa691a7be56 Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Sat, 15 Jul 2023 14:50:53 -0400
Subject: [PATCH] calibre-web/tasks/install.yml: Update + clean comments!

---
 roles/calibre-web/tasks/install.yml | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/roles/calibre-web/tasks/install.yml b/roles/calibre-web/tasks/install.yml
index 36f1ae5e6..1c0a9505f 100644
--- a/roles/calibre-web/tasks/install.yml
+++ b/roles/calibre-web/tasks/install.yml
@@ -19,6 +19,7 @@
 #      - gcc         # compiler
 #    state: present
 #  when: python_version is version('3.10', '>=')
+
 - name: Allow ImageMagick to read PDFs, per /etc/ImageMagick-6/policy.xml, to create book cover thumbnails
   lineinfile:
     path: /etc/ImageMagick-6/policy.xml
@@ -43,7 +44,13 @@
     - "{{ calibreweb_config }}"       # /library/calibre-web/config
     - "{{ calibreweb_venv_path }}"    # /usr/local/calibre-web-py3
 
-## TODO: Calibre-web future release might get into pypi https://github.com/janeczku/calibre-web/issues/456
+# FYI since May 2021, Calibre-Web (major releases) can be installed with pip:
+# https://pypi.org/project/calibreweb/
+# https://github.com/janeczku/calibre-web/issues/456
+# https://github.com/janeczku/calibre-web/issues/677
+# https://github.com/janeczku/calibre-web/pull/927
+# https://github.com/janeczku/calibre-web/pull/1459
+
 - name: Clone i.e. download Calibre-Web ({{ calibreweb_version }}) from {{ calibreweb_repo_url }} to {{ calibreweb_venv_path }} (~94 MB initially, ~115+ MB later)
   git:
     repo: "{{ calibreweb_repo_url }}"    # e.g. https://github.com/janeczku/calibre-web
@@ -52,15 +59,6 @@
     depth: 1
     version: "{{ calibreweb_version }}"    # e.g. master, 0.6.20
 
-## Ansible Pip Bug: Cannot use 'chdir' with 'env' https://github.com/ansible/ansible/issues/37912 (Patch landed)
-#- name: Download calibre-web dependencies into vendor subdirectory.
-#  pip:
-#    requirements: "{{ calibreweb_path }}/requirements.txt"
-#    chdir: "{{ calibreweb_path }}"
-#    extra_args: '--target vendor'
-#  ignore_errors: True
-##
-# Implementing this with Ansible command module for now.
 - name: Download Calibre-Web dependencies from 'requirements.txt' into python3 virtual environment {{ calibreweb_venv_path }}
   pip:
     requirements: "{{ calibreweb_venv_path }}/requirements.txt"