MirrorSave
/
caesium-clt
mirror of https://github.com/Lymphatus/caesium-clt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge completed.

This commit is contained in:
Matteo Paonessa 2016-04-24 11:17:20 +02:00
parent 3ed20d3937
commit 2fe01c1aa2
2 changed files with 12 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/compresshelper.c
View File

@ -144,6 +144,7 @@ cclt_parameters parse_arguments(int argc, char* argv[]) {
while (optind < argc) {
if (is_directory(argv[optind])) {
if (i != 0) {
//TODO This error appears also if there a value to the -l parameter
printf("[ERROR] Found folder along with input files. Aborting.\n");
exit(-20);
} else if (i == 0 && argc - optind > 1) {

49
src/main.c
View File

@ -35,53 +35,18 @@ int main (int argc, char *argv[]) {
//Parse arguments
cclt_parameters pars = parse_arguments(argc, argv);
//Either -l or -q must be set but not together
if (!((pars.jpeg.lossless == 1) ^ (pars.jpeg.quality > 0))) {
//Both or none are set
if (pars.jpeg.lossless == 1 && pars.jpeg.quality > 0) {
fprintf(stderr, "-l option can't be used with -q. Either use one or the other. Aborting.\n");
exit(-1);
} else if (pars.jpeg.lossless == 0 && pars.jpeg.quality <= 0) {
fprintf(stderr, "Either -l or -q must be set. Aborting.\n");
print_help();
exit(-2);
}
} else {
//One of them is set
//If -q is set check it is within the 1-100 range
if (!(pars.jpeg.quality >= 1 && pars.jpeg.quality <= 100) && pars.jpeg.lossless == 0) {
fprintf(stderr, "Quality must be within a [1-100] range. Aborting.\n");
exit(-3);
}
}
//Check if you set the input files
if (pars.input_files_count == 0) {
fprintf(stderr, "No input files. Aborting.\n");
exit(-9);
}
//Check if the output folder exists, otherwise create it
if (pars.output_folder == NULL) {
fprintf(stderr, "No -o option pointing to the destination folder. Aborting.\n");
exit(-4);
} else {
if (mkpath(pars.output_folder, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) == -1) {
if (errno != EEXIST) {
exit(-5);
}
}
}
//Start a timer
clock_t start = clock(), diff;
//We need the file list right here
cclt_start(&pars, &i_t_size, &o_t_size);
diff = clock() - start;
fprintf(stdout, "-------------------------------\nCompression completed in %lum%lus\n%s -> %s [%.2f%% | %s]\n",
diff / CLOCKS_PER_SEC / 60,
diff / CLOCKS_PER_SEC % 60,
diff = clock() - start;
long msec = diff * 1000 / CLOCKS_PER_SEC;
fprintf(stdout, "-------------------------------\nCompression completed in %lum%lus%lums\n%s -> %s [%.2f%% | %s]\n",
msec / 1000 / 60,
msec / 1000 % 60,
msec % 1000,
get_human_size((long) i_t_size),
get_human_size((long) o_t_size),
((float) o_t_size - i_t_size) * 100 / i_t_size,