Add ocrd monitor and update controller and manager

slub · Feb 23, 2023 · 4f5b3c2 · 4f5b3c2
1 parent ab2ba02
commit 4f5b3c2
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,11 +1,17 @@
+[submodule "_modules/ocrd_controller"]
+	path = _modules/ocrd_controller
+	url = https://github.com/slub/ocrd_controller.git
+    branch = master
 [submodule "_modules/ocrd_manager"]
 	path = _modules/ocrd_manager
 	url = https://github.com/slub/ocrd_manager.git
 	branch = main
+[submodule "_modules/ocrd_monitor"]
+	path = _modules/ocrd_monitor
+	url = https://github.com/slub/ocrd_monitor.git
+	branch = main
 [submodule "_modules/kitodo-production-docker"]
 	path = _modules/kitodo-production-docker
 	url = https://github.com/slub/kitodo-production-docker
 	branch = main
-[submodule "_modules/ocrd_controller"]
-	path = _modules/ocrd_controller
-	url = https://github.com/slub/ocrd_controller.git
+
diff --git a/_modules/ocrd_controller b/_modules/ocrd_controller
diff --git a/_modules/ocrd_manager b/_modules/ocrd_manager
diff --git a/_modules/ocrd_monitor b/_modules/ocrd_monitor
+1 −0		.env.example
+25 −5		.github/workflows/publish.yml
+3 −0		Dockerfile
+2 −2		README.md
+2 −2		docker-compose.yml
+1 −1		ocrd_logging.conf
+6 −17		.github/workflows/publish.yml
+1 −0		.gitignore
+8 −0		Dockerfile
+0 −1		Dockerfile.monitor
+20 −21		Makefile
+10 −27		README.md
+0 −97		for_presentation.sh
+1 −0		for_presentation.sh
+0 −103		for_production.sh
+1 −0		for_production.sh
+10 −3		ocrd_lib.sh
+0 −8		ocrd_monitor/.env
+0 −34		ocrd_monitor/Dockerfile
+0 −43		ocrd_monitor/docker-compose.yml
+0 −59		ocrd_monitor/flask/app/__init__.py
+0 −13		ocrd_monitor/flask/app/index.py
+0 −106		ocrd_monitor/flask/app/job.py
+0 −23		ocrd_monitor/flask/app/logs.py
+0 −11		ocrd_monitor/flask/app/static/style.css
+0 −65		ocrd_monitor/flask/app/templates/base.html
+0 −13		ocrd_monitor/flask/app/templates/index/index.html
+0 −76		ocrd_monitor/flask/app/templates/jobs/index.html
+0 −9		ocrd_monitor/flask/app/templates/logs/view.html
+0 −9		ocrd_monitor/flask/app/templates/workflows/detail.html
+0 −13		ocrd_monitor/flask/app/templates/workspaces/index.html.j2
+0 −54		ocrd_monitor/flask/app/templates/workspaces/view_workspace.html.j2
+0 −19		ocrd_monitor/flask/app/workflow.py
+0 −76		ocrd_monitor/flask/app/workspaces.py
+0 −2		ocrd_monitor/flask/dev-requirements.txt
+0 −27		ocrd_monitor/flask/ocrdbrowser/__init__.py
+0 −80		ocrd_monitor/flask/ocrdbrowser/_browser.py
+0 −60		ocrd_monitor/flask/ocrdbrowser/_docker.py
+0 −32		ocrd_monitor/flask/ocrdbrowser/_port.py
+0 −72		ocrd_monitor/flask/ocrdbrowser/_subprocess.py
+0 −16		ocrd_monitor/flask/ocrdbrowser/_workspace.py
+0 −9		ocrd_monitor/flask/requirements.txt
+0 −4		ocrd_monitor/flask/test/__init__.py
+0 −0		ocrd_monitor/flask/test/ocrdbrowser/__init__.py
+0 −96		ocrd_monitor/flask/test/ocrdbrowser/test_launch.py
+0 −21		ocrd_monitor/flask/test/ocrdbrowser/test_workspace.py
+0 −6		ocrd_monitor/flask/test/ocrdbrowser_server/__init__.py
+0 −0		ocrd_monitor/flask/test/ocrdbrowser_server/browserfake/__init__.py
+0 −14		ocrd_monitor/flask/test/ocrdbrowser_server/browserfake/app.py
+0 −65		ocrd_monitor/flask/test/ocrdbrowser_server/browserfake/browserprocess.py
+0 −12		ocrd_monitor/flask/test/ocrdbrowser_server/browserfake/templates/index.html.j2
+0 −81		ocrd_monitor/flask/test/ocrdbrowser_server/run_server.py
+0 −21		ocrd_monitor/flask/test/ocrdbrowser_server/test_list_workspaces.py
+0 −97		ocrd_monitor/flask/test/ocrdbrowser_server/test_open_workspace.py
+0 −0		ocrd_monitor/flask/test/workspaces/a_workspace/mets.xml
+0 −0		ocrd_monitor/flask/test/workspaces/another workspace/mets.xml
+0 −0		ocrd_monitor/flask/test/workspaces/invalid_workspace/not_a_mets.xml
+0 −21		ocrd_monitor/init.sh
+103 −0		process_images.sh
+97 −0		process_mets.sh