Version 0.6.7

README.md

@@ -15,8 +15,7 @@ Calibre-Web is a web app providing a clean interface for browsing, reading and d
 
 Alternatively, you may use [COPS](https://github.com/YunoHost-Apps/cops_ynh) which also allows access to your Calibre Library, but in read-only mode. 
 
-**Shipped version:** The shipped version is 0.6.7Beta (On going developement), but as the numbering changed in the calibre-web app, it is numbered as 0.96.7 in yunohost.
-0.6.7Beta bring an integrated LDAP support. Once final 0.6.7 release will be published, update will be done only to stable version (0.6.7, 0.6.8...)
+**Shipped version:** The shipped version is 0.6.7, but as the numbering changed in the calibre-web app, it is numbered as 0.96.7 in yunohost.
 
 Users will be synchronized with authorized Yunohost users (having the calibreweb.main authorization group) automatically. In case of issue you may force the sync in the app itself.
 
@@ -96,6 +95,7 @@ sudo yunohost app upgrade calibreweb -u https://github.com/Yunohost-Apps/calibre
 - [ ] Add action to restart the server
 - [ ] Add action to synchronize users
 - [ ] Add action to deactivate LDAP et retrieve admin password
+- [ ] Use internal updater to update version?
 
 
 

conf/app.src

@@ -1,3 +1,3 @@
-SOURCE_URL=https://github.com/janeczku/calibre-web/archive/0297823bda98de2dcfecf7fb5d3a612938f88ea3.zip
-SOURCE_SUM=776fbee7906217f70ea1f84e0ce467a2a793750b4890f460add96e22e1bc253e
+SOURCE_URL=https://github.com/janeczku/calibre-web/releases/download/0.6.7/calibre-web-0.6.7.zip
+SOURCE_SUM=0c803df4b49993987a7f317c47ba38e680e45712b49da3cb7eb6c66f57379f30
 SOURCE_FORMAT=zip

manifest.json

@@ -6,7 +6,7 @@
         "en": "Browsing, reading and downloading eBooks using a Calibre database",
         "fr": "Explorer, lire et télécharger des eBooks à partir d'une base de données Calibre"
     },
-    "version": "0.96.7beta~ynh4",
+    "version": "0.96.7~ynh5",
     "url": "https://github.com/janeczku/calibre-web",
     "license": "free",
     "maintainer": {

sources/patches/app-optional-requirements.patch

@@ -1,5 +1,5 @@
---- a/optional-requirements.txt	2020-04-28 15:33:25.000000000 +0200
-+++ b/optional-requirements.txt	2020-05-03 13:59:23.067375502 +0200
+--- a/optional-requirements.txt	2020-05-05 20:28:10.000000000 +0200
++++ b/optional-requirements.txt	2020-05-07 08:46:24.333467411 +0200
 @@ -1,17 +1,3 @@
 -# GDrive Integration
 -google-api-python-client==1.7.11,<1.8.0
@@ -18,7 +18,7 @@
  # goodreads
  goodreads>=0.3.2,<0.4.0
  python-Levenshtein>=0.12.0,<0.13.0
-@@ -20,19 +6,11 @@
+@@ -20,10 +6,6 @@
  python-ldap>=3.0.0,<3.3.0
  Flask-SimpleLDAP>=1.4.0,<1.5.0
  
@@ -29,12 +29,3 @@
  # extracting metadata
  lxml>=3.8.0,<4.6.0
  Pillow>=4.0.0,<7.2.0
- rarfile>=2.7
- 
--# other
--natsort>=2.2.0,<7.1.0
--git+https://github.com/OzzieIsaacs/comicapi.git@ad8bfe5a1c31db882480433f86db2c5c57634a3f#egg=comicapi
--
- #Kobo integration
- jsonschema>=3.2.0,<3.3.0
- 

sources/patches/app-web.py.patch

@@ -1,47 +1,46 @@
---- a/cps/web.py	2020-04-28 15:33:25.000000000 +0200
-+++ b/cps/web.py	2020-05-03 14:12:19.028083695 +0200
-@@ -281,7 +281,10 @@
+--- a/cps/web.py	2020-05-05 20:28:10.000000000 +0200
++++ b/cps/web.py	2020-05-07 08:52:47.151920968 +0200
+@@ -294,7 +294,10 @@
      if not config.db_configured and request.endpoint not in (
          'admin.basic_configuration', 'login') and '/static/' not in request.path:
          return redirect(url_for('admin.basic_configuration'))
 -
-+#Début Modif Yunohost 1/4
++#Début Modif Yunohost 1/4 - Create LDAP user at login
 +    if config.config_login_type == constants.LOGIN_LDAP and services.ldap:
 +        import_ldap_users()
 +#Fin Modif Yunohost 1/4
  
  @app.route('/import_ldap_users')
  def import_ldap_users():
-@@ -313,7 +316,10 @@
+@@ -326,7 +329,10 @@
                  log.warning("Could Not Parse LDAP User: %s", user)
                  continue
          if ub.session.query(ub.User).filter(ub.User.nickname == user.lower()).first():
 -            log.warning("LDAP User: %s Already in Database", user)
-+# Début Modif Yunohost 2/4
++# Début Modif Yunohost 2/4 - deactivate warning for existing LDAP user (clog the log)
 +#            log.warning("LDAP User: %s Already in Database", user)
 +            log.debug("LDAP User: %s Already in Database", user)
 +#Fin Modif Yunohost 2/4
              continue
          user_data = services.ldap.get_object_details(user=user,
                                                       group=None,
-@@ -1217,6 +1223,10 @@
+@@ -1274,6 +1280,10 @@
      if not config.db_configured:
          log.debug(u"Redirect to initial configuration")
          return redirect(url_for('admin.basic_configuration'))
-+#Début Modif Yunohost 3/4
++#Début Modif Yunohost 3/4 - Create LDAP user at Login
 +    if config.config_login_type == constants.LOGIN_LDAP and services.ldap:
 +        import_ldap_users()
 +#Fin Modif Yunohost 3/4
      if current_user is not None and current_user.is_authenticated:
          return redirect(url_for('web.index'))
      if config.config_login_type == constants.LOGIN_LDAP and not services.ldap:
-@@ -1291,8 +1301,13 @@
+@@ -1348,7 +1358,13 @@
          if feature_support['oauth'] and (config.config_login_type == 2 or config.config_login_type == 3):
              logout_oauth_user()
      log.debug(u"User logged out")
 -    return redirect(url_for('web.login'))
--
-+#Début Modif Yunohost 4/4
++#Début Modif Yunohost 4/4 - Redirect to Yunohost at exit
 +#    return redirect(url_for('web.login'))
 +    if config.config_login_type == constants.LOGIN_LDAP and services.ldap:
 +        return redirect(request.host_url)
@@ -49,5 +48,5 @@
 +        return redirect(url_for('web.login'))
 +#Fin Modif Yunohost 4/4
  
+ 
  @web.route('/remote/login')
- @remote_login_required