From fcfe2a434fa49a9134bbe4ece8e3019fad00bce4 Mon Sep 17 00:00:00 2001 From: Malphaet Date: Thu, 16 Mar 2017 22:37:37 +0100 Subject: [PATCH] Progress made on the generator, still a lot to do to get a BARELY BEARABLE export --- generator/file_parser.py | 17 +++--- generator/model.py | 83 +++++++++++++++++++++-------- generator/model/dual_container.html | 64 ++++++++++++++++++++++ generator/model/dual_menu.html | 23 ++++++++ generator/model/dual_page.html | 14 +++++ generator/tree_parser.py | 12 ++--- site_base/bs-twopage/model.html | 16 +++--- sites/example_website/_config.txt | 2 + vkyweb.py | 2 +- 9 files changed, 188 insertions(+), 45 deletions(-) create mode 100644 generator/model/dual_container.html create mode 100644 generator/model/dual_menu.html create mode 100644 generator/model/dual_page.html diff --git a/generator/file_parser.py b/generator/file_parser.py index 526ae9a..58e8907 100644 --- a/generator/file_parser.py +++ b/generator/file_parser.py @@ -30,7 +30,7 @@ class WebPage(object): def get_reserved(self,var): "Get a reserved variable" - getattr(self,self.reserved_prefix+var) + return getattr(self,self.reserved_prefix+var) def add_content(self,text,lang): "Add a line of content, with the appropriates langues" @@ -69,15 +69,16 @@ class WebPage(object): def get_variable(self,varname,filter_lang="*"): "Get a variable, if * or nothing is used a filter the program will attempt to give a global variable, or will yield one at random" - if varname in self.reserved: - return getattr(self,varname) - if varname in self.variable: - if filter_lang in self.variable[varname]: - return self.variable[varname][filter_lang] + #print "Getting",varname,filter_lang,"in",self.variables + #if varname in self.reserved: + # return getattr(self,varname) + if varname in self.variables: + if filter_lang in self.variables[varname]: + return self.variables[varname][filter_lang] else: if filter_lang=="*": - return self.variable[varname].items()[0] - raise KeyError("The variable "+varname+" doens't exist in te language "+filter_lang) + return self.variables[varname].values()[0] + raise KeyError("The variable "+varname+" doens't exist in the language "+filter_lang) def export(self): "Export the Webobject in every language" diff --git a/generator/model.py b/generator/model.py index 4685a72..a4bbac2 100644 --- a/generator/model.py +++ b/generator/model.py @@ -1,52 +1,75 @@ # Copyleft (c) 2016 Cocobug All Rights Reserved. # coding=utf-8 from tree_parser import * +import re,traceback + + +re_vars=re.compile(".*\#_(?P.*)_\#|.*\#\#(?P
.*)\#\#") class HTMLPage(object): "Basic HTML object" - def __init__(self,name,variables={}): + def __init__(self,name,node): self.html="" self.name=name - self.variables=variables + self.node=node + self.path="" + def load(self,path): + self.path=path try: with open(path) as a: - self.html=a.read() + self.model=a.read() except: print "Error loading model" - def replace(self,lang,variables=None): - if variables==None: - variables=self.variables - for var,langs in variables.iteritems(): - self.html.replace("%_"+var+"_%",langs[lang]) + def replace(self,lang): + self.html="" + for line in self.model.splitlines(): + #print line + try: + + variable,section=re_vars.match(line).groups() + if variable!=None: + #print line,re_vars.match(line),variable + #print self.node.config_file + #print self.node.get_variable(variable,lang),variable + line=line.replace("#_"+variable+"_#",self.node.get_variable(variable,lang)) + #print line + elif section!=None: + pass + except AttributeError: + pass#print " > No match" + except: + print traceback.print_exc() + self.html+=line + self.html+=os.linesep + #print self.html def export(self): "Generate the HTML code and output it" return self.html -class Container(object): +class Container(HTMLPage): "Side menus and title, acess to all special pages" - def __init__(self,name,variables,menus): - HTMLPage.__init__(self,name,variables) - self.menus=menus + def __init__(self,name,node): + super(Container,self).__init__(name,node) - def generate(self): - self.html="" - -class Data(object): +class Data(HTMLPage): "Webpage itself" - def __init__(self): - HTMLPage.__init__(self) + def __init__(self,name,node): + super(Data,self).__init__(name,node) class DualContainer(Container): "Dual view" - pass + def __init__(self,name,node): + super(DualContainer,self).__init__(name,node) + class DualData(Data): "Dual view" pass + def DataType(ext): "Return some kind of general types depending on the extention" data={"image":[".jpg",".png",".svg",".tiff",".jpeg"], @@ -58,8 +81,24 @@ def DataType(ext): return typename return None -def makeContainer(tree): - +def makeContainer(node): + c=DualContainer(node.name,node) + #print node.variables + #print node.config_file + c.load("generator/model/dual_menu.html") + c.replace("fr") + return c + +def makeMakeContent(node): + c=DualData(node.name,node) + c.load("generator/model/dual_page.html") + c.replace("fr") + return c + +def makePage(node,cont,data): + c=DualData(node.name,node) + c.replace("fr") + cont.export() if __name__ == '__main__': - pass + makeContainer(makeWebsite("sites/example_website")) diff --git a/generator/model/dual_container.html b/generator/model/dual_container.html new file mode 100644 index 0000000..e78c094 --- /dev/null +++ b/generator/model/dual_container.html @@ -0,0 +1,64 @@ + + + + + + + + #_title_# + + + + + + + + + + + +
+ + + + +
+ ##PAGE## +
+ +
+ + + + + + + + + + + + diff --git a/generator/model/dual_menu.html b/generator/model/dual_menu.html new file mode 100644 index 0000000..2127989 --- /dev/null +++ b/generator/model/dual_menu.html @@ -0,0 +1,23 @@ +
  • + +
  • +
  • #_previous_#
  • +
  • + #_articles_# + +
  • #_preferences_#
  • +
  • #_about_#
  • diff --git a/generator/model/dual_page.html b/generator/model/dual_page.html new file mode 100644 index 0000000..720b0f8 --- /dev/null +++ b/generator/model/dual_page.html @@ -0,0 +1,14 @@ +
    +
    +
    +

    #_name_#

    + + #_content_# +
    +
    + +
    + + +
    + diff --git a/generator/tree_parser.py b/generator/tree_parser.py index e18f34d..d7ebb1a 100644 --- a/generator/tree_parser.py +++ b/generator/tree_parser.py @@ -25,7 +25,7 @@ class WebTree(object): def get_variable(self,varname,filter_lang="*"): "Get the corresponding variable" - self.config_file.get_variable(varname,filter_lang) + return self.config_file.get_variable(varname,filter_lang) def convert_local(self,files): pass @@ -56,9 +56,9 @@ class WebSubTree(WebTree): def get_variable(self,varname,filter_lang): "Get the variable, either in it's config or one of the above" try: - self.config_file.get_variable(varname,filter_lang) + return self.config_file.get_variable(varname,filter_lang) except: - self.parent_node.get_variable(varname,filter_lang) + return self.parent_node.get_variable(varname,filter_lang) def get_config(self): "Try to init a config, if not just use an empty variable set" @@ -131,12 +131,12 @@ class WebNode(WebSubTree): def get_variable(self,varname,filter_lang): "Get the corresponding variable, first in the Webnode, then the config and repeating up until the Root" try: - self.file.get_variable(varname,filter_lang) + return self.config_file.get_variable(varname,filter_lang) except: try: - self.config_file.get_variable(varname,filter_lang) + return self.config_file.get_variable(varname,filter_lang) except: - self.parent_node.get_variable(varname,filter_lang) + return self.parent_node.get_variable(varname,filter_lang) def open_node(self): "Open the file in the node, for now the parse is left linked, but later versions will ditch it asap" diff --git a/site_base/bs-twopage/model.html b/site_base/bs-twopage/model.html index e4ffea1..819b9ff 100644 --- a/site_base/bs-twopage/model.html +++ b/site_base/bs-twopage/model.html @@ -5,7 +5,7 @@ - %_title_% + #_title_# @@ -26,7 +26,7 @@ -  %_websitename_% +  #_websitename_# diff --git a/sites/example_website/_config.txt b/sites/example_website/_config.txt index 0fe5797..ba3158b 100644 --- a/sites/example_website/_config.txt +++ b/sites/example_website/_config.txt @@ -9,6 +9,8 @@ articles_en: Articles articles_fr: Articles previous_en: Previous articles previous_fr: Articles précédents +preferences_en: Preferences +preferences_fr: Préférences about_en: About me about_fr: A propos ---- diff --git a/vkyweb.py b/vkyweb.py index 9855dc6..377018e 100644 --- a/vkyweb.py +++ b/vkyweb.py @@ -14,6 +14,6 @@ subparsers = parser.add_subparsers(help='Commands') #parser_a.add_argument('bar', type=int, help='bar help') s=tree_parser.makeWebsite("sites/example_website") -container=model.DualContainer() +container=model.makeContainer(s) s.print_webtree(" > ")