More uniform asset handling by ocrd-assets itself

Author: kba

.gitignore

@@ -117,3 +117,5 @@ gh-pages
 test/assets/kant_aufklaerung_1784
 test/assets/00000001.jpg
 test/assets/test.ocrd.zip
+test/assets
+OLD.*

Makefile

@@ -16,13 +16,13 @@ help:
 	@echo "    deps-ubuntu    Dependencies for deployment in an ubuntu/debian linux"
 	@echo "    deps-pip       Install python deps via pip"
 	@echo "    assets         Clone the ocrd-assets repo for sample files"
+	@echo "    assets-server  Start asset server at http://localhost:5001"
 	@echo "    assets-clean   Remove symlinks in test/assets"
 	@echo "    install        (Re)install the tool"
 	@echo "    test-deps-pip  Install test python deps via pip"
 	@echo "    test           Run all unit tests"
 	@echo "    docs           Build documentation"
 	@echo "    docs-clean     Clean docs"
-	@echo "    asset-server   Start asset server at http://localhost:5001"
 	@echo "    docker         Build docker image"
 	@echo ""
 	@echo "  Variables"
@@ -46,29 +46,36 @@ deps-ubuntu:
 deps-pip:
 	$(PIP) install -r requirements.txt
 
+# (Re)install the tool
+install:
+	$(PIP) install .
+
+#
+# Assets
+#
+
 # Clone the ocrd-assets repo for sample files
-assets:
-	if [ ! -e ocrd-assets ];then git clone https://github.com/OCR-D/ocrd-assets;fi
+assets: ocrd-assets test/assets
+
+ocrd-assets:
+	git clone https://github.com/OCR-D/ocrd-assets
+
+test/assets:
 	mkdir -p test/assets
 	cp -r -t test/assets ocrd-assets/data/*
-	# cd test/assets && ln -fs ../../ocrd-assets/data/* .
+
+# Start asset server at http://localhost:5001
+assets-server:
+	cd ocrd-assets && make start
 
 # Remove symlinks in test/assets
 assets-clean:
 	rm -rf test/assets
 
-# (Re)install the tool
-install:
-	$(PIP) install .
-
 #
 # Tests
 #
 
-test/assets: spec
-	mkdir -p test/assets
-	cp -r spec/io/example test/assets/herold
-
 # Install test python deps via pip
 test-deps-pip:
 	$(PIP) install -r requirements_test.txt
@@ -110,10 +117,6 @@ test-profile:
 	$(PYTHON) -m cProfile -o profile $$(which pytest)
 	$(PYTHON) analyze_profile.py
 
-# Start asset server at http://localhost:5001
-asset-server:
-	cd ocrd-assets && make start
-
 #
 # Docker
 #

test/base.py

@@ -1,25 +1,9 @@
+# pylint: disable=unused-import
+
 import os
 import sys
+from unittest import TestCase, skip, main
 
-from unittest import TestCase, skip, main # pylint: disable=unused-import
-
-PWD = os.path.dirname(os.path.realpath(__file__))
-sys.path.append(PWD + '/../ocrd')
-
-class Assets(object):
-
-    def __init__(self, baseurl=None):
-        if baseurl is None:
-            baseurl = 'file://' + PWD + '/assets/'
-        self.baseurl = baseurl
-
-    def url_of(self, path, baseurl=None):
-        if baseurl is None:
-            baseurl = self.baseurl
-        return self.baseurl + path
-
+from test.assets import assets
 
-_baseurl = None
-if 'OCRD_BASEURL' in os.environ:
-    _baseurl = os.environ['OCRD_BASEURL']
-assets = Assets(baseurl=_baseurl)
+sys.path.append(os.path.dirname(os.path.realpath(__file__)) + '/../ocrd')