Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

calibre-customize: When building plugins from a directory, exclude known version control subdirectories

Browse Source
This commit is contained in:
Kovid Goyal 2014-07-25 09:24:26 +05:30
parent d1674cc8a4
commit cdd267637b
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/customize/ui.py
View File

@ -619,7 +619,7 @@ def build_plugin(path):
raise SystemExit(1) raise SystemExit(1)
t = PersistentTemporaryFile(u'.zip') t = PersistentTemporaryFile(u'.zip')
with ZipFile(t, u'w', ZIP_STORED) as zf: with ZipFile(t, u'w', ZIP_STORED) as zf:
zf.add_dir(path) zf.add_dir(path, simple_filter=lambda x:x in {'.git', '.bzr', '.svn', '.hg'})
t.close() t.close()
plugin = add_plugin(t.name) plugin = add_plugin(t.name)
os.remove(t.name) os.remove(t.name)

6
src/calibre/utils/zipfile.py
View File

@ -1303,7 +1303,7 @@ class ZipFile:
self.filelist.append(zinfo) self.filelist.append(zinfo)
self.NameToInfo[zinfo.filename] = zinfo self.NameToInfo[zinfo.filename] = zinfo
def add_dir(self, path, prefix=''): def add_dir(self, path, prefix='', simple_filter=lambda x:False):
''' '''
Add a directory recursively to the zip file with an optional prefix. Add a directory recursively to the zip file with an optional prefix.
''' '''
@ -1314,9 +1314,11 @@ class ZipFile:
os.chdir(path) os.chdir(path)
fp = (prefix + ('/' if prefix else '')).replace('//', '/') fp = (prefix + ('/' if prefix else '')).replace('//', '/')
for f in os.listdir('.'): for f in os.listdir('.'):
if simple_filter(f): # Added by Kovid
continue
arcname = fp + f arcname = fp + f
if os.path.isdir(f): if os.path.isdir(f):
self.add_dir(f, prefix=arcname) self.add_dir(f, prefix=arcname, simple_filter=simple_filter)
else: else:
self.write(f, arcname) self.write(f, arcname)
finally: finally: