Jonathan/calibre-web
1
0
Fork 0
mirror of https://github.com/JonathanHerrewijnen/calibre-web.git synced 2024-11-11 05:33:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/Develop' into Develop

Browse Source 
# Conflicts:
#	cps/updater.py
This commit is contained in:
Ozzieisaacs 2020-02-23 08:58:47 +01:00
commit 134a10f56c
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cps/static/js/reading/epub.js
View File

@ -42,5 +42,4 @@ var reader;
alert(error); alert(error);
}); });
} }
// reader.book.package.metadata.direction= "rtl"; wait for reader reader before changing reading direction
})(); })();

2
cps/updater.py
View File

@ -198,7 +198,7 @@ class Updater(threading.Thread):
) )
additional_path = self.is_venv() additional_path = self.is_venv()
if additional_path: if additional_path:
exclude = exclude + (additional_path) exclude = exclude + (additional_path,)
for root, dirs, files in os.walk(destination, topdown=True): for root, dirs, files in os.walk(destination, topdown=True):
for name in files: for name in files:
old_list.append(os.path.join(root, name).replace(destination, '')) old_list.append(os.path.join(root, name).replace(destination, ''))