Fixed folder reading

This commit is contained in:
Oscar G.G 2014-11-11 22:41:58 +01:00
parent 6ebc607ae6
commit 4ff12be55d

View File

@ -12,30 +12,16 @@ def print_err(message):
execute(">&2 echo \""+message+"\"") execute(">&2 echo \""+message+"\"")
def print_usage(): def print_usage():
usage="cbr2cbz A script utility to convert CBR files into CBZ files" usage="cbr2cbz A script utility to convert a directory with CBR files into CBZ files"
usage+="\n\t Usage: cbr2cbz <filename_without_spaces.cbr>" usage+="\n\t Usage: cbr2cbz <directory>"
usage+="\n\t\n\t (Please don't use non-free formats like RAR/CBR)" usage+="\n\t\n\t (Please don't use non-free formats like RAR/CBR)"
print_err(usage) print_err(usage)
#Extract images from a CBR file into a directory def convert(filename):
def uncompress(filename, directory): CONVERT="./cbr2cbz.py"
UNRAR="unrar-nonfree e" command=" ".join([CONVERT, filename])
command=" ".join([UNRAR, "\""+filename+"\"", directory])
#print_err(command)
execute(command) execute(command)
#Compress a folder with images into a CBZ/ZIP file
def compress (directory, zip_filename):
ZIP="zip"
directory=directory+"/*"
command=" ".join([ZIP, zip_filename, directory ])
execute (command)
def get_filename_without_extension(filename):
return filename[:-4]
if len(sys.argv)!=2: if len(sys.argv)!=2:
print_usage(); print_usage();
sys.exit(-1) sys.exit(-1)
@ -43,30 +29,9 @@ if len(sys.argv)!=2:
cbr_filename=sys.argv[1] directory=os.path.abspath(sys.argv[1])
cbz_filename=get_filename_without_extension(cbr_filename)+".cbz"
temp_dir=tempfile.mkdtemp("cbr2cbz")
print_err("Processing "+cbr_filename) for f in os.listdir(directory):
filename_with_path=os.path.join(directory, f)
#Extract images from CBR/RAR into a directory print(filename_with_path)
uncompress(sys.argv[1], temp_dir) convert(filename_with_path)
#Compress images and put them into a CBZ/ZIP
compress(temp_dir, cbz_filename)
def extract (cbr_filename, dir_name):
pass
#execute ("dir")