mirror of https://github.com/sloumdrone/burrow
Restructured execution path to make odd side paths more viable
This commit is contained in:
parent
b63b914de1
commit
55ae2da06b
18
connect.py
18
connect.py
|
@ -8,14 +8,18 @@ class connect:
|
||||||
def request(self, resource, host, itemtype, port=70):
|
def request(self, resource, host, itemtype, port=70):
|
||||||
#connects to server and returns list with response type and body
|
#connects to server and returns list with response type and body
|
||||||
socket_conn = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
socket_conn = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||||
socket_conn.settimeout(20.0)
|
|
||||||
socket_conn.connect((host, port))
|
|
||||||
socket_conn.sendall((resource + '\r\n').encode('utf-8'))
|
|
||||||
|
|
||||||
if itemtype in ['I','p','g']:
|
try:
|
||||||
response = socket_conn.makefile(mode = 'rb', errors = 'ignore')
|
socket_conn.connect((host, port))
|
||||||
else:
|
socket_conn.sendall((resource + '\r\n').encode('utf-8'))
|
||||||
response = socket_conn.makefile(mode = 'r', errors = 'ignore')
|
|
||||||
|
if itemtype in ['I','p','g']:
|
||||||
|
response = socket_conn.makefile(mode = 'rb', errors = 'ignore')
|
||||||
|
else:
|
||||||
|
response = socket_conn.makefile(mode = 'r', errors = 'ignore')
|
||||||
|
except:
|
||||||
|
socket_conn.close()
|
||||||
|
return False
|
||||||
|
|
||||||
try:
|
try:
|
||||||
self.raw_response = response.read()
|
self.raw_response = response.read()
|
||||||
|
|
80
gui.py
80
gui.py
|
@ -93,7 +93,7 @@ class GUI:
|
||||||
x.bind('<Enter>', self.update_status)
|
x.bind('<Enter>', self.update_status)
|
||||||
x.bind('<Leave>', self.clear_status)
|
x.bind('<Leave>', self.clear_status)
|
||||||
x.config(activebackground=self.BG)
|
x.config(activebackground=self.BG)
|
||||||
self.entry_url.bind('<Return>', self.execute_address)
|
self.entry_url.bind('<Return>', self.handle_request)
|
||||||
self.btn_back.bind('<Button-1>', self.go_back)
|
self.btn_back.bind('<Button-1>', self.go_back)
|
||||||
self.btn_forward.bind('<Button-1>', self.go_forward)
|
self.btn_forward.bind('<Button-1>', self.go_forward)
|
||||||
self.btn_home.bind('<Button-1>', self.load_home_screen)
|
self.btn_home.bind('<Button-1>', self.load_home_screen)
|
||||||
|
@ -140,43 +140,59 @@ class GUI:
|
||||||
|
|
||||||
# ------------Start navigation methods----------------------------
|
# ------------Start navigation methods----------------------------
|
||||||
|
|
||||||
|
def handle_request(self,event=False, url=False, history=True):
|
||||||
|
parsed_url = self.parse_url(url)
|
||||||
|
if not parsed_url:
|
||||||
|
if url == 'home':
|
||||||
|
return self.load_home_screen(history)
|
||||||
|
else:
|
||||||
|
return False #error handling goes here
|
||||||
|
|
||||||
def execute_address(self, event=False, btn_url=False, history=True):
|
if parsed_url['type'] == 7:
|
||||||
url = btn_url if btn_url else self.entry_url.get()
|
return False # display search
|
||||||
if url == 'home':
|
else:
|
||||||
adjust_history = None if btn_url else 1
|
data = self.execute_address(parsed_url)
|
||||||
self.load_home_screen(adjust_history)
|
if not data:
|
||||||
return True
|
return False #error handling goes here
|
||||||
|
|
||||||
|
self.populate_url_bar(url)
|
||||||
|
|
||||||
|
if history:
|
||||||
|
self.add_to_history(url)
|
||||||
|
|
||||||
|
self.send_to_screen(self.conn.raw_response,self.conn.filetype)
|
||||||
|
|
||||||
|
|
||||||
|
def parse_url(self, url=False, history=True):
|
||||||
|
url = url if url else self.entry_url.get()
|
||||||
|
|
||||||
parsed_url = self.parser.parse_url(url)
|
parsed_url = self.parser.parse_url(url)
|
||||||
|
|
||||||
if not parsed_url:
|
if not parsed_url:
|
||||||
# To do: build errors class to handle displaying errors
|
# send error to screen
|
||||||
# return errors.url_error
|
print('Error parsing URL')
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
return parsed_url
|
||||||
|
|
||||||
if parsed_url['type'] == '7':
|
|
||||||
# self.send_to_screen(parsed_url, parsed_url['type'])
|
|
||||||
terms = sdb.askstring('Search','Please enter your search terms...')
|
|
||||||
print(terms)
|
|
||||||
if terms:
|
|
||||||
self.parser.resource = "{}\t{}".format(self.parser.resource,terms)
|
|
||||||
print(self.parser.resource)
|
|
||||||
else:
|
|
||||||
return False
|
|
||||||
|
|
||||||
response = self.conn.request(self.parser.resource, self.parser.host, self.parser.filetype, self.parser.port)
|
def execute_address(self, url):
|
||||||
|
# if parsed_url['type'] == '7':
|
||||||
|
# # self.send_to_screen(parsed_url, parsed_url['type'])
|
||||||
|
# terms = sdb.askstring('Search','Please enter your search terms...')
|
||||||
|
# print(terms)
|
||||||
|
# if terms:
|
||||||
|
# self.parser.resource = "{}\t{}".format(self.parser.resource,terms)
|
||||||
|
# print(self.parser.resource)
|
||||||
|
# else:
|
||||||
|
# return False
|
||||||
|
|
||||||
|
response = self.conn.request(url['resource'], url['host'], url['type'], url['port'])
|
||||||
|
|
||||||
if not response:
|
if not response:
|
||||||
# To do: build errors class to handle displaying errors
|
# send error to screen
|
||||||
# return errors.connection_error_NUMBER
|
|
||||||
return False
|
return False
|
||||||
|
|
||||||
if history:
|
|
||||||
self.history = self.history[:self.history_location+1]
|
|
||||||
self.history.append(url)
|
|
||||||
self.history_location = len(self.history) - 1
|
|
||||||
|
|
||||||
# Get the data to the screen
|
# Get the data to the screen
|
||||||
self.site_display.focus_set()
|
self.site_display.focus_set()
|
||||||
|
@ -201,19 +217,17 @@ class GUI:
|
||||||
element.tag_config(tag_name, background=self.ACTIVELINK)
|
element.tag_config(tag_name, background=self.ACTIVELINK)
|
||||||
element.update_idletasks() # make sure change is visible
|
element.update_idletasks() # make sure change is visible
|
||||||
time.sleep(.5) # optional delay to show changed text
|
time.sleep(.5) # optional delay to show changed text
|
||||||
self.entry_url.delete(0,tk.END)
|
|
||||||
self.entry_url.insert(tk.END,href)
|
|
||||||
success = self.execute_address()
|
|
||||||
element.tag_config(tag_name, background=self.BG) # restore tag text style
|
element.tag_config(tag_name, background=self.BG) # restore tag text style
|
||||||
element.update_idletasks()
|
element.update_idletasks()
|
||||||
|
self.handle_request(False,href)
|
||||||
|
|
||||||
|
|
||||||
def load_home_screen(self,event=None):
|
def load_home_screen(self,event=False):
|
||||||
with open('./home.gopher','r') as f:
|
with open('./home.gopher','r') as f:
|
||||||
data = f.read()
|
data = f.read()
|
||||||
self.entry_url.delete(0, tk.END)
|
self.entry_url.delete(0, tk.END)
|
||||||
self.entry_url.insert(tk.END, 'home')
|
self.entry_url.insert(tk.END, 'home')
|
||||||
if event is not None:
|
if event is not False:
|
||||||
self.add_to_history('home')
|
self.add_to_history('home')
|
||||||
self.send_to_screen(data, '1')
|
self.send_to_screen(data, '1')
|
||||||
|
|
||||||
|
@ -224,8 +238,7 @@ class GUI:
|
||||||
|
|
||||||
self.history_location -= 1
|
self.history_location -= 1
|
||||||
href = self.history[self.history_location]
|
href = self.history[self.history_location]
|
||||||
self.populate_url_bar(href)
|
self.handle_request(False, href, False)
|
||||||
self.execute_address(False, href, False)
|
|
||||||
|
|
||||||
|
|
||||||
def go_forward(self, event):
|
def go_forward(self, event):
|
||||||
|
@ -234,8 +247,7 @@ class GUI:
|
||||||
|
|
||||||
self.history_location += 1
|
self.history_location += 1
|
||||||
href = self.history[self.history_location]
|
href = self.history[self.history_location]
|
||||||
self.populate_url_bar(href)
|
self.handle_request(False, href, False)
|
||||||
self.execute_address(False, href, False)
|
|
||||||
|
|
||||||
|
|
||||||
#-------------Start view methods----------------
|
#-------------Start view methods----------------
|
||||||
|
|
|
@ -19,6 +19,10 @@ class parser:
|
||||||
regex = r'^(?P<protocol>(?:(gopher|http):\/\/)?)?(?P<host>[\w\.\d]+)(?P<port>(?::\d+)?)?(?P<type>(?:\/[\dgIp])?)?(?P<resource>(?:\/.*)?)?$'
|
regex = r'^(?P<protocol>(?:(gopher|http):\/\/)?)?(?P<host>[\w\.\d]+)(?P<port>(?::\d+)?)?(?P<type>(?:\/[\dgIp])?)?(?P<resource>(?:\/.*)?)?$'
|
||||||
|
|
||||||
match = re.match(regex, url)
|
match = re.match(regex, url)
|
||||||
|
|
||||||
|
if not match:
|
||||||
|
return False
|
||||||
|
|
||||||
protocol = match.group('protocol')
|
protocol = match.group('protocol')
|
||||||
itemtype = match.group('type')
|
itemtype = match.group('type')
|
||||||
host = match.group('host')
|
host = match.group('host')
|
||||||
|
|
Loading…
Reference in New Issue