From: Jonathan Dieter <jdieter@gmail.com>
Date: Thu, 9 Aug 2018 11:54:40 +0000 (+0200)
Subject: Clean up dictionary generation script
X-Git-Tag: archive/raspbian/1.1.9+ds1-1+rpi1~1^2~131
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=335f68305db901ed232a304b9bbd6192b64c1cb5;p=zchunk.git

Clean up dictionary generation script

Signed-off-by: Jonathan Dieter <jdieter@gmail.com>
---

diff --git a/contrib/gen_xml_dictionary b/contrib/gen_xml_dictionary
index e69bcac..057c36a 100755
--- a/contrib/gen_xml_dictionary
+++ b/contrib/gen_xml_dictionary
@@ -1,14 +1,8 @@
 #!/usr/bin/python3
 
 import re
-import sys
-import os.path
-import os
-import subprocess
-import argparse
-import shutil
-import tempfile
-import shutil
+import sys, os, os.path, subprocess
+import argparse, tempfile, shutil
 
 parser = argparse.ArgumentParser(description="Creates a zstd dictionary from a file that will be chunked")
 parser.add_argument("split_string", help="String to use to split the file(s)")
@@ -24,6 +18,8 @@ try:
     dict_file = os.path.basename(args.file[0]).split(".")[0] + ".dict"
 except KeyError:
     dict_file = os.path.basename(args.file[0]) + ".dict"
+
+# Split file into chunks and store them in a temporary directory
 for fn in args.file:
     f = open(fn, 'r')
     data = f.read()
@@ -39,6 +35,7 @@ for fn in args.file:
         f.close()
         count += 1
 
+# Create dictionary from chunks in the temporary directory
 filelist = os.listdir(temp_dir)
 filelist = ["%s/%s" % (temp_dir, f) for f in filelist]
 run_cmd = ["zstd", "--train"] + filelist + ["-o", dict_file, "--maxdict=%i" % args.size]
@@ -48,4 +45,3 @@ try:
 except subprocess.CalledProcessError:
     shutil.rmtree(temp_dir)
     sys.exit(1)
-