Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Python & web interface rewrites #57

Draft
wants to merge 45 commits into
base: master
Choose a base branch
from
Draft

Python & web interface rewrites #57

wants to merge 45 commits into from

Conversation

PhilippMundhenk
Copy link
Owner

@PhilippMundhenk PhilippMundhenk commented Oct 11, 2024 •
edited
Loading

This pull requests contains a complete rewrite of the scanning scripts in python, and a brand new web interface (frontend and backend).

Todo:

  • Merge web interface
  • Have web GUI call python instead of shell
  • sync scanner state between python and web

Test plan:

  • Scan with buttons (single page)
  • Scan with buttons (front & rear page)
  • Scan with web interface (single page)
  • Scan with web interface (front & rear page)
  • FTPS Upload
  • inotify
  • Telegram notification
  • OCR integration

vgarcia007 and others added 30 commits September 17, 2024 22:05
@vgarcia007
WIP: refactor frontend with routing because we need more api routes f…
f421230 
…or the file manipulation feature.

 - inject mod rewrite to webserver condig
 - moved function, config and classes to private directory
 - new try for timezone issue. writing it to config because lighttpd dosent hand over env vars to php
 - Dockerfile needed change for new dirs
@vgarcia007
separate js and css
87ba7aa
@vgarcia007
added routes
75383e3
@vgarcia007
common functions
5d633ae
@vgarcia007
routes for api and frontend
e32679c
@vgarcia007
A solution to keep the original date and time when renaming, without …
4d1fcdc 
…needing a database or similar. It's kind of a small hack, but I think it should work.
@vgarcia007
Many adjustments to ensure that the GUI behaves correctly when deleti…
4f408ca 
…ng and renaming files and provides feedback to the user.
@vgarcia007
trigger rename bash script
5447cc4
@vgarcia007
helper functions
348f08a
@vgarcia007
routs and error pages
99d08f9
@vgarcia007
Merge pull request #2 from PhilippMundhenk/master
8c56a62 
update from upstream
@vgarcia007
Merge branch 'fileops' into master
953a031
@vgarcia007
Merge pull request #3 from vgarcia007/master
2f1b900 
update with new commits
@vgarcia007
rewrite to index.php
e2fd41b
@vgarcia007
swagger for api endpoints
aba698e
@vgarcia007
mention swagger and api
a13aa18
@vgarcia007
changed my mind about this. removed bash in do it in php
7d9a553
@vgarcia007
temp extend sudo rights for www-data because of execution problems vi…
55d37f9 
…a php. lets wait and integrate the new python files and check if we can change it back
@vgarcia007
php can log to /var/log/scanner.log now
ffc227d
@pedropombeiro
Convert shell scripts to single Python script
a4d068c 
# Conflicts:
#	script/scanRear.sh
#	script/scantofile-0.2.4-1.sh
#	script/trigger_telegram.sh
@pedropombeiro
Add possibility to override brscan-skey.config
83664c0
@pedropombeiro
Completely remove shell scripts
d136280
@pedropombeiro
Lint with mypy
e92f98f
@pedropombeiro
Add linters to CI pipeline
729851c
@pedropombeiro
Remove no longer needed packages
17df94a
@pedropombeiro
Add back files/brscan-skey.config
1dffbf3
@pedropombeiro
Add back missing requests library
7ae89df
@pedropombeiro
Fix scanning of rear pages
ed7b136
@pedropombeiro
Fix page order
5210fef
@pedropombeiro
Rename scan_rear function to match filenames
0de5d6f
pedropombeiro and others added 15 commits October 7, 2024 22:45
@pedropombeiro
Try to fix OCR
665fa8c
@pedropombeiro
Handle cancelled scans
63efb30
@PhilippMundhenk
fixed premature exit
a2daf48 
made sure scan doesn't exit if telegram not found
@PhilippMundhenk
fixed curl call
da283d4
@PhilippMundhenk
fixed FTPS condition
2d8f3d2
@PhilippMundhenk
unifying style
6152198
@pedropombeiro
unifying style
69490bc
@PhilippMundhenk
Merge pull request #48 from PhilippMundhenk/pedropombeiro/convert-to-…
0cb8ebe 
…python3

Convert shell scripts to single Python script
@pedropombeiro
Fix API usage when NAME variable is customized
73a5be4
@PhilippMundhenk
fixed broken js
67e7ded
@PhilippMundhenk
more js fixes
727db35
@PhilippMundhenk
Merge pull request #56 from PhilippMundhenk/pedropombeiro/fix-api-usa…
93e6f9c 
…ge-with-custom-NAME-env-var

Fix api usage with custom name environment variable
@vgarcia007
merge conflictsMerge remote-tracking branch 'upstream/development' in…
8b9e29c 
…to fileops
@vgarcia007
Updated base image to python:slim-bookworm for PHP 8.2 support.
fdf7a2e 
Replaced bash calls in PHP scripts with Python.
@PhilippMundhenk
Merge pull request #32 from vgarcia007/fileops
3d2b7c7 
refactor frontend with routing because we need more api routes f…
@PhilippMundhenk PhilippMundhenk marked this pull request as ready for review November 9, 2024 12:12
@PhilippMundhenk PhilippMundhenk marked this pull request as draft November 9, 2024 12:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@PhilippMundhenk @pedropombeiro @vgarcia007