nakidai
/
whoogle-search
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing styling/url/safe mode inconsistencies

main
Ben Busby 2020-05-26 10:39:19 -06:00
parent 77c4920e83
commit 98d639883c
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/filter.py
View File

@ -12,6 +12,7 @@ LOGO_URL = GOOG_IMG + '_desk'
BLANK_B64 = ''' BLANK_B64 = '''
data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAQAAAAnOwc2AAAAD0lEQVR42mNkwAIYh7IgAAVVAAuInjI5AAAAAElFTkSuQmCC data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAQAAAAnOwc2AAAAD0lEQVR42mNkwAIYh7IgAAVVAAuInjI5AAAAAElFTkSuQmCC
''' '''
GOOGLE_LINKS = ['/gmail', '/calendar', '/advanced_search']
def get_first_link(soup): def get_first_link(soup):
@ -174,8 +175,10 @@ class Filter:
# Replace hrefs with only the intended destination (no "utm" type tags) # Replace hrefs with only the intended destination (no "utm" type tags)
for a in soup.find_all('a', href=True): for a in soup.find_all('a', href=True):
href = a['href'].replace('https://www.google.com', '') href = a['href'].replace('https://www.google.com', '')
if '/advanced_search' in href: if href in GOOGLE_LINKS:
a.decompose() print(href)
if '/advanced_search' in href:
a.decompose()
continue continue
elif self.new_tab: elif self.new_tab:
a['target'] = '_blank' a['target'] = '_blank'

2
app/models/config.py
View File

@ -300,7 +300,7 @@ class Config:
self.url = '' self.url = ''
self.lang = 'lang_en' self.lang = 'lang_en'
self.ctry = '' self.ctry = ''
self.safe = True self.safe = False
self.dark = False self.dark = False
self.nojs = False self.nojs = False
self.near = '' self.near = ''

1
app/routes.py
View File

@ -144,6 +144,7 @@ def search():
response=formatted_results, response=formatted_results,
search_header=render_template( search_header=render_template(
'header.html', 'header.html',
dark_mode=g.user_config.dark,
q=urlparse.unquote(q), q=urlparse.unquote(q),
search_type=search_type, search_type=search_type,
mobile=g.user_request.mobile) if 'isch' not in search_type else '') mobile=g.user_request.mobile) if 'isch' not in search_type else '')

8
app/templates/header.html
View File

@ -12,6 +12,9 @@
<div class="H0PQec" style="width: 100%;"> <div class="H0PQec" style="width: 100%;">
<div class="sbc esbc autocomplete"> <div class="sbc esbc autocomplete">
<input id="search-bar" autocapitalize="none" autocomplete="off" class="noHIxc" name="q" <input id="search-bar" autocapitalize="none" autocomplete="off" class="noHIxc" name="q"
style="background-color: {{ '#000' if dark_mode else '#fff' }};
color: {{ '#685e79' if dark_mode else '#000' }};
border: {{ '1px solid #685e79' if dark_mode else '' }}"
spellcheck="false" type="text" value="{{ q }}"> spellcheck="false" type="text" value="{{ q }}">
<input name="tbm" value="{{ search_type }}" style="display: none"> <input name="tbm" value="{{ search_type }}" style="display: none">
<div class="sc"></div> <div class="sc"></div>
@ -34,7 +37,10 @@
<div class="autocomplete" style="width: 100%; flex: 1"> <div class="autocomplete" style="width: 100%; flex: 1">
<div style="width: 100%; display: flex"> <div style="width: 100%; display: flex">
<input id="search-bar" autocapitalize="none" autocomplete="off" class="noHIxc" name="q" <input id="search-bar" autocapitalize="none" autocomplete="off" class="noHIxc" name="q"
spellcheck="false" type="text" value="{{ q }}"> spellcheck="false" type="text" value="{{ q }}"
style="background-color: {{ '#000' if dark_mode else '#fff' }};
color: {{ '#685e79' if dark_mode else '#000' }};
border: {{ '1px solid #685e79' if dark_mode else '' }}">
<input name="tbm" value="{{ search_type }}" style="display: none"> <input name="tbm" value="{{ search_type }}" style="display: none">
<div class="sc"></div> <div class="sc"></div>
</div> </div>