Rename dozo to ordigi
This commit is contained in:
		
							parent
							
								
									817b84152f
								
							
						
					
					
						commit
						11ad41da09
					
				@ -6,10 +6,10 @@ from pathlib import Path
 | 
				
			|||||||
import shutil
 | 
					import shutil
 | 
				
			||||||
import tempfile
 | 
					import tempfile
 | 
				
			||||||
 | 
					
 | 
				
			||||||
from dozo import config
 | 
					from ordigi import config
 | 
				
			||||||
from dozo.exiftool import _ExifToolProc
 | 
					from ordigi.exiftool import _ExifToolProc
 | 
				
			||||||
 | 
					
 | 
				
			||||||
DOZO_PATH = Path(__file__).parent.parent
 | 
					ORDIGI_PATH = Path(__file__).parent.parent
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@pytest.fixture(autouse=True)
 | 
					@pytest.fixture(autouse=True)
 | 
				
			||||||
def reset_singletons():
 | 
					def reset_singletons():
 | 
				
			||||||
@ -18,8 +18,8 @@ def reset_singletons():
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
def copy_sample_files():
 | 
					def copy_sample_files():
 | 
				
			||||||
    src_path = tempfile.mkdtemp(prefix='dozo-src')
 | 
					    src_path = tempfile.mkdtemp(prefix='ordigi-src')
 | 
				
			||||||
    paths = Path(DOZO_PATH, 'samples/test_exif').glob('*')
 | 
					    paths = Path(ORDIGI_PATH, 'samples/test_exif').glob('*')
 | 
				
			||||||
    file_paths = [x for x in paths if x.is_file()]
 | 
					    file_paths = [x for x in paths if x.is_file()]
 | 
				
			||||||
    for file_path in file_paths:
 | 
					    for file_path in file_paths:
 | 
				
			||||||
        source_path = Path(src_path, file_path.name)
 | 
					        source_path = Path(src_path, file_path.name)
 | 
				
			||||||
@ -30,7 +30,7 @@ def copy_sample_files():
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
@pytest.fixture(scope="module")
 | 
					@pytest.fixture(scope="module")
 | 
				
			||||||
