[PR #86] [MERGED] Project refactor (#85) -> master #784

New issue

Closed

opened 2026-02-25 20:36:42 +03:00 by kerem · 0 comments

kerem commented

2026-02-25 20:36:42 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/benbusby/whoogle-search/pull/86
Author: @benbusby
Created: 6/2/2020
Status: ✅ Merged
Merged: 6/11/2020
Merged by: @benbusby

Base: master ← Head: develop

📝 Commits (8)

b6fb472 Project refactor (#85)
64af72a Moved custom conf files to their own directory
32e837a Refactored whoogle session mgmt
6ec65f8 Reworked pytest client fixture to support new session mgmt
4324fcd Added better multilingual support, updated filter
f86a44b Removed no-cache enforcement, minor styling/formatting improvements
f7380ae Improving ad filtering for non-English languages
5f8309d Added footer to results page

📊 Changes

19 files changed (+484 additions, -223 deletions)

View changed files

📝 .gitignore (+4 -0)
📝 app/__init__.py (+19 -4)
📝 app/filter.py (+112 -83)
📝 app/request.py (+37 -36)
📝 app/routes.py (+105 -76)
📝 app/static/js/autocomplete.js (+1 -1)
📝 app/static/js/controller.js (+35 -0)
📝 app/templates/display.html (+8 -2)
📝 app/templates/header.html (+2 -2)
📝 app/templates/index.html (+9 -11)
➕ app/utils/__init__.py (+0 -0)
➕ app/utils/misc.py (+29 -0)
➕ app/utils/routing_utils.py (+72 -0)
📝 requirements.txt (+2 -1)
📝 setup.py (+1 -1)
📝 test/conftest.py (+7 -2)
➕ test/test_misc.py (+33 -0)
📝 test/test_results.py (+3 -3)
📝 test/test_routes.py (+5 -1)

📄 Description

Major refactor of requests and session management

Switches from pycurl to requests library
- Allows for less janky decoding, especially with non-latin character
  sets
Adds session level management of user configs
- Allows for each session to set its own config (people are probably
  going to complain about this, though not sure if it'll be the same
  number of people who are upset that their friends/family have to share
  their config)
Updates key gen/regen to more aggressively swap out keys after each
request

Added ability to save/load configs by name

New PUT method for config allows changing config with specified name
New methods in js controller to handle loading/saving of configs

Result formatting and removal of unused elements

Fixed question section formatting from results page (added appropriate
padding and made questions styled as italic)
Removed user agent display from main config settings

Minor change to button label
Fixed issue with "de-pickling" of flask session

Having a gitignore-everything ("") file within a flask session folder seems to cause a
weird bug where the state of the app becomes unusable from continuously
trying to prune files listed in the gitignore (and it can't prune '').

Switched to pickling saved configs
Updated ad/sponsored content filter and conf naming

Configs are now named with a .conf extension to allow for easier manual
cleanup/modification of named config files

Sponsored content now removed by basic string matching of span content

Version bump to 0.2.0
Fixed request.send return style

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/benbusby/whoogle-search/pull/86 **Author:** [@benbusby](https://github.com/benbusby) **Created:** 6/2/2020 **Status:** ✅ Merged **Merged:** 6/11/2020 **Merged by:** [@benbusby](https://github.com/benbusby) **Base:** `master` ← **Head:** `develop` --- ### 📝 Commits (8) - [`b6fb472`](https://github.com/benbusby/whoogle-search/commit/b6fb4723f9589e54ed55be2254ed7e70db519322) Project refactor (#85) - [`64af72a`](https://github.com/benbusby/whoogle-search/commit/64af72abb503023b4ca7e45f65d994d166f3ac3c) Moved custom conf files to their own directory - [`32e837a`](https://github.com/benbusby/whoogle-search/commit/32e837a5e08a6d6d44e4fa0a09e3696c28184619) Refactored whoogle session mgmt - [`6ec65f8`](https://github.com/benbusby/whoogle-search/commit/6ec65f8754c8e4bd40f304102a58ef596b8f8c1a) Reworked pytest client fixture to support new session mgmt - [`4324fcd`](https://github.com/benbusby/whoogle-search/commit/4324fcd8f8ea274b5e913840fd97c04465feb82a) Added better multilingual support, updated filter - [`f86a44b`](https://github.com/benbusby/whoogle-search/commit/f86a44b6372de257622821781bc852780bac0eaf) Removed no-cache enforcement, minor styling/formatting improvements - [`f7380ae`](https://github.com/benbusby/whoogle-search/commit/f7380ae15dbfc8f1d3a71d42c330e7827870f7a3) Improving ad filtering for non-English languages - [`5f8309d`](https://github.com/benbusby/whoogle-search/commit/5f8309d2f0aa484b8c32aff70ffbbe75b18555a9) Added footer to results page ### 📊 Changes **19 files changed** (+484 additions, -223 deletions) <details> <summary>View changed files</summary> 📝 `.gitignore` (+4 -0) 📝 `app/__init__.py` (+19 -4) 📝 `app/filter.py` (+112 -83) 📝 `app/request.py` (+37 -36) 📝 `app/routes.py` (+105 -76) 📝 `app/static/js/autocomplete.js` (+1 -1) 📝 `app/static/js/controller.js` (+35 -0) 📝 `app/templates/display.html` (+8 -2) 📝 `app/templates/header.html` (+2 -2) 📝 `app/templates/index.html` (+9 -11) ➕ `app/utils/__init__.py` (+0 -0) ➕ `app/utils/misc.py` (+29 -0) ➕ `app/utils/routing_utils.py` (+72 -0) 📝 `requirements.txt` (+2 -1) 📝 `setup.py` (+1 -1) 📝 `test/conftest.py` (+7 -2) ➕ `test/test_misc.py` (+33 -0) 📝 `test/test_results.py` (+3 -3) 📝 `test/test_routes.py` (+5 -1) </details> ### 📄 Description * Major refactor of requests and session management - Switches from pycurl to requests library - Allows for less janky decoding, especially with non-latin character sets - Adds session level management of user configs - Allows for each session to set its own config (people are probably going to complain about this, though not sure if it'll be the same number of people who are upset that their friends/family have to share their config) - Updates key gen/regen to more aggressively swap out keys after each request * Added ability to save/load configs by name - New PUT method for config allows changing config with specified name - New methods in js controller to handle loading/saving of configs * Result formatting and removal of unused elements - Fixed question section formatting from results page (added appropriate padding and made questions styled as italic) - Removed user agent display from main config settings * Minor change to button label * Fixed issue with "de-pickling" of flask session Having a gitignore-everything ("*") file within a flask session folder seems to cause a weird bug where the state of the app becomes unusable from continuously trying to prune files listed in the gitignore (and it can't prune '*'). * Switched to pickling saved configs * Updated ad/sponsored content filter and conf naming Configs are now named with a .conf extension to allow for easier manual cleanup/modification of named config files Sponsored content now removed by basic string matching of span content * Version bump to 0.2.0 * Fixed request.send return style --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>