YunoHost-Apps/calibreweb_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/calibreweb_ynh.git synced 2024-09-03 18:16:20 +02:00
Code Issues Activity Actions

Update patch

Browse source
This commit is contained in:
Krakinou 2019-01-30 22:27:04 +01:00
parent 1be8c6e4a6
commit 71749b4abe
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -66,8 +66,8 @@ sudo yunohost app upgrade calibreweb -u https://github.com/Yunohost-Apps/calibre
## Todo ## Todo
- [X] Multiinstance - [X] Multiinstance
- [ ] Better Multimedia integration : Integrate in Yunohost.multimedia - [X] Better Multimedia integration : Integrate in Yunohost.multimedia
- [ ] User and possibly LDAP integration - [X] User and possibly LDAP integration, http auth
- [X] Package_check integration - [X] Package_check integration
- [X] On backup/remove/upgrade : check for database location to update settings - [X] On backup/remove/upgrade : check for database location to update settings
- [ ] enable magic link - [ ] enable magic link

15
sources/patches/app-ub.patch
View file

@ -1,5 +1,5 @@
--- z/cps/ub.py 2019-01-16 17:50:51.000000000 +0100 --- a/cps/ub.py 2019-01-16 17:50:51.000000000 +0100
+++ b/cps/ub.py 2019-01-19 11:03:55.799293389 +0100 +++ b/cps/ub.py 2019-01-30 22:23:29.709075421 +0100
@@ -148,6 +148,16 @@ @@ -148,6 +148,16 @@
def __repr__(self): def __repr__(self):
return '<User %r>' % self.nickname return '<User %r>' % self.nickname
@ -61,9 +61,9 @@
try: try:
session.query(exists().where(Settings.config_columns_to_ignore)).scalar() session.query(exists().where(Settings.config_columns_to_ignore)).scalar()
except exc.OperationalError: except exc.OperationalError:
@@ -662,13 +682,22 @@ @@ -624,6 +644,16 @@
conn.execute("ALTER TABLE Settings ADD column `config_calibre` String DEFAULT ''") conn.execute("ALTER TABLE Settings ADD column `config_goodreads_api_key` String DEFAULT ''")
session.commit() conn.execute("ALTER TABLE Settings ADD column `config_goodreads_api_secret` String DEFAULT ''")
try: try:
+#Yunohost Integration - 4 +#Yunohost Integration - 4
+ session.query(exists().where(Settings.config_use_ldap)).scalar() + session.query(exists().where(Settings.config_use_ldap)).scalar()
@ -75,9 +75,10 @@
+ session.commit() + session.commit()
+ try: + try:
+#END Yunohost Integration - 4 +#END Yunohost Integration - 4
session.query(exists().where(Settings.config_theme)).scalar() session.query(exists().where(Settings.config_mature_content_tags)).scalar()
except exc.OperationalError: # Database is not compatible, some rows are missing except exc.OperationalError:
conn = engine.connect() conn = engine.connect()
@@ -668,7 +698,6 @@
conn.execute("ALTER TABLE Settings ADD column `config_theme` INTEGER DEFAULT 0") conn.execute("ALTER TABLE Settings ADD column `config_theme` INTEGER DEFAULT 0")
session.commit() session.commit()