Skip to content

Use settings object instead of dict in acquire_settings function #40

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
lkeitadk wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Use settings object instead of dict in acquire_settings function #40

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
aced731
Fist Try on Understanding the Python Code
lkeitadk Jan 16, 2019
7963c4a
Changed acquire_Settings so that it uses a setting object
lkeitadk Jan 23, 2019
24e6498
Fixed synthax errors on acquire_settings
lkeitadk Jan 23, 2019
14a9b0b
Added missing settings class constructor parameter
lkeitadk Jan 24, 2019
61ce1b3
Debugging messages, prune this commit later
lkeitadk Jan 24, 2019
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
73 changes: 42 additions & 31 deletions beta_process.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,13 @@
from .get_setting import get_setting
from .initialize_pretext_vagrant import VagrantException

def to_vagrant(st):
#I am not sure I understand the use of the functions "to_vagrant" and "from vagrant". My guess was that they return a string
#that seems to be the path of the vagrant directory?

def to_vagrant(st):
vagrantroot = get_setting('vagrantroot', r"C:\\PreTeXt\\")
# I looked at the get_setting module, but I don't understand how line 13 gets executed. A better way to say it is that
# I don't really understand how the get-setting function works and what it does.
result = re.sub(vagrantroot, '/vagrant/', st, flags=re.IGNORECASE)
result = re.sub(r'\\', '/', result)
return result
Expand All @@ -16,7 +21,7 @@ def from_vagrant(st):
vagrantroot = get_setting('vagrantroot', r"C:\\PreTeXt\\")
return re.sub('/vagrant/', vagrantroot, st, flags=re.IGNORECASE)


