Skip to content

Fix crashes when config file is missing general/keymap sections #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Enrico68 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix crashes when config file is missing general/keymap sections #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions wikicurses/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@

def executeCommand(cmd):
try:
subprocess.call(cmd)
ret = subprocess.call(cmd)
if ret != 0:
ex.notify("Error: command '" + cmd[0] + "' exited with code " + str(ret))
except FileNotFoundError:
ex.notify("Error: command '" + cmd[0] + "' not found.")
loop.screen.clear() # Completely redraw screen after external command
Expand Down Expand Up @@ -259,7 +261,7 @@ def keypress(self, size, key):
maxcol, maxrow = size
ex.notify('') # Clear any notification

cmdmap = settings.conf['keymap']
cmdmap = settings.conf['keymap'] if 'keymap' in settings.conf else {}
if key == ':':
ex.enterexmode()
if key == '/':
Expand Down Expand Up @@ -443,7 +445,7 @@ def openWiki(name):
wiki = name
return
if not name:
name = settings.conf['general']['default']
name = settings.conf.get('general', 'default', fallback='https://en.wikipedia.org/w/api.php')
if name in settings.conf:
wiki = Wiki.fromName(name)
else:
Expand Down Expand Up @@ -516,7 +518,11 @@ def processCmd(cmd, *args):
elif cmd == 'edit':
edit(page.title)
elif cmd == 'help':
executeCommand(['man', 'wikicurses'])
manpage = os.path.dirname(os.path.abspath(__file__)) + '/../wikicurses.1'
if os.path.exists(manpage):
executeCommand(['man', manpage])
else:
executeCommand(['man', 'wikicurses'])
elif cmd == 'back':
if current > 0:
current -= 1
Expand Down