flynx/ImageGrid
1
1
Fork 0
mirror of https://github.com/flynx/ImageGrid.git synced 2025-10-29 02:10:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor fixes, mostly removing manual extension processing... also added __iter__ to index.Index, still needs testing.

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2011-12-06 22:21:59 +04:00
parent 6b843421a5
commit 9a220aaf46
1 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
index.py
View File

@ -1,7 +1,7 @@
#======================================================================= #=======================================================================
__version__ = '''0.0.01''' __version__ = '''0.0.01'''
__sub_version__ = '''20111206220152''' __sub_version__ = '''20111206222027'''
__copyright__ = '''(c) Alex A. Naanou 2011''' __copyright__ = '''(c) Alex A. Naanou 2011'''
@ -270,14 +270,14 @@ def load_file_index(path, ext='.json', pack_ext='.pack'):
for f in files: for f in files:
# handle single files... # handle single files...
if f.endswith(ext): if f.endswith(ext):
d[f.split('.')[0]] = json.load(file(os.path.join(p, f))) d[os.path.splitext(f)[0]] = json.load(file(os.path.join(p, f)))
# handle packs... # handle packs...
elif f.endswith(pack_ext): elif f.endswith(pack_ext):
pack = zipfile.ZipFile(os.path.join(p, f)) pack = zipfile.ZipFile(os.path.join(p, f))
# load elements form the pack... # load elements form the pack...
for name in pack.namelist(): for name in pack.namelist():
if name.endswith(ext): if name.endswith(ext):
d[name.split('.')[0]] = json.loads(pack.read(name)) d[os.path.splitext(name)[0]] = json.loads(pack.read(name))
return d return d
@ -314,6 +314,9 @@ import pli.pattern.mixin.mapping as mapping
# XXX might be good to do a path index... # XXX might be good to do a path index...
class Index(mapping.Mapping): class Index(mapping.Mapping):
__json_ext__ = '.json'
__pack_ext__ = '.pack'
def __init__(self, path): def __init__(self, path):
''' '''
''' '''
@ -321,8 +324,8 @@ class Index(mapping.Mapping):
def __getitem__(self, name): def __getitem__(self, name):
''' '''
''' '''
ext = '.json' ext = self.__json_ext__
pack_ext = '.pack' pack_ext = self.__pack_ext__
file_name = name + ext file_name = name + ext
# build probable locations... # build probable locations...
locations = ( locations = (
@ -335,7 +338,9 @@ class Index(mapping.Mapping):
if os.path.exists(os.path.join(self._path, n)): if os.path.exists(os.path.join(self._path, n)):
return json.load(file(os.path.join(self._path, n))) return json.load(file(os.path.join(self._path, n)))
# try and locate a file in a pack... # try and locate a file in a pack...
for p, d, files in os.walk(self.path): for p, _, files in os.walk(self._path):
# files are searched sorted by their name...
files.sort()
for f in files: for f in files:
## ##!!! do we need to look in odd named directories... ## ##!!! do we need to look in odd named directories...
## if f == file_name: ## if f == file_name:
@ -348,11 +353,32 @@ class Index(mapping.Mapping):
## def __setitem__(self, name, value): ## def __setitem__(self, name, value):
## ''' ## '''
## ''' ## '''
## pass ## raise NotImplementedError
def __delitem__(self, name): def __delitem__(self, name):
''' '''
''' '''
pass raise NotImplementedError
def __iter__(self):
'''
'''
visited = []
packs = []
ext = self.__json_ext__
pack_ext = self.__pack_ext__
for p, _, files in os.walk(self._path):
for f in files:
if f.endswith(ext) and f not in visited:
visited += [f]
yield os.path.splitext(f)[0]
elif f.endswith(pack_ext):
packs += [os.path.join(p, f)]
for pack in packs:
z = zipfile.ZipFile(pack)
for name in z.namelist():
if name not in visited:
visited += [name]
yield os.path.splitext(name)[0]