Merge pull request #111 from jmarmstrong1207/cwa-notify-wait-delete

delete cwa-ingest-service & rename library_refresh to library_ingest

.dockerignore

@@ -6,4 +6,5 @@ docker-compose.yml
 README.md
 LICENSE
 Dockerfile
-.dockerignore
+.dockerignore
+build

build.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-docker build --tag cwa-dev .
+docker build --tag crocodilestick/calibre-web-automated:dev --build-arg="BUILD_DATE=$(date '+%Y/%m/%d')" --build-arg="VERSION=2.1.0-dev" .
 mkdir -p build
 cp -n docker-compose.yml.dev build/docker-compose.yml
 cd build/

root/app/calibre-web/cps/cwa_functions.py

@@ -14,7 +14,7 @@
 from cwa_db import CWA_DB
 
 switch_theme = Blueprint('switch_theme', __name__)
-library_refresh = Blueprint('library_refresh', __name__)
+library_ingest = Blueprint('library_ingest', __name__)
 convert_library = Blueprint('convert_library', __name__)
 cwa_history = Blueprint('cwa_history', __name__)
 cwa_check_status = Blueprint('cwa_check_status', __name__)
@@ -49,9 +49,9 @@ def cwa_switch_theme():
     return redirect("/", code=302)
 
 
-@library_refresh.route("/cwa-library-refresh", methods=["GET", "POST"])
+@library_ingest.route("/cwa-library-ingest", methods=["GET", "POST"])
 @login_required_if_no_ano
-def cwa_library_refresh():
+def cwa_library_ingest():
     flash(_("Library Refresh: Initialising Book Ingest System, please wait..."), category="cwa_refresh")
     result = subprocess.run(['python3', '/app/calibre-web-automated/scripts/ingest-processor.py', '/cwa-book-ingest'])
     return_code = result.returncode

root/app/calibre-web/cps/main.py

@@ -30,7 +30,7 @@ def request_username():
 def main():
     app = create_app()
 
-    from .cwa_functions import switch_theme, library_refresh, convert_library, cwa_history, cwa_check_status, cwa_settings
+    from .cwa_functions import switch_theme, library_ingest, convert_library, cwa_history, cwa_check_status, cwa_settings
     from .web import web
     from .opds import opds
     from .admin import admi
@@ -64,7 +64,7 @@ def main():
 
     # CWA Blueprints
     app.register_blueprint(switch_theme)
-    app.register_blueprint(library_refresh)
+    app.register_blueprint(library_ingest)
     app.register_blueprint(convert_library)
     app.register_blueprint(cwa_history)
     app.register_blueprint(cwa_check_status)

root/app/calibre-web/cps/static/js/caliBlur.js

@@ -498,7 +498,7 @@ $("#cwa-switch-theme").attr({
 
 $("#refresh-library").attr({
     "data-toggle": "tooltip",
-    "title": $("#refresh-library").text(),              // "Refresh Library"
+    "title": $("#ingest-library").text(),              // "Refresh Library"
     "data-placement": "bottom",
     "data-viewport": "#main-nav"
 })

root/app/calibre-web/cps/templates/layout.html

@@ -101,7 +101,7 @@
               {% if current_user.role_admin() %}
                 <li><a id="top_admin" data-text="{{_('Settings')}}" href="{{url_for('admin.admin')}}"><span class="glyphicon glyphicon-dashboard"></span> <span class="hidden-sm">{{_('Admin')}}</span></a></li>
               {% endif %}
-              <li><a id="refresh-library" data-text="{{_('Refresh Library')}}" href="{{url_for('library_refresh.cwa_library_refresh')}}"><span class="glyphicon glyphicon-refresh"></span> <span class="hidden-sm">{{_('Refresh Library')}}</span></a></li>
+              <li><a id="ingest-library" data-text="{{_('Ingest Books')}}" href="{{url_for('library_ingest.cwa_library_ingest')}}"><span class="glyphicon glyphicon-refresh"></span> <span class="hidden-sm">{{_('Ingest Books')}}</span></a></li>
               {% if g.current_theme == 0 %}
               <li><a id="top_user" data-text="{{_('Account')}}" href="{{url_for('web.profile')}}"><span class="glyphicon glyphicon-user"></span> <span class="hidden-sm">{{current_user.name}}</span></a></li>
                 {% if not current_user.is_anonymous %}

scripts/check-cwa-services.sh

@@ -9,14 +9,6 @@ echo "====== Calibre-Web Automated -- Status of Monitoring Services ======"
 echo ""
 
 
-if s6-rc -a list | grep -q 'cwa-ingest-service'; then
-    echo -e "- cwa-ingest-service ${GREEN}is running${NC}"
-    is=true
-else
-    echo -e "- cwa-ingest-service ${RED}is not running${NC}"
-    is=false
-fi
-
 if s6-rc -a list | grep -q 'metadata-change-detector'; then
     echo -e "- metadata-change-detector ${GREEN}is running${NC}"
     mc=true
@@ -27,7 +19,7 @@ fi
 
 echo ""
 
-if $is && $mc; then
+if $mc; then
     echo -e "Calibre-Web-Automated was ${GREEN}successfully installed ${NC}and ${GREEN}is running properly!${NC}"
     exit 0
 else

scripts/setup-cwa.sh

@@ -15,7 +15,6 @@ make_dirs () {
 # Change ownership & permissions as required
 change_script_permissions () {
     chmod +x /app/calibre-web-automated/scripts/check-cwa-services.sh
-    chmod +x /etc/s6-overlay/s6-rc.d/cwa-ingest-service/run
     chmod +x /etc/s6-overlay/s6-rc.d/cwa-init-remove-locks/run
     chmod +x /etc/s6-overlay/s6-rc.d/metadata-change-detector/run
     chmod +x /etc/s6-overlay/s6-rc.d/cwa-set-perms/run