Merge pull request #1 from benbusby/master

Merge with upstream
This commit is contained in:
thomcatdotrocks 2020-05-15 15:51:56 -05:00 committed by GitHub
commit 196f887120
2 changed files with 28 additions and 5 deletions

View File

@ -4,6 +4,7 @@
[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
[![Build Status](https://travis-ci.com/benbusby/whoogle-search.svg?branch=master)](https://travis-ci.com/benbusby/whoogle-search) [![Build Status](https://travis-ci.com/benbusby/whoogle-search.svg?branch=master)](https://travis-ci.com/benbusby/whoogle-search)
[![codebeat badge](https://codebeat.co/badges/e96cada2-fb6f-4528-8285-7d72abd74e8d)](https://codebeat.co/projects/github-com-benbusby-shoogle-master) [![codebeat badge](https://codebeat.co/badges/e96cada2-fb6f-4528-8285-7d72abd74e8d)](https://codebeat.co/projects/github-com-benbusby-shoogle-master)
![Docker Pulls](https://img.shields.io/docker/pulls/benbusby/whoogle-search)
Get Google search results, but without any ads, javascript, AMP links, cookies, or IP address tracking. Easily deployable in one click as a Docker app, and customizable with a single config file. Quick and simple to implement as a primary search engine replacement on both desktop and mobile. Get Google search results, but without any ads, javascript, AMP links, cookies, or IP address tracking. Easily deployable in one click as a Docker app, and customizable with a single config file. Quick and simple to implement as a primary search engine replacement on both desktop and mobile.
@ -127,11 +128,27 @@ sudo systemctl start whoogle
2. Clone and deploy the docker app using a method below: 2. Clone and deploy the docker app using a method below:
#### Docker CLI #### Docker CLI
Through Docker Hub:
```bash
docker pull benbusby/whoogle-search
docker run --publish 5000:5000 --detach --name whoogle-search whoogle-search:latest
```
or with docker-compose:
```bash ```bash
git clone https://github.com/benbusby/whoogle-search.git git clone https://github.com/benbusby/whoogle-search.git
cd whoogle-search cd whoogle-search
docker build --tag whooglesearch:1.0 . docker-compose up
docker run --publish 5000:5000 --detach --name whooglesearch whooglesearch:1.0 ```
or by building yourself:
```bash
git clone https://github.com/benbusby/whoogle-search.git
cd whoogle-search
docker build --tag whoogle-search:1.0 .
docker run --publish 5000:5000 --detach --name whoogle-search whoogle-search:1.0
``` ```
And kill with: `docker rm --force whooglesearch` And kill with: `docker rm --force whooglesearch`

View File

@ -78,7 +78,7 @@ class Filter:
# Special rebranding for image search results # Special rebranding for image search results
if img_src.startswith(LOGO_URL): if img_src.startswith(LOGO_URL):
img['src'] = '/static/img/logo.png' img['src'] = '/static/img/logo.png'
img['height'] = 40 img['style'] = 'height:40px;width:162px'
else: else:
img['src'] = BLANK_B64 img['src'] = BLANK_B64
@ -114,9 +114,15 @@ class Filter:
# Set up dark mode if active # Set up dark mode if active
if self.dark: if self.dark:
soup.find('html')['style'] = 'scrollbar-color: #333 #111;' soup.find('html')['style'] = 'scrollbar-color: #333 #111;color:#fff !important;background:#000 !important'
for input_element in soup.findAll('input'): for input_element in soup.findAll('input'):
input_element['style'] = 'color:#fff;' input_element['style'] = 'color:#fff;background:#000;'
for span_element in soup.findAll('span'):
span_element['style'] = 'color: white;'
for href_element in soup.findAll('a'):
href_element['style'] = 'color: white' if href_element['href'].startswith('/search') else ''
def update_links(self, soup): def update_links(self, soup):
# Replace hrefs with only the intended destination (no "utm" type tags) # Replace hrefs with only the intended destination (no "utm" type tags)