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

Fix improper header styling, remove shopping tab links 

The header template was using Google's classes for the "Whoogle" logo,
which meant keeping up with their list of colors used in the logo. The
template was updated to only ever use the Whoogle logo color.
Accordingly, the logo specific styling in filter.py was removed, since
it is no longer needed.

Also removes all links to the shopping tab, as it seems that the
majority of the links to items are Google specific links (usually
google.com/aclk links without any discernible param for determining the
true location for the link). The shopping page should be addressed
separately with unique filtering/formatting. Further tracking of this
task will be followed in #136.
main
Ben Busby 2020-10-25 13:52:30 -04:00
parent 58a7868d25
commit f3bb1e22b4
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/filter.py
View File

@ -31,9 +31,6 @@ class Filter:
def reskin(self, page): def reskin(self, page):
# Aesthetic only re-skinning # Aesthetic only re-skinning
page = page.replace('>G<', '>Wh<')
pattern = re.compile('4285f4|ea4335|fbcc05|34a853|fbbc05', re.IGNORECASE)
page = pattern.sub('685e79', page)
if self.dark: if self.dark:
page = page.replace('fff', '000').replace('202124', 'ddd').replace('1967D2', '3b85ea') page = page.replace('fff', '000').replace('202124', 'ddd').replace('1967D2', '3b85ea')
@ -56,6 +53,7 @@ class Filter:
self.fix_question_section() self.fix_question_section()
self.update_styling(soup) self.update_styling(soup)
for img in [_ for _ in soup.find_all('img') if 'src' in _.attrs]: for img in [_ for _ in soup.find_all('img') if 'src' in _.attrs]:
self.update_element_src(img, 'image/png') self.update_element_src(img, 'image/png')
@ -147,7 +145,9 @@ class Filter:
def update_link(self, link): def update_link(self, link):
# Replace href with only the intended destination (no "utm" type tags) # Replace href with only the intended destination (no "utm" type tags)
href = link['href'].replace('https://www.google.com', '') href = link['href'].replace('https://www.google.com', '')
if '/advanced_search' in href: if '/advanced_search' in href or 'tbm=shop' in href:
# TODO: The "Shopping" tab requires further filtering (see #136)
# Temporarily removing all links to that tab for now.
link.decompose() link.decompose()
return return
elif self.new_tab: elif self.new_tab:

8
app/templates/header.html
View File

@ -5,9 +5,7 @@
<a class="logo-link mobile-logo" <a class="logo-link mobile-logo"
href="/" href="/"
style="display:flex; justify-content:center; align-items:center; color:#685e79; font-size:18px; "> style="display:flex; justify-content:center; align-items:center; color:#685e79; font-size:18px; ">
<span class="V6gwVd">Wh</span><span class="iWkuvd">o</span><span class="cDrQ7">o</span><span <span style="color: #685e79">Whoogle</span>
class="V6gwVd">g</span><span class="ntlR9">l</span><span
class="iWkuvd tJ3Myc">e</span>
</a> </a>
<div class="H0PQec" style="width: 100%;"> <div class="H0PQec" style="width: 100%;">
<div class="sbc esbc autocomplete"> <div class="sbc esbc autocomplete">
@ -27,9 +25,7 @@
<header> <header>
<div class="logo-div"> <div class="logo-div">
<a class="logo-link" href="/"> <a class="logo-link" href="/">
<span class="V6gwVd logo-letter">Wh</span><span class="iWkuvd logo-letter">o</span><span <span style="color: #685e79">Whoogle</span>
class="cDrQ7 logo-letter">o</span><span class="V6gwVd logo-letter">g</span><span
class="ntlR9 logo-letter">l</span><span class="iWkuvd tJ3Myc logo-letter">e</span>
</a> </a>
</div> </div>
<div class="search-div"> <div class="search-div">