jeena/hass-configurator
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Fixed error messages

Browse source
This commit is contained in:
Daniel Perna 2017-02-17 01:25:10 +01:00 • committed by GitHub
parent 16a850548b
commit a097f2f4cf
1 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

26
configurator.py
View file

@ -1963,14 +1963,13 @@ def get_dircontent(path, repo=None):
] ]
staged = {} staged = {}
unstaged = {} unstaged = {}
if repo: try:
try: for element in repo.index.diff("HEAD"):
for element in repo.index.diff("HEAD"): staged["%s%s%s" % (repo.working_dir, os.sep, "%s"%os.sep.join(element.b_path.split('/')))] = element.change_type
staged["%s%s%s" % (repo.working_dir, os.sep, "%s"%os.sep.join(element.b_path.split('/')))] = element.change_type except Exception as err:
except Exception as err: print("Exception: %s" % str(err))
print(err) for element in repo.index.diff(None):
for element in repo.index.diff(None): unstaged["%s%s%s" % (repo.working_dir, os.sep, "%s"%os.sep.join(element.b_path.split('/')))] = element.change_type
unstaged["%s%s%s" % (repo.working_dir, os.sep, "%s"%os.sep.join(element.b_path.split('/')))] = element.change_type
else: else:
untracked = [] untracked = []
staged = {} staged = {}
@ -2001,7 +2000,6 @@ def get_dircontent(path, repo=None):
edata['gitstatus'] = 'staged' edata['gitstatus'] = 'staged'
edata['changetype'] = staged.get(edata['name'], None) edata['changetype'] = staged.get(edata['name'], None)
dircontent.append(edata) dircontent.append(edata)
return dircontent return dircontent
def get_html(): def get_html():
@ -2103,7 +2101,7 @@ class RequestHandler(BaseHTTPRequestHandler):
for branch in repo.branches: for branch in repo.branches:
branches.append(branch.name) branches.append(branch.name)
except Exception as err: except Exception as err:
print(err) print("Exception (no repo): %s" % str(err))
dircontent = get_dircontent(dirpath.decode('utf-8'), repo) dircontent = get_dircontent(dirpath.decode('utf-8'), repo)
filedata = {'content': dircontent, filedata = {'content': dircontent,
'abspath': os.path.abspath(dirpath).decode('utf-8'), 'abspath': os.path.abspath(dirpath).decode('utf-8'),
@ -2349,9 +2347,9 @@ class RequestHandler(BaseHTTPRequestHandler):
if postvars['path'] and postvars['message']: if postvars['path'] and postvars['message']:
try: try:
commitpath = unquote(postvars['path'][0]) commitpath = unquote(postvars['path'][0])
response['path'] = commitpath
message = unquote(postvars['message'][0]) message = unquote(postvars['message'][0])
repo = REPO(commitpath, search_parent_directories=True) repo = REPO(commitpath, search_parent_directories=True)
response['path'] = commitpath
try: try:
repo.index.commit(message) repo.index.commit(message)
response['error'] = False response['error'] = False
@ -2362,13 +2360,13 @@ class RequestHandler(BaseHTTPRequestHandler):
self.wfile.write(bytes(json.dumps(response), "utf8")) self.wfile.write(bytes(json.dumps(response), "utf8"))
return return
except Exception as err: except Exception as err:
print(err)
response['error'] = True response['error'] = True
response['message'] = str(err) response['message'] = str(err)
print(response)
except Exception as err: except Exception as err:
response['message'] = "%s" % (str(err)) response['message'] = "Not a git repository" % (str(err))
print(err) print("Exception (no repo): %s" % str(err))
else: else:
response['message'] = "Missing path" response['message'] = "Missing path"
elif req.path == '/api/newfolder': elif req.path == '/api/newfolder':