#Is this the equivalent of a hashtable?
def retrieve(key, val, ddict, id='name'):
"""
Given a dict of dicts, return the value of id for the dict whose
Expand All @@ -30,13 +35,14 @@ def retrieve(key, val, ddict, id='name'):
except StopIteration:
return None

#
def get_pretext_project_setting(setting, default, proj_name):
"""Given a setting (string), returns the value associated to that
key in the dictionary for proj_name."""

projects = get_setting('pretext_projects')
if proj_name not in projects.keys():
sublime.message_dialog("Error 32: invalid project")
sublime.message_dialog("Error 32: invalid project {}".format(proj_name))
raise VagrantException
if setting in projects[proj_name].keys():
return projects[proj_name][setting]
Expand Down Expand Up @@ -65,10 +71,14 @@ def get_pretext_project(vu):
sublime.message_dialog("Error 30: couldn't find project")
raise VagrantException
fn = os.path.dirname(fn)
match = retrieve('path', fn, projects)
match = retrieve('path', fn, projects) # name of project is retained
if match:
# print("Found {}".format(match))
return match

sublime.message_dialog("Error 102: Something bad happened")
raise VagrantException

class BetaCommand(sublime_plugin.WindowCommand):
# def _verbose(msg):
# """Write a message to the console on program progress"""
Expand Down Expand Up @@ -103,66 +113,67 @@ def doit(self, cmd, fmt):

def acquire_settings(vu):

sett = {}
settings = sublime.Settings(vu.id()) #Cpnstruction of a settings object

settings.set('project_name',get_pretext_project(vu))

sett['project_name'] = get_pretext_project(vu)

sett['pretext_stylesheets'] = get_pretext_project_setting(
settings.set('pretext_stylesheets',get_pretext_project_setting(
'pretext_stylesheets', {
"html": to_vagrant(vagrantroot
+ "mathbook/xsl/mathbook-html.xsl"),
"latex": to_vagrant(vagrantroot
+ "mathbook/xsl/mathbook-latex.xsl"),
# "epub": to_vagrant(vagrantroot + "mathbook/xsl/mathbook-epub.xsl"),
}, sett['project_name'])
}, settings.get('project_name')))

# if not pretext_stylesheets:
# # print("Cannot find PreTeXt stylesheets, check settings :(")
# sublime.message_dialog("Error 44: Can't find PreTeXt stylesheets")
# raise VagrantException

# xinclude = get_setting('xinclude', True)
sett['xinclude'] = get_pretext_project_setting('xinclude', True,
sett['project_name'])

settings.set('xinclude',get_pretext_project_setting('xinclude', True,
settings.get('project_name')))
# stringparam = get_setting('stringparam', {})
sett['stringparam'] = get_pretext_project_setting('stringparam', {},
sett['project_name'])
sett['root_file'] = get_pretext_project_setting('root_file', "",
sett['project_name'])
settings.set('stringparam',get_pretext_project_setting('stringparam', {},
settings.get('project_name')))
settings.set('stringparam',get_pretext_project_setting('root_file', "",
settings.get('project_name')))
# TODO: some attempt at intelligent root file detection assuming
# sensible structure
if not sett['root_file']:
if settings.get('root_file') is None:
sublime.message_dialog("Error 24: Couldn't find project "
"root file")
raise VagrantException
sett['path'] = get_pretext_project_setting('path', "", sett['project_name'])
settings.set('path', get_pretext_project_setting('path', "", settings.get('project_name')))
# if not path:
# sublime.message_dialog("Error 34: Couldn't find project path")
# raise VagrantException

# Note: trailing slash is added later, no need for it here
sett['pretext_output'] = get_pretext_project_setting('pretext_output',
os.path.join(sett['path'], 'output'), sett['project_name'])
if not sett['pretext_output']:
settings.set('pretext_output',get_pretext_project_setting('pretext_output',
os.path.join(settings.get('path'), 'output'), settings.get('project_name')))
if settings.get(pretext_output) is None:
sublime.message_dialog("Error 36: something bad happened")
raise VagrantException
# pretext_output_list = filepath.split('/')[:-1]
# pretext_output_list.append("output")
# if cmd == "xsltproc":
# pretext_output_list.append(fmt)
# pretext_output = '/'.join(pretext_output_list)
sett['pretext_output_html'] = get_pretext_project_setting('pretext_output_html',
os.path.join(sett['pretext_output'], 'html'), sett['project_name'])
sett['pretext_output_latex'] = get_pretext_project_setting('pretext_output_latex',
os.path.join(sett['pretext_output'], 'latex'), sett['project_name'])
settings.set('pretext_output_html',get_pretext_project_setting('pretext_output_html',
os.path.join(settings.get('pretext_output', 'html'), settings.get('project_name'))))
settings.set('pretext_output_latex',get_pretext_project_setting('pretext_output_latex',
os.path.join(settings.get('pretext_output', 'latex'), settings.get('project_name'))))
# pretext_output_epub = get_pretext_project_setting('pretext_output_epub',
# os.path.join(pretext_output, 'epub'), project_name)
sett['pretext_images'] = get_pretext_project_setting('pretext_images',
os.path.join(sett['pretext_output'], 'images'), sett['project_name'])
sett['pretext_html_images'] = get_pretext_project_setting('pretext_html_images',
os.path.join(sett['pretext_output_html'], 'images'), sett['project_name'])
sett['pretext_latex_images'] = get_pretext_project_setting('pretext_latex_images',
os.path.join(sett['pretext_output_latex'], 'images'), sett['project_name'])
settings.set('pretext_images',get_pretext_project_setting('pretext_images',
os.path.join(settings.get('pretext_output', 'images'), settings.get('project_name'))))
settings.set('pretext_html_images',get_pretext_project_setting('pretext_html_images',
os.path.join(settings.get('pretext_output', 'images'), settings.get('project_name'))))
settings.set('pretext_latex_images',get_pretext_project_setting('pretext_latex_images',
os.path.join(settings.get('pretext_output', 'images'), settings.get('project_name'))))
# pretext_epub_images = get_pretext_project_setting('pretext_epub_images',
# os.path.join(pretext_output_epub, 'images'), project_name)
# if not pretext_images:
Expand All @@ -183,7 +194,7 @@ def acquire_settings(vu):
# print("Need to set PreTeXt root file :(")
# raise VagrantException

return sett
return settings

if cmd == "update_pretext":
#### FUNCTION EXITS FROM THIS BLOCK
Expand Down