def conf_path():
 | 
					def conf_path():
 | 
				
			||||||
    tmp_path = tempfile.mkdtemp(prefix='dozo-')
 | 
					    tmp_path = tempfile.mkdtemp(prefix='ordigi-')
 | 
				
			||||||
    conf = RawConfigParser() 
 | 
					    conf = RawConfigParser() 
 | 
				
			||||||
    conf['Path'] = {
 | 
					    conf['Path'] = {
 | 
				
			||||||
            'day_begins': '4',
 | 
					            'day_begins': '4',
 | 
				
			||||||
@ -40,7 +40,7 @@ def conf_path():
 | 
				
			|||||||
    conf['Geolocation'] = {
 | 
					    conf['Geolocation'] = {
 | 
				
			||||||
            'geocoder': 'Nominatium'
 | 
					            'geocoder': 'Nominatium'
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
    conf_path = Path(tmp_path, "dozo.conf")
 | 
					    conf_path = Path(tmp_path, "ordigi.conf")
 | 
				
			||||||
    config.write(conf_path, conf)
 | 
					    config.write(conf_path, conf)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    yield conf_path
 | 
					    yield conf_path
 | 
				
			||||||
 | 
				
			|||||||
@ -4,7 +4,7 @@ import shutil
 | 
				
			|||||||
import tempfile
 | 
					import tempfile
 | 
				
			||||||
from unittest import mock
 | 
					from unittest import mock
 | 
				
			||||||
 | 
					
 | 
				
			||||||
from dozo import config
 | 
					from ordigi import config
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Helpers
 | 
					# Helpers
 | 
				
			||||||
import random
 | 
					import random
 | 
				
			||||||
 | 
				
			|||||||
@ -2,7 +2,7 @@ import pytest
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
CONTENT = "content"
 | 
					CONTENT = "content"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class TestDozo:
 | 
					class TestOrdigi:
 | 
				
			||||||
    @pytest.mark.skip()
 | 
					    @pytest.mark.skip()
 | 
				
			||||||
    def test__sort(self):
 | 
					    def test__sort(self):
 | 
				
			||||||
        assert 0
 | 
					        assert 0
 | 
				
			||||||
 | 
				
			|||||||
@ -1,8 +1,8 @@
 | 
				
			|||||||
import json
 | 
					import json
 | 
				
			||||||
import pytest
 | 
					import pytest
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import dozo.exiftool
 | 
					import ordigi.exiftool
 | 
				
			||||||
from dozo.exiftool import get_exiftool_path
 | 
					from ordigi.exiftool import get_exiftool_path
 | 
				
			||||||
 | 
					
 | 
				
			||||||
TEST_FILE_ONE_KEYWORD = "samples/images/wedding.jpg"
 | 
					TEST_FILE_ONE_KEYWORD = "samples/images/wedding.jpg"
 | 
				
			||||||
TEST_FILE_BAD_IMAGE = "samples/images/badimage.jpeg"
 | 
					TEST_FILE_BAD_IMAGE = "samples/images/badimage.jpeg"
 | 
				
			||||||
@ -103,86 +103,86 @@ if exiftool is None:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
def test_get_exiftool_path():
 | 
					def test_get_exiftool_path():
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    exiftool = dozo.exiftool.get_exiftool_path()
 | 
					    exiftool = ordigi.exiftool.get_exiftool_path()
 | 
				
			||||||
    assert exiftool is not None
 | 
					    assert exiftool is not None
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
def test_version():
 | 
					def test_version():
 | 
				
			||||||
    exif = dozo.exiftool.ExifTool(TEST_FILE_ONE_KEYWORD)
 | 
					    exif = ordigi.exiftool.ExifTool(TEST_FILE_ONE_KEYWORD)
 | 
				
			||||||
    assert exif.version is not None
 | 
					    assert exif.version is not None
 | 
				
			||||||
    assert isinstance(exif.version, str)
 | 
					    assert isinstance(exif.version, str)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
def test_read():
 | 
					def test_read():
 | 
				
			||||||
    exif = dozo.exiftool.ExifTool(TEST_FILE_ONE_KEYWORD)
 | 
					    exif = ordigi.exiftool.ExifTool(TEST_FILE_ONE_KEYWORD)
 | 
				
			||||||
    assert exif.data["File:MIMEType"] == "image/jpeg"
 | 
					    assert exif.data["File:MIMEType"] == "image/jpeg"
 | 
				
			||||||
    assert exif.data["EXIF:ISO"] == 160
 | 
					    assert exif.data["EXIF:ISO"] == 160
 | 
				
			||||||
    assert exif.data["IPTC:Keywords"] == "wedding"
 | 
					    assert exif.data["IPTC:Keywords"] == "wedding"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
def test_singleton():
 | 
					def test_singleton():
 | 
				
			||||||
    exif1 = dozo.exiftool.ExifTool(TEST_FILE_ONE_KEYWORD)
 | 
					    exif1 = ordigi.exiftool.ExifTool(TEST_FILE_ONE_KEYWORD)
 | 
				
			||||||
    exif2 = dozo.exiftool.ExifTool(TEST_FILE_MULTI_KEYWORD)
 | 
					    exif2 = ordigi.exiftool.ExifTool(TEST_FILE_MULTI_KEYWORD)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    assert exif1._process.pid == exif2._process.pid
 | 
					    assert exif1._process.pid == exif2._process.pid
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
def test_pid():
 | 
					def test_pid():
 | 
				
			||||||
    exif1 = dozo.exiftool.ExifTool(TEST_FILE_ONE_KEYWORD)
 | 
					    exif1 = ordigi.exiftool.ExifTool(TEST_FILE_ONE_KEYWORD)
 | 
				
			||||||
    assert exif1.pid == exif1._process.pid
 | 
					    assert exif1.pid == exif1._process.pid
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
def test_exiftoolproc_process():
 | 
					def test_exiftoolproc_process():
 | 
				
			||||||
    exif1 = dozo.exiftool.ExifTool(TEST_FILE_ONE_KEYWORD)
 | 
					    exif1 = ordigi.exiftool.ExifTool(TEST_FILE_ONE_KEYWORD)
 | 
				
			||||||
    assert exif1._exiftoolproc.process is not None
 | 
					    assert exif1._exiftoolproc.process is not None
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
def test_exiftoolproc_exiftool():
 | 
					def test_exiftoolproc_exiftool():
 | 
				
			||||||
    exif1 = dozo.exiftool.ExifTool(TEST_FILE_ONE_KEYWORD)
 | 
					    exif1 = ordigi.exiftool.ExifTool(TEST_FILE_ONE_KEYWORD)
 | 
				
			||||||
    assert exif1._exiftoolproc.exiftool == dozo.exiftool.get_exiftool_path()
 | 
					    assert exif1._exiftoolproc.exiftool == ordigi.exiftool.get_exiftool_path()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
def test_as_dict():
 | 
					def test_as_dict():
 | 
				
			||||||
    exif1 = dozo.exiftool.ExifTool(TEST_FILE_ONE_KEYWORD)
 | 
					    exif1 = ordigi.exiftool.ExifTool(TEST_FILE_ONE_KEYWORD)
 | 
				
			||||||
    exifdata = exif1.asdict()
 | 
					    exifdata = exif1.asdict()
 | 
				
			||||||
    assert exifdata["XMP:TagsList"] == "wedding"
 | 
					    assert exifdata["XMP:TagsList"] == "wedding"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
def test_as_dict_normalized():
 | 
					def test_as_dict_normalized():
 | 
				
			||||||
    exif1 = dozo.exiftool.ExifTool(TEST_FILE_ONE_KEYWORD)
 | 
					    exif1 = ordigi.exiftool.ExifTool(TEST_FILE_ONE_KEYWORD)
 | 
				
			||||||
    exifdata = exif1.asdict(normalized=True)
 | 
					    exifdata = exif1.asdict(normalized=True)
 | 
				
			||||||
    assert exifdata["xmp:tagslist"] == "wedding"
 | 
					    assert exifdata["xmp:tagslist"] == "wedding"
 | 
				
			||||||
    assert "XMP:TagsList" not in exifdata
 | 
					    assert "XMP:TagsList" not in exifdata
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
def test_as_dict_no_tag_groups():
 | 
					def test_as_dict_no_tag_groups():
 | 
				
			||||||
    exif1 = dozo.exiftool.ExifTool(TEST_FILE_ONE_KEYWORD)
 | 
					    exif1 = ordigi.exiftool.ExifTool(TEST_FILE_ONE_KEYWORD)
 | 
				
			||||||
    exifdata = exif1.asdict(tag_groups=False)
 | 
					    exifdata = exif1.asdict(tag_groups=False)
 | 
				
			||||||
    assert exifdata["TagsList"] == "wedding"
 | 
					    assert exifdata["TagsList"] == "wedding"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
def test_json():
 | 
					def test_json():
 | 
				
			||||||
    exif1 = dozo.exiftool.ExifTool(TEST_FILE_ONE_KEYWORD)
 | 
					    exif1 = ordigi.exiftool.ExifTool(TEST_FILE_ONE_KEYWORD)
 | 
				
			||||||
    exifdata = json.loads(exif1.json())
 | 
					    exifdata = json.loads(exif1.json())
 | 
				
			||||||
    assert exifdata[0]["XMP:TagsList"] == "wedding"
 | 
					    assert exifdata[0]["XMP:TagsList"] == "wedding"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
def test_str():
 | 
					def test_str():
 | 
				
			||||||
    exif1 = dozo.exiftool.ExifTool(TEST_FILE_ONE_KEYWORD)
 | 
					    exif1 = ordigi.exiftool.ExifTool(TEST_FILE_ONE_KEYWORD)
 | 
				
			||||||
    assert "file: " in str(exif1)
 | 
					    assert "file: " in str(exif1)
 | 
				
			||||||
    assert "exiftool: " in str(exif1)
 | 
					    assert "exiftool: " in str(exif1)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
def test_exiftool_terminate():
 | 
					def test_exiftool_terminate():
 | 
				
			||||||
    """ Test that exiftool process is terminated when exiftool.terminate() is called """
 | 
					    """ Test that exiftool process is terminated when exiftool.terminate() is called """
 | 
				
			||||||
    exif1 = dozo.exiftool.ExifTool(TEST_FILE_ONE_KEYWORD)
 | 
					    exif1 = ordigi.exiftool.ExifTool(TEST_FILE_ONE_KEYWORD)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    assert dozo.exiftool.exiftool_is_running()
 | 
					    assert ordigi.exiftool.exiftool_is_running()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    dozo.exiftool.terminate_exiftool()
 | 
					    ordigi.exiftool.terminate_exiftool()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    assert not dozo.exiftool.exiftool_is_running()
 | 
					    assert not ordigi.exiftool.exiftool_is_running()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    # verify we can create a new instance after termination
 | 
					    # verify we can create a new instance after termination
 | 
				
			||||||
    exif2 = dozo.exiftool.ExifTool(TEST_FILE_ONE_KEYWORD)
 | 
					    exif2 = ordigi.exiftool.ExifTool(TEST_FILE_ONE_KEYWORD)
 | 
				
			||||||
    assert exif2.asdict()["IPTC:Keywords"] == "wedding"
 | 
					    assert exif2.asdict()["IPTC:Keywords"] == "wedding"
 | 
				
			||||||
 | 
				
			|||||||
@ -8,11 +8,11 @@ from sys import platform
 | 
				
			|||||||
from time import sleep
 | 
					from time import sleep
 | 
				
			||||||
 | 
					
 | 
				
			||||||
from .conftest import copy_sample_files
 | 
					from .conftest import copy_sample_files
 | 
				
			||||||
from dozo import constants
 | 
					from ordigi import constants
 | 
				
			||||||
from dozo.database import Db
 | 
					from ordigi.database import Db
 | 
				
			||||||
from dozo.filesystem import FileSystem
 | 
					from ordigi.filesystem import FileSystem
 | 
				
			||||||
from dozo.media.media import Media
 | 
					from ordigi.media import Media
 | 
				
			||||||
from dozo.exiftool import ExifToolCaching, exiftool_is_running, terminate_exiftool
 | 
					from ordigi.exiftool import ExifToolCaching, exiftool_is_running, terminate_exiftool
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@pytest.mark.skip()
 | 
					@pytest.mark.skip()
 | 
				
			||||||
 | 
				
			|||||||
@ -6,14 +6,12 @@ import shutil
 | 
				
			|||||||
import tempfile
 | 
					import tempfile
 | 
				
			||||||
 | 
					
 | 
				
			||||||
from .conftest import copy_sample_files
 | 
					from .conftest import copy_sample_files
 | 
				
			||||||
from dozo import constants
 | 
					from ordigi import constants
 | 
				
			||||||
from dozo.media.media import Media
 | 
					from ordigi.media import Media
 | 
				
			||||||
from dozo.media.audio import Audio
 | 
					from ordigi.images import Images
 | 
				
			||||||
from dozo.media.photo import Photo
 | 
					from ordigi.exiftool import ExifTool, ExifToolCaching
 | 
				
			||||||
from dozo.media.video import Video
 | 
					 | 
				
			||||||
from dozo.exiftool import ExifTool, ExifToolCaching
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
DOZO_PATH = Path(__file__).parent.parent
 | 
					ORDIGI_PATH = Path(__file__).parent.parent
 | 
				
			||||||
CACHING = True
 | 
					CACHING = True
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class TestMetadata:
 | 
					class TestMetadata:
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user