1.1 --- a/merge.py Sat Nov 02 01:24:31 2013 +0100
1.2 +++ b/merge.py Sat Nov 02 01:38:43 2013 +0100
1.3 @@ -33,7 +33,7 @@
1.4 for path, dirnames, filenames in walk(package):
1.5 path = relpath(path, package)
1.6 for filename in filenames:
1.7 - results.append(join(path, filename))
1.8 + results.append(normpath(join(path, filename)))
1.9 return results
1.10
1.11 # Main program.
1.12 @@ -110,7 +110,7 @@
1.13 if is_zipfile:
1.14 zf.extract(filename, outdir)
1.15 else:
1.16 - target = normpath(join(outdir, leafname, filename))
1.17 + target = join(outdir, leafname, filename)
1.18 target_dir = split(target)[0]
1.19 if not exists(target_dir):
1.20 makedirs(target_dir)
1.21 @@ -134,10 +134,6 @@
1.22 try:
1.23 write("MoinMoinPackage|1\n")
1.24 for entry in entries:
1.25 -
1.26 - # Reference the adjusted location of each file.
1.27 -
1.28 - entry[1] = join(outleafname, entry[1])
1.29 write("|".join(entry) + "\n")
1.30 finally:
1.31 f.close()
1.32 @@ -147,8 +143,13 @@
1.33 page_package = ZipFile(package_zip, "w")
1.34
1.35 try:
1.36 + page_package.write(join(outdir, "MOIN_PACKAGE"), "MOIN_PACKAGE")
1.37 +
1.38 for filename in get_filenames(outdir):
1.39 - page_package.write(join(outleafname, filename))
1.40 + if split(filename)[-1] == "MOIN_PACKAGE":
1.41 + continue
1.42 +
1.43 + page_package.write(join(outleafname, filename), filename)
1.44 finally:
1.45 page_package.close()
1.46