NunoSempere/calibre-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfix Updater

Browse Source
This commit is contained in:
OzzieIsaacs 2017-01-31 19:29:47 +01:00
parent 296d2615fe
commit c45968a1ed
3 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@ -1 +1 @@
* ident web.py ident export-subst

33
cps/helper.py
View File

@ -292,32 +292,40 @@ def reduce_files(remove_items, exclude_items):
def moveallfiles(root_src_dir, root_dst_dir): def moveallfiles(root_src_dir, root_dst_dir):
change_permissions = True change_permissions = True
if sys.platform == "win32" or sys.platform == "darwin": if sys.platform == "win32" or sys.platform == "darwin":
change_permissions=False change_permissions=False
else: else:
app.logger.debug('OS-System : '+sys.platform ) app.logger.debug('Update on OS-System : '+sys.platform )
new_permissions=os.stat(root_dst_dir) #print('OS-System: '+sys.platform )
new_permissions=os.stat(root_dst_dir)
#print new_permissions
for src_dir, dirs, files in os.walk(root_src_dir): for src_dir, dirs, files in os.walk(root_src_dir):
dst_dir = src_dir.replace(root_src_dir, root_dst_dir, 1) dst_dir = src_dir.replace(root_src_dir, root_dst_dir, 1)
if not os.path.exists(dst_dir): if not os.path.exists(dst_dir):
os.makedirs(dst_dir) os.makedirs(dst_dir)
#print('Create-Dir: '+dst_dir)
if change_permissions: if change_permissions:
os.chown(dst_dir,new_permissions.ST_UID,new_permissions.ST_GID) #print('Permissions: User '+str(new_permissions.st_uid)+' Group '+str(new_permissions.st_uid))
os.chown(dst_dir,new_permissions.st_uid,new_permissions.st_gid)
for file_ in files: for file_ in files:
src_file = os.path.join(src_dir, file_) src_file = os.path.join(src_dir, file_)
dst_file = os.path.join(dst_dir, file_) dst_file = os.path.join(dst_dir, file_)
if os.path.exists(dst_file): if os.path.exists(dst_file):
if change_permissions: if change_permissions:
permission=os.stat(dst_file) permission=os.stat(dst_file)
#print('Remove file before copy: '+dst_file)
os.remove(dst_file) os.remove(dst_file)
else: else:
if change_permissions: if change_permissions:
permission=new_permissions permission=new_permissions
shutil.move(src_file, dst_dir) shutil.move(src_file, dst_dir)
#print('Move File '+src_file+' to '+dst_dir)
if change_permissions: if change_permissions:
try: try:
os.chown(dst_file, permission.ST_UID, permission.ST_GID) os.chown(dst_file, permission.st_uid, permission.st_uid)
#print('Permissions: User '+str(new_permissions.st_uid)+' Group '+str(new_permissions.st_uid))
except: except:
pass e = sys.exc_info()
#print('Fail '+str(dst_file)+' error: '+str(e))
return return
@ -339,26 +347,25 @@ def update_source(source,destination):
new_list.append(os.path.join(root, name).replace(source, '')) new_list.append(os.path.join(root, name).replace(source, ''))
delete_files = one_minus_two(old_list, new_list) delete_files = one_minus_two(old_list, new_list)
print('raw delete list', delete_files) #print('raw delete list', delete_files)
rf= reduce_files(delete_files, exclude) rf= reduce_files(delete_files, exclude)
print('reduced delete list', rf) #print('reduced delete list', rf)
remove_items = reduce_dirs(rf, new_list) remove_items = reduce_dirs(rf, new_list)
print('delete files', remove_items) #print('delete files', remove_items)
moveallfiles(source, destination) moveallfiles(source, destination)
for item in remove_items: for item in remove_items:
item_path = os.path.join(destination, item[1:]) item_path = os.path.join(destination, item[1:])
if os.path.isdir(item_path): if os.path.isdir(item_path):
# app.logger.info("Delete dir "+ item_path)
print("Delete dir "+ item_path) print("Delete dir "+ item_path)
#shutil.rmtree(item_path) shutil.rmtree(item_path)
else: else:
try: try:
print("Delete file "+ item_path) print("Delete file "+ item_path)
#os.remove(item_path) os.remove(item_path)
except: except:
print("Could not remove:"+item_path) print("Could not remove:"+item_path)
shutil.rmtree(source, ignore_errors=True) #shutil.rmtree(source, ignore_errors=True)

4
cps/web.py
View File

@ -713,9 +713,9 @@ def get_update_status():
status = {} status = {}
if request.method == "GET": if request.method == "GET":
# should be automatically replaced by git with current commit hash # should be automatically replaced by git with current commit hash
commit_id = '$Id$' commit_id = '$Format:%H$'
commit = requests.get('https://api.github.com/repos/janeczku/calibre-web/git/refs/heads/master').json() commit = requests.get('https://api.github.com/repos/janeczku/calibre-web/git/refs/heads/master').json()
if "object" in commit and commit['object']['sha'] != commit_id[5:-2]: if "object" in commit and commit['object']['sha'] != commit_id:
status['status'] = True status['status'] = True
else: else:
status['status'] = False status['status'] = False