Skip to content

pull latest from ollisGit #1

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

Merged
merged 13 commits into from
Mar 7, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 @@ -7,3 +7,4 @@ dist
*.egg*
.DS_Store
*.zip
.venv
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
script:
# debug - echo 'Hello World'
- export PLUGIN_VERSION=$(cat setup.py | grep 'plugin_version = "*"' | cut -d '"' -f2)
- zip -r master *
- zip -r master.zip * -x 3rdPartySoftware\* testdata\*
# debug - ls -al

## see "Fix travis automatic build and deploy"
Expand Down
31 changes: 21 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
[![Released](https://img.shields.io/badge/dynamic/json.svg?color=brightgreen&label=released&url=https://api.github.com/repos/OllisGit/OctoPrint-SpoolManager/releases&query=$[0].published_at)]()
![GitHub Releases (by Release)](https://img.shields.io/github/downloads/OllisGit/OctoPrint-SpoolManager/latest/total.svg)



The OctoPrint-Plugin manages all spool informations and stores it in a database.

#### Support my Efforts
Expand All @@ -15,6 +13,11 @@ If you like it, I would be thankful about a cup of coffee :)

[![More coffee, more code](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=6SW5R6ZUKLB5E&source=url)

## Tested with:
- OctoPrint 1.5.2: with Python 3.6.8 and Python 2.7.9
- OctoPrint 1.4.2: OPEN


## Included features

### Basic attributes to be captured:
Expand All @@ -24,7 +27,6 @@ If you like it, I would be thankful about a cup of coffee :)
- [X] CSV Export of "Legacy FilamentManager-Database" and SpoolManager
- [X] CSV Import function
- [ ] Labels
- [ ] Provide "APIs" for [PrintJobHistory-Plugin](https://github.com/OllisGit/OctoPrint-PrintJobHistory)

### UI features
- [X] Better error-feedback (more then just the "happy-path")
Expand All @@ -36,16 +38,15 @@ If you like it, I would be thankful about a cup of coffee :)
- [X] Force to select a spool before printing
- [X] Warn if not enough filament is present
- [X] Filter spool table
- [X] Table column visibility
- [X] Scan QR/Barcodes of a spool

## Planning

## Planning / next features
- [ ] External Database (IN PROGRESS)
- [ ] PrintJobHistory integration [PrintJobHistory-Plugin](https://github.com/OllisGit/OctoPrint-PrintJobHistory)
- [ ] Multi Tool support
- [ ] External Database
- [ ] Table column visibility
- [ ] Capture Spool-Image
- [ ] Scan QR/Barcodes of a spool

more planing details could be found [here](https://github.com/OllisGit/OctoPrint-SpoolManager/projects/1)
- [ ] ...more planing details could be found [here](https://github.com/OllisGit/OctoPrint-SpoolManager/projects/1)

## Screenshots
<!---
Expand Down Expand Up @@ -91,3 +92,13 @@ select2 https://select2.org/

* WYSIWYG - Editor
quill https://quilljs.com/

------
docker-compose up
_

docker-compose down --volumes
_

docker-compose run postgres bash

31 changes: 31 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
version: '3'
services:
postgres:
image: "postgres" # use latest official postgres version
# env_file:
# - database.env # configure postgres
volumes:
- postgres-data:/var/lib/postgresql/data/ # persist data even if container shuts down
ports:
- 5432:5432
environment:
- POSTGRES_DB=spoolmanagerdb
- POSTGRES_USER=Olli
- POSTGRES_PASSWORD=illO

mysql:
image: mysql:5.7
volumes:
- mysql-db:/var/lib/mysql
ports:
- 3306:3306
restart: always
environment:
- MYSQL_DATABASE=spoolmanagerdb
- MYSQL_ROOT_PASSWORD=illO
- MYSQL_USER=Olli
- MYSQL_PASSWORD=illO

volumes:
postgres-data: # named volumes can be managed easier using docker-compose
mysql-db:
Loading