diff --git a/.gitignore b/.gitignore index eb2b71e..4e761a3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,19 @@ -**/.DS_Store -**/*.pyc -**/config.ini +**.pyc **/node_modules/** +**.arw +**.dng +**/.DS_Store +**.mm +**.nef +**.rw2 +/.coverage +build/** dist/** docs/_build -build/** -**/*.arw -**/*.dng -**/*.nef -**/*.rw2 +docs/Odigi_data_scheme.odg env/** +/htmlcov +/photo +/resources +/Session.vim /tags diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 7b4aad7..0000000 --- a/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -FROM debian:jessie - -ENV DEBIAN_FRONTEND=noninteractive - -RUN apt-get update -y && \ - apt-get install -y --no-install-recommends ca-certificates libimage-exiftool-perl python2.7 python-pip python-pyexiv2 wget make && \ - pip install --upgrade pip setuptools && \ - apt-get autoremove -y && \ - rm -rf /var/lib/apt/lists/* - -RUN apt-get update -qq && \ - apt-get install -y locales -qq && \ - locale-gen en_US.UTF-8 en_us && \ - dpkg-reconfigure locales && \ - locale-gen C.UTF-8 && \ - /usr/sbin/update-locale LANG=C.UTF-8 - -ENV LANG C.UTF-8 -ENV LANGUAGE C.UTF-8 -ENV LC_ALL C.UTF-8 - -RUN wget http://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-10.20.tar.gz && \ - gzip -dc Image-ExifTool-10.20.tar.gz | tar -xf - && \ - cd Image-ExifTool-10.20 && perl Makefile.PL && \ - make install && cd ../ && rm -r Image-ExifTool-10.20 - -COPY requirements.txt /opt/elodie/requirements.txt -COPY docs/requirements.txt /opt/elodie/docs/requirements.txt -COPY elodie/tests/requirements.txt /opt/elodie/elodie/tests/requirements.txt -WORKDIR /opt/elodie -RUN pip install -r docs/requirements.txt && \ - pip install -r elodie/tests/requirements.txt && \ - rm -rf /root/.cache/pip - -COPY . /opt/elodie - -CMD ["/bin/bash"] diff --git a/elodie.spec b/elodie.spec deleted file mode 100644 index 5488e3d..0000000 --- a/elodie.spec +++ /dev/null @@ -1,33 +0,0 @@ -# -*- mode: python -*- - -block_cipher = None - - -a = Analysis(['elodie.py'], - pathex=['/Users/jaisenmathai/dev/tools/elodie'], - binaries=None, - datas=[('configs/ExifTool_config', 'configs')], - hiddenimports=[], - hookspath=None, - runtime_hooks=None, - excludes=None, - win_no_prefer_redirects=None, - win_private_assemblies=None, - cipher=block_cipher) -pyz = PYZ(a.pure, a.zipped_data, - cipher=block_cipher) -exe = EXE(pyz, - a.scripts, - exclude_binaries=True, - name='elodie', - debug=False, - strip=None, - upx=True, - console=True ) -coll = COLLECT(exe, - a.binaries, - a.zipfiles, - a.datas, - strip=None, - upx=True, - name='elodie') diff --git a/ordigi/exiftool.py b/ordigi/exiftool.py index 9fa1fed..07536a1 100644 --- a/ordigi/exiftool.py +++ b/ordigi/exiftool.py @@ -388,8 +388,8 @@ class ExifTool: class ExifToolCaching(ExifTool): """ Basic exiftool interface for reading and writing EXIF tags, with caching. - Use this only when you know the file's EXIF data will not be changed by any external process. - + Use this only when you know the file's EXIF data will not be changed by any external process. + Creates a singleton cached ExifTool instance """ _singletons = {} diff --git a/package.json b/package.json deleted file mode 100644 index bf98e20..0000000 --- a/package.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "elodie", - "version": "1.0.0", - "description": "GUI for Elodie", - "main": "app/index.js", - "dependencies": { - "menubar": "^2.3.0" - }, - "devDependencies": {}, - "scripts": { - "test": "electron app.js" - }, - "repository": { - "type": "git", - "url": "https://github.com/jmathai/elodie" - }, - "author": "Jaisen Mathai", - "license": "ISC", - "bugs": { - "url": "https://github.com/jmathai/elodie/issues" - }, - "homepage": "https://github.com/jmathai/elodie" -}