mirror of https://github.com/sloumdrone/burrow
Fixed removal of terminal period in text files
This commit is contained in:
parent
74c1ad4ca8
commit
ccb66be447
|
@ -21,11 +21,11 @@ class connect:
|
||||||
except socket.timeout:
|
except socket.timeout:
|
||||||
print('Socket timeout')
|
print('Socket timeout')
|
||||||
socket_conn.close()
|
socket_conn.close()
|
||||||
return {'type': '3', 'body': '3ERROR: Server request timed out\tfalse\tnull.host\t1'}
|
return {'type': '1', 'body': '3ERROR: Server request timed out\tfalse\tnull.host\t1'}
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print('Misc socket error: ', e)
|
print('Misc socket error: ', e)
|
||||||
socket_conn.close()
|
socket_conn.close()
|
||||||
return {'type': '3', 'body': '3ERROR: Unable to communicate with remote server\tfalse\tnull.host\t1'}
|
return {'type': '1', 'body': '3ERROR: Unable to communicate with remote server\tfalse\tnull.host\t1'}
|
||||||
|
|
||||||
try:
|
try:
|
||||||
self.raw_response = response.read()
|
self.raw_response = response.read()
|
||||||
|
|
23
gui.py
23
gui.py
|
@ -144,9 +144,9 @@ class GUI:
|
||||||
# ------------Start navigation methods----------------------------
|
# ------------Start navigation methods----------------------------
|
||||||
|
|
||||||
def handle_request(self,event=False, url=False, history=True):
|
def handle_request(self,event=False, url=False, history=True):
|
||||||
self.progress_bar = tk.Label(self.entry_url, text=' Loading... ', width=12, relief=tk.FLAT, height=1, fg='#FFFFFF', bg=self.TYPES)
|
self.loading_bar = tk.Label(self.entry_url, text=' Loading... ', width=12, relief=tk.FLAT, height=1, fg='#FFFFFF', bg=self.TYPES)
|
||||||
self.progress_bar.pack(side=tk.RIGHT, padx=(0,10))
|
self.loading_bar.pack(side=tk.RIGHT, padx=(0,10))
|
||||||
self.progress_bar.update_idletasks()
|
self.loading_bar.update_idletasks()
|
||||||
|
|
||||||
url = url if url else self.entry_url.get()
|
url = url if url else self.entry_url.get()
|
||||||
parsed_url = self.parse_url(url)
|
parsed_url = self.parse_url(url)
|
||||||
|
@ -170,7 +170,7 @@ class GUI:
|
||||||
if not data:
|
if not data:
|
||||||
return False #error handling goes here
|
return False #error handling goes here
|
||||||
|
|
||||||
self.send_to_screen(self.conn.raw_response,self.conn.filetype)
|
self.send_to_screen(data['body'],data['type'])
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -197,8 +197,7 @@ class GUI:
|
||||||
self.site_display.focus_set()
|
self.site_display.focus_set()
|
||||||
self.config["last_viewed"] = url
|
self.config["last_viewed"] = url
|
||||||
|
|
||||||
self.send_to_screen(self.conn.raw_response, self.conn.filetype)
|
return response
|
||||||
return True
|
|
||||||
|
|
||||||
|
|
||||||
def add_to_history(self, url):
|
def add_to_history(self, url):
|
||||||
|
@ -287,6 +286,12 @@ class GUI:
|
||||||
self.site_display.config(state=tk.DISABLED)
|
self.site_display.config(state=tk.DISABLED)
|
||||||
self.search.focus_set()
|
self.search.focus_set()
|
||||||
|
|
||||||
|
try:
|
||||||
|
self.loading_bar.destroy()
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def query_search_engine(self, event):
|
def query_search_engine(self, event):
|
||||||
base_url = self.entry_url.get()
|
base_url = self.entry_url.get()
|
||||||
|
@ -324,7 +329,7 @@ class GUI:
|
||||||
|
|
||||||
link_count = 0
|
link_count = 0
|
||||||
|
|
||||||
for x in data[1:]:
|
for x in data:
|
||||||
if x['type'] == 'i':
|
if x['type'] == 'i':
|
||||||
self.site_display.insert(tk.END,' \t\t{}\n'.format(x['description']))
|
self.site_display.insert(tk.END,' \t\t{}\n'.format(x['description']))
|
||||||
elif x['type'] == '3':
|
elif x['type'] == '3':
|
||||||
|
@ -359,7 +364,7 @@ class GUI:
|
||||||
|
|
||||||
|
|
||||||
def show_text(self, data):
|
def show_text(self, data):
|
||||||
if data[-2:] == '\n.':
|
if data[-2:] == '.\n':
|
||||||
data = data[:-2]
|
data = data[:-2]
|
||||||
self.site_display.config(state=tk.NORMAL)
|
self.site_display.config(state=tk.NORMAL)
|
||||||
self.site_display.delete(1.0, tk.END)
|
self.site_display.delete(1.0, tk.END)
|
||||||
|
@ -385,7 +390,7 @@ class GUI:
|
||||||
self.show_image(data)
|
self.show_image(data)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
self.progress_bar.destroy()
|
self.loading_bar.destroy()
|
||||||
except:
|
except:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue