diff --git a/gid.py b/gid.py index b5f0076b..1e40cf42 100755 --- a/gid.py +++ b/gid.py @@ -1,7 +1,7 @@ #======================================================================= __version__ = '''0.0.01''' -__sub_version__ = '''20120317005456''' +__sub_version__ = '''20130319145754''' __copyright__ = '''(c) Alex A. Naanou 2011''' @@ -32,7 +32,7 @@ def image_gid(path, date=None, use_ctime=False, hash_func=sha.sha): ''' - Calgulate image GID. + Calculate image GID. Main gid criteria: - unique @@ -45,7 +45,7 @@ def image_gid(path, date=None, Example: Alex_A.Naanou-20110627-195706-DSC_1234 - If hash_func is not None, then the function will be used to henerate + If hash_func is not None, then the function will be used to generate a hex hash from the above string. Supported fields: diff --git a/index2.py b/index2.py index 5f6f8993..53c61c13 100755 --- a/index2.py +++ b/index2.py @@ -1,7 +1,7 @@ #======================================================================= __version__ = '''0.0.01''' -__sub_version__ = '''20120320010842''' +__sub_version__ = '''20130319002125''' __copyright__ = '''(c) Alex A. Naanou 2011''' @@ -24,6 +24,7 @@ from pprint import pprint from itertools import izip, izip_longest import pyexiv2 as metadata +import couchdb from pli.logictypes import ANY, OR @@ -270,7 +271,7 @@ if __name__ == '__main__': INDEX_PATH = config.get('INDEX_ROOT', os.path.join('test', 'index2')) - FILE_LIST = os.path.join('test', 'flatfilelist-P7000.json') + FILE_LIST = os.path.join('test', 'flatfilelist-P7000-new.json') ## FILE_LIST = os.path.join('test', 'flatfilelist-120kfiles.json') ## FILE_LIST = os.path.join('test', 'flatfilelist.json') BUILD_FILE_LIST = False if os.path.exists(FILE_LIST) else True diff --git a/ui/buildcache.py b/ui/buildcache.py index 20cf64b1..f6f5f29d 100755 --- a/ui/buildcache.py +++ b/ui/buildcache.py @@ -1,7 +1,7 @@ #======================================================================= __version__ = '''0.0.01''' -__sub_version__ = '''20121212171440''' +__sub_version__ = '''20130319144110''' __copyright__ = '''(c) Alex A. Naanou 2012''' @@ -123,6 +123,16 @@ def build_cache_dirs(path, config=config): os.makedirs(p) +# image format: +# { +# 'id': , +# 'preview': { +# : , +# ... +# }, +# 'path': +# } +# def build_index(path, images=None, count=None): ''' '''