changed tabs to 4 spaces + some minor fixes in rtxHelpers
This commit is contained in:
acn
parent
267167769d
commit
0876bef079
236
rtxHelpers.py
236
rtxHelpers.py
|
|
@ -13,151 +13,151 @@ import logging
|
||||||
import config
|
import config
|
||||||
|
|
||||||
def process_byte(in_byte):
|
def process_byte(in_byte):
|
||||||
""" takes the received byte and processes the command line
|
""" takes the received byte and processes the command line
|
||||||
if a new command has been entered, it will call process_command()
|
if a new command has been entered, it will call process_command()
|
||||||
if a short link has been entered, the link_list of the current page will be searched
|
if a short link has been entered, the link_list of the current page will be searched
|
||||||
and the found target will be sent to process_command()
|
and the found target will be sent to process_command()
|
||||||
"""
|
"""
|
||||||
instr=str(in_byte, encoding="latin-1")
|
instr=str(in_byte, encoding="latin-1")
|
||||||
|
|
||||||
if config.MODE=="modem":
|
if config.MODE=="modem":
|
||||||
logging.debug("> %s < CD: %s", instr, glob.ser.getCD())
|
logging.debug("> %s < CD: %s", instr, glob.ser.getCD())
|
||||||
|
|
||||||
# what to send back to the client
|
# what to send back to the client
|
||||||
if instr == cept.INI:
|
if instr == cept.INI:
|
||||||
logging.debug("INI")
|
logging.debug("INI")
|
||||||
echo_char = "*"
|
echo_char = "*"
|
||||||
elif instr == cept.TER:
|
elif instr == cept.TER:
|
||||||
logging.debug("TER")
|
logging.debug("TER")
|
||||||
echo_char = "#"
|
echo_char = "#"
|
||||||
else:
|
else:
|
||||||
echo_char=instr
|
echo_char=instr
|
||||||
|
|
||||||
# start of line: clear rest of cmdline
|
# start of line: clear rest of cmdline
|
||||||
if len(glob.cmdline) == 0:
|
if len(glob.cmdline) == 0:
|
||||||
glob.ser.write(bytes(cept.CLEARLINE, "latin-1"))
|
glob.ser.write(bytes(cept.CLEARLINE, "latin-1"))
|
||||||
|
|
||||||
# echo the character to the client
|
# echo the character to the client
|
||||||
glob.ser.write(bytes(echo_char, "latin-1"))
|
glob.ser.write(bytes(echo_char, "latin-1"))
|
||||||
|
|
||||||
glob.cmdline += instr
|
glob.cmdline += instr
|
||||||
|
|
||||||
# Backspace:
|
# Backspace:
|
||||||
if instr == cept.BSP:
|
if instr == cept.BSP:
|
||||||
glob.cmdline = glob.cmdline[:-1]
|
glob.cmdline = glob.cmdline[:-1]
|
||||||
return
|
return
|
||||||
|
|
||||||
logging.debug("Cmdline: >%s<", glob.cmdline)
|
logging.debug("Cmdline: >%s<", glob.cmdline)
|
||||||
|
|
||||||
# process links inside the page:
|
# process links inside the page:
|
||||||
if ( len(glob.cmdline) == 1 or len(glob.cmdline) == 2 ) and glob.curpage.get_link(glob.cmdline):
|
if ( len(glob.cmdline) == 1 or len(glob.cmdline) == 2 ) and glob.curpage.get_link(glob.cmdline):
|
||||||
glob.cmdline = cept.INI + glob.curpage.get_link(glob.cmdline) + cept.TER
|
glob.cmdline = cept.INI + glob.curpage.get_link(glob.cmdline) + cept.TER
|
||||||
process_command(glob.cmdline)
|
process_command(glob.cmdline)
|
||||||
return
|
return
|
||||||
|
|
||||||
# reset cmdline:
|
# reset cmdline:
|
||||||
if instr == cept.INI and glob.cmdline[-2:] == cept.INI+cept.INI:
|
if instr == cept.INI and glob.cmdline[-2:] == cept.INI+cept.INI:
|
||||||
logging.debug("reset cmdline")
|
logging.debug("reset cmdline")
|
||||||
glob.cmdline = ""
|
glob.cmdline = ""
|
||||||
glob.ser.write(bytes(cept.clear_line24, "latin-1"))
|
glob.ser.write(bytes(cept.clear_line24, "latin-1"))
|
||||||
return
|
return
|
||||||
|
|
||||||
# goto last page:
|
# goto last page:
|
||||||
if instr == cept.TER and glob.cmdline == cept.INI+cept.TER:
|
if instr == cept.TER and glob.cmdline == cept.INI+cept.TER:
|
||||||
if glob.prevpage.get_page_id() == -1:
|
if glob.prevpage.get_page_id() == -1:
|
||||||
glob.cmdline = ""
|
glob.cmdline = ""
|
||||||
send_error("Keine vorige Seite vorhanden.")
|
send_error("Keine vorige Seite vorhanden.")
|
||||||
return
|
return
|
||||||
glob.cmdline = "" # reset cmdline
|
glob.cmdline = "" # reset cmdline
|
||||||
goto_last_page()
|
goto_last_page()
|
||||||
return
|
return
|
||||||
|
|
||||||
# "Make it so":
|
# "Make it so":
|
||||||
if instr == cept.TER:
|
if instr == cept.TER:
|
||||||
# or instr == cept.SEND or instr == cept.CR:
|
# or instr == cept.SEND or instr == cept.CR:
|
||||||
logging.info("Kommando: >%s<", glob.cmdline)
|
logging.info("Kommando: >%s<", glob.cmdline)
|
||||||
process_command(glob.cmdline)
|
process_command(glob.cmdline)
|
||||||
return
|
return
|
||||||
|
|
||||||
def process_command(cmd):
|
def process_command(cmd):
|
||||||
""" processes the given command line
|
""" processes the given command line
|
||||||
"""
|
"""
|
||||||
|
|
||||||
# reset cmdline
|
# reset cmdline
|
||||||
glob.cmdline = ""
|
glob.cmdline = ""
|
||||||
|
|
||||||
# process *cmdline#, normally a page-loading command:
|
# process *cmdline#, normally a page-loading command:
|
||||||
if cmd[0] == cept.INI and cmd[-1:] == cept.TER:
|
if cmd[0] == cept.INI and cmd[-1:] == cept.TER:
|
||||||
pgnr = cmd[1:-1]
|
pgnr = cmd[1:-1]
|
||||||
check_and_send_page(pgnr, "Die Seite kann nicht gefunden werden.")
|
check_and_send_page(pgnr, "Die Seite kann nicht gefunden werden.")
|
||||||
|
|
||||||
# if only # is entered, either go to the link behind '#'
|
# if only # is entered, either go to the link behind '#'
|
||||||
# or to the next sub-page (2000a => 2000b) if it exists
|
# or to the next sub-page (2000a => 2000b) if it exists
|
||||||
if cmd == cept.TER:
|
if cmd == cept.TER:
|
||||||
if glob.curpage.get_link("#"):
|
if glob.curpage.get_link("#"):
|
||||||
pgnr = glob.curpage.get_link("#")
|
pgnr = glob.curpage.get_link("#")
|
||||||
check_and_send_page(pgnr, "Die Seite kann nicht gefunden werden.")
|
check_and_send_page(pgnr, "Die Seite kann nicht gefunden werden.")
|
||||||
else:
|
else:
|
||||||
# check if the next page exists, e.g. 2000a => 2000b
|
# check if the next page exists, e.g. 2000a => 2000b
|
||||||
curid = glob.curpage.get_page_id()
|
curid = glob.curpage.get_page_id()
|
||||||
if curid[-1:].isalpha():
|
if curid[-1:].isalpha():
|
||||||
# aus 2000a 2000b machen:
|
# aus 2000a 2000b machen:
|
||||||
nextid = curid[:-1] + chr(ord(curid[-1:])+1)
|
nextid = curid[:-1] + chr(ord(curid[-1:])+1)
|
||||||
check_and_send_page(nextid, "Keine n"+str(cept['UMLAUT'])+"achste Seite gefunden.")
|
check_and_send_page(nextid, "Keine n"+str(cept['UMLAUT'])+"achste Seite gefunden.")
|
||||||
|
|
||||||
# special commands:
|
# special commands:
|
||||||
if cmd == "!1" + cept.TER:
|
if cmd == "!1" + cept.TER:
|
||||||
send_welcome_page()
|
send_welcome_page()
|
||||||
return
|
return
|
||||||
if cmd == "!2" + cept.TER:
|
if cmd == "!2" + cept.TER:
|
||||||
glob.ser.write(bytes(cept.init_screen, "latin-1"))
|
glob.ser.write(bytes(cept.init_screen, "latin-1"))
|
||||||
return
|
return
|
||||||
|
|
||||||
def goto_last_page():
|
def goto_last_page():
|
||||||
""" go back to the previous page and make the current page the previous page
|
""" go back to the previous page and make the current page the previous page
|
||||||
"""
|
"""
|
||||||
logging.info("Letzte Seite: %s", str(glob.prevpage.get_page_id()))
|
logging.info("Letzte Seite: %s", str(glob.prevpage.get_page_id()))
|
||||||
|
|
||||||
# swap prevpage and curpage
|
# swap prevpage and curpage
|
||||||
temp = glob.curpage
|
temp = glob.curpage
|
||||||
glob.curpage = glob.prevpage
|
glob.curpage = glob.prevpage
|
||||||
glob.prevpage = temp
|
glob.prevpage = temp
|
||||||
|
|
||||||
# send the previous page (now curpage) to the client
|
# send the previous page (now curpage) to the client
|
||||||
send_page(glob.curpage)
|
send_page(glob.curpage)
|
||||||
|
|
||||||
def send_welcome_page():
|
def send_welcome_page():
|
||||||
""" get the btxlogo, make a rtxPage of it and send it to the client """
|
""" get the btxlogo, make a rtxPage of it and send it to the client """
|
||||||
wpage = rtxPage()
|
wpage = rtxPage()
|
||||||
wpage.set_page(bytes(cept.btxlogo, "latin-1"))
|
wpage.set_page(bytes(cept.btxlogo, "latin-1"))
|
||||||
send_page(wpage)
|
send_page(wpage)
|
||||||
|
|
||||||
def check_and_send_page(pgnr, errormsg):
|
def check_and_send_page(pgnr, errormsg):
|
||||||
""" checks if the page "pgnr" exists
|
""" checks if the page "pgnr" exists
|
||||||
if yes, it loads it into curpage and sends it to the client
|
if yes, it loads it into curpage and sends it to the client
|
||||||
if not, it sends the error message "errormsg" to the client
|
if not, it sends the error message "errormsg" to the client
|
||||||
"""
|
"""
|
||||||
logging.info("suche Seite: >%s<", pgnr)
|
logging.info("suche Seite: >%s<", pgnr)
|
||||||
|
|
||||||
if rtxPage.exists(pgnr):
|
if rtxPage.exists(pgnr):
|
||||||
glob.prevpage = glob.curpage
|
glob.prevpage = glob.curpage
|
||||||
glob.curpage = rtxPage(pgnr)
|
glob.curpage = rtxPage(pgnr)
|
||||||
send_page(glob.curpage) # takes a rtxPage object!
|
send_page(glob.curpage) # takes a rtxPage object!
|
||||||
return True
|
return True
|
||||||
elif pgnr[-1:].isnumeric() and rtxPage.exists(pgnr + "a"):
|
elif pgnr[-1:].isnumeric() and rtxPage.exists(pgnr + "a"):
|
||||||
glob.prevpage = glob.curpage
|
glob.prevpage = glob.curpage
|
||||||
glob.curpage = rtxPage(pgnr + "a")
|
glob.curpage = rtxPage(pgnr + "a")
|
||||||
send_page(glob.curpage) # takes a rtxPage object!
|
send_page(glob.curpage) # takes a rtxPage object!
|
||||||
return True
|
return True
|
||||||
else:
|
else:
|
||||||
send_error(errormsg)
|
send_error(errormsg)
|
||||||
return False
|
return False
|
||||||
|
|
||||||
def send_error(msg):
|
def send_error(msg):
|
||||||
""" send an error message to the client """
|
""" send an error message to the client """
|
||||||
glob.ser.write(bytes(cept.error_prefix + msg + cept.error_suffix, "latin-1"))
|
glob.ser.write(bytes(cept.error_prefix + msg + cept.error_suffix, "latin-1"))
|
||||||
|
|
||||||
def send_page(page):
|
def send_page(page):
|
||||||
""" sends a page to the client """
|
""" sends a page to the client """
|
||||||
glob.ser.write(page.get_page())
|
glob.ser.write(page.get_page())
|
||||||
|
|
||||||
|
|
|
||||||
84
rtxModem.py
84
rtxModem.py
|
|
@ -12,51 +12,51 @@ import config
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
def init_modem():
|
def init_modem():
|
||||||
logging.debug("clearing input/output buffers")
|
logging.debug("clearing input/output buffers")
|
||||||
glob.ser.reset_input_buffer()
|
glob.ser.reset_input_buffer()
|
||||||
glob.ser.reset_output_buffer()
|
glob.ser.reset_output_buffer()
|
||||||
""" send the modem init strings to the modem """
|
""" send the modem init strings to the modem """
|
||||||
logging.debug("init_modem")
|
logging.debug("init_modem")
|
||||||
if config.MODEM_INIT1 != "":
|
if config.MODEM_INIT1 != "":
|
||||||
logging.debug("sending MODEM_INIT1")
|
logging.debug("sending MODEM_INIT1")
|
||||||
glob.ser.write(bytes(config.MODEM_INIT1 + "\r", "latin-1"))
|
glob.ser.write(bytes(config.MODEM_INIT1 + "\r", "latin-1"))
|
||||||
rc = _serial_readline()
|
rc = _serial_readline()
|
||||||
logging.info("MODEM_INIT1: %s", rc)
|
logging.info("MODEM_INIT1: %s", rc)
|
||||||
rc = _serial_readline()
|
rc = _serial_readline()
|
||||||
logging.info("MODEM_INIT1: %s", rc)
|
logging.info("MODEM_INIT1: %s", rc)
|
||||||
|
|
||||||
if config.MODEM_INIT2 != "":
|
if config.MODEM_INIT2 != "":
|
||||||
logging.debug("sending MODEM_INIT2")
|
logging.debug("sending MODEM_INIT2")
|
||||||
glob.ser.write(bytes(config.MODEM_INIT2 + "\r", "latin-1"))
|
glob.ser.write(bytes(config.MODEM_INIT2 + "\r", "latin-1"))
|
||||||
rc = _serial_readline()
|
rc = _serial_readline()
|
||||||
logging.info("MODEM_INIT2: %s", rc)
|
logging.info("MODEM_INIT2: %s", rc)
|
||||||
rc = _serial_readline()
|
rc = _serial_readline()
|
||||||
logging.info("MODEM_INIT2: %s", rc)
|
logging.info("MODEM_INIT2: %s", rc)
|
||||||
|
|
||||||
def wait_for_caller():
|
def wait_for_caller():
|
||||||
""" waits for the RING of the modem and answers it """
|
""" waits for the RING of the modem and answers it """
|
||||||
modem_answered = False
|
modem_answered = False
|
||||||
logging.debug("wait_for_caller")
|
logging.debug("wait_for_caller")
|
||||||
while not modem_answered:
|
while not modem_answered:
|
||||||
rc = _serial_readline()
|
rc = _serial_readline()
|
||||||
if rc.startswith(config.MODEM_RING):
|
if rc.startswith(config.MODEM_RING):
|
||||||
logging.info("modem ringing! Answering.")
|
logging.info("modem ringing! Answering.")
|
||||||
glob.ser.write(bytes(config.MODEM_ANSWER + "\r", "latin-1"))
|
glob.ser.write(bytes(config.MODEM_ANSWER + "\r", "latin-1"))
|
||||||
rc = _serial_readline()
|
rc = _serial_readline()
|
||||||
logging.info("Answer: %s", rc)
|
logging.info("Answer: %s", rc)
|
||||||
rc = _serial_readline()
|
rc = _serial_readline()
|
||||||
logging.info("Answer: %s", rc)
|
logging.info("Answer: %s", rc)
|
||||||
modem_answered=True
|
modem_answered=True
|
||||||
else:
|
else:
|
||||||
modem_answered=False
|
modem_answered=False
|
||||||
|
|
||||||
def _serial_readline():
|
def _serial_readline():
|
||||||
line = ""
|
line = ""
|
||||||
in_byte = ""
|
in_byte = ""
|
||||||
|
|
||||||
while not in_byte == b"\n":
|
while not in_byte == b"\n":
|
||||||
in_byte = glob.ser.read(1)
|
in_byte = glob.ser.read(1)
|
||||||
#print(in_byte)
|
#print(in_byte)
|
||||||
line += str(in_byte, encoding="latin-1")
|
line += str(in_byte, encoding="latin-1")
|
||||||
|
|
||||||
return line
|
return line
|
||||||
|
|
|
||||||
172
rtxPage.py
172
rtxPage.py
|
|
@ -12,103 +12,103 @@ import config
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
class rtxPage:
|
class rtxPage:
|
||||||
""" Klasse zur Benutzung einer CEPT-Seite
|
""" Klasse zur Benutzung einer CEPT-Seite
|
||||||
"""
|
"""
|
||||||
|
|
||||||
die_seite = ""
|
die_seite = ""
|
||||||
seiten_nummer = -1
|
seiten_nummer = -1
|
||||||
link_liste = {}
|
link_liste = {}
|
||||||
|
|
||||||
def __init__(self, page = None):
|
def __init__(self, page = None):
|
||||||
""" create a new page object for the page 'page'
|
""" create a new page object for the page 'page'
|
||||||
returns False if the page cannot be found
|
returns False if the page cannot be found
|
||||||
returns True if the page has been loaded
|
returns True if the page has been loaded
|
||||||
"""
|
"""
|
||||||
if page == None:
|
if page == None:
|
||||||
return
|
return
|
||||||
else:
|
else:
|
||||||
self.die_seite = ""
|
self.die_seite = ""
|
||||||
self.seiten_nummer = -1
|
self.seiten_nummer = -1
|
||||||
self.link_liste = {}
|
self.link_liste = {}
|
||||||
self._load_page(page)
|
self._load_page(page)
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def exists(page):
|
def exists(page):
|
||||||
""" checks if the page (i.e. the file) exists """
|
""" checks if the page (i.e. the file) exists """
|
||||||
if os.path.isfile(config.PAGES + page):
|
if os.path.isfile(config.PAGES + page):
|
||||||
return True
|
return True
|
||||||
elif os.path.isfile(config.DEMOPAGES + page):
|
elif os.path.isfile(config.DEMOPAGES + page):
|
||||||
return True
|
return True
|
||||||
else:
|
else:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
def get_page(self):
|
def get_page(self):
|
||||||
""" returns the page if loaded
|
""" returns the page if loaded
|
||||||
returns False if no page has been loaded
|
returns False if no page has been loaded
|
||||||
"""
|
"""
|
||||||
if self.die_seite != "":
|
if self.die_seite != "":
|
||||||
return self.die_seite
|
return self.die_seite
|
||||||
else:
|
else:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
def set_page(self,pagedata):
|
def set_page(self,pagedata):
|
||||||
""" write the pagedata as the new page and (probably) the link list """
|
""" write the pagedata as the new page and (probably) the link list """
|
||||||
self.die_seite = pagedata
|
self.die_seite = pagedata
|
||||||
self.link_liste = self._get_link_list()
|
self.link_liste = self._get_link_list()
|
||||||
|
|
||||||
def get_links(self):
|
def get_links(self):
|
||||||
""" returns the list of links found in this page """
|
""" returns the list of links found in this page """
|
||||||
return self.link_liste
|
return self.link_liste
|
||||||
|
|
||||||
def get_link(self, link):
|
def get_link(self, link):
|
||||||
""" returns the target for a given link
|
""" returns the target for a given link
|
||||||
returns False if this link does not exist
|
returns False if this link does not exist
|
||||||
"""
|
"""
|
||||||
if link in self.link_liste:
|
if link in self.link_liste:
|
||||||
return self.link_liste[link]
|
return self.link_liste[link]
|
||||||
else:
|
else:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
def get_page_id(self):
|
def get_page_id(self):
|
||||||
""" returns the id of the current page """
|
""" returns the id of the current page """
|
||||||
return self.seiten_nummer
|
return self.seiten_nummer
|
||||||
|
|
||||||
def _load_page(self, page):
|
def _load_page(self, page):
|
||||||
""" Load a CEPT page from the file system
|
""" Load a CEPT page from the file system
|
||||||
returns False if the page cannot be found
|
returns False if the page cannot be found
|
||||||
returns True if the page has been loaded
|
returns True if the page has been loaded
|
||||||
"""
|
"""
|
||||||
if os.path.isfile(config.PAGES + page):
|
if os.path.isfile(config.PAGES + page):
|
||||||
filename = config.PAGES + page
|
filename = config.PAGES + page
|
||||||
elif os.path.isfile(config.DEMOPAGES + page):
|
elif os.path.isfile(config.DEMOPAGES + page):
|
||||||
filename = config.DEMOPAGES + page
|
filename = config.DEMOPAGES + page
|
||||||
else:
|
else:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
with open(filename, "rb") as f:
|
with open(filename, "rb") as f:
|
||||||
self.die_seite = f.read()
|
self.die_seite = f.read()
|
||||||
self.seiten_nummer = page
|
self.seiten_nummer = page
|
||||||
link_liste = self._get_link_list()
|
link_liste = self._get_link_list()
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def _get_link_list(self):
|
def _get_link_list(self):
|
||||||
""" private function which parses the CEPT page and extracts the link list
|
""" private function which parses the CEPT page and extracts the link list
|
||||||
returns True if links have been found
|
returns True if links have been found
|
||||||
returns False if no links have been found
|
returns False if no links have been found
|
||||||
"""
|
"""
|
||||||
links = []
|
links = []
|
||||||
links = re.findall("\x1f\x3d([^\x1f\x9b\x1b]+)", str(self.die_seite, "latin-1"))
|
links = re.findall("\x1f\x3d([^\x1f\x9b\x1b]+)", str(self.die_seite, "latin-1"))
|
||||||
|
|
||||||
for item in links:
|
for item in links:
|
||||||
if item[0] != "0":
|
if item[0] != "0":
|
||||||
link = item[1:3].strip()
|
link = item[1:3].strip()
|
||||||
target = item[3:].strip()
|
target = item[3:].strip()
|
||||||
self.link_liste[link] = target
|
self.link_liste[link] = target
|
||||||
|
|
||||||
logging.info(self.link_liste)
|
logging.info(self.link_liste)
|
||||||
|
|
||||||
if self.link_liste == {}:
|
if self.link_liste == {}:
|
||||||
return False
|
return False
|
||||||
else:
|
else:
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue