X-Git-Url: https://git.llucax.com/z.facultad/75.06/jacu.git/blobdiff_plain/3b6ca5c121131942b4a57d4d4c5c594bf8045c95..1e857d6dff5bd9eadd7b59a2deb323eb5d644ccf:/src/jacu.c

diff --git a/src/jacu.c b/src/jacu.c
index e870c99..ba8daf1 100644
--- a/src/jacu.c
+++ b/src/jacu.c
@@ -4,6 +4,7 @@
 #include "zerogrouping/zerogrouping.h"
 #include "statichuff/statichuff.h"
 #include "vfile/vfile.h"
+#include "vfile/common.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -16,13 +17,13 @@ int main(int argc, char* argv[])
 	int dflag = 0;
 	int zflag = 0;
 	int tflag = 0;
-	int pflag = 0;
+	int qflag = 0;
 	long int volumesize = 0;
 	size_t pagesize = 32768; /* 32KB */
 	int ch;
 	t_BlockSort *bs;
 			
-	while ((ch = getopt(argc, argv, "cdzt:p:")) != -1) { 
+	while ((ch = getopt(argc, argv, "cdzt:q:")) != -1) { 
 		 
 		switch (ch) { 
 			case 'c': cflag = 1; 
@@ -35,12 +36,35 @@ int main(int argc, char* argv[])
 					  break; 
 
 			case 't': tflag = 1; 
-					  volumesize = atol(optarg);
-					  break; 
-
-			case 'p': pflag = 1; 
-					  pagesize = atoi(optarg);
-					  break; 
+				volumesize = atol(optarg);
+				break; 
+
+			case 'q': qflag = 1; 
+				switch (atoi(optarg))
+				{
+					case 0: pagesize = 1024; /* 1K */
+						break;
+					case 1: pagesize = 2048; /* 2K */
+						break;
+					case 2: pagesize = 4096; /* 4K */
+						break;
+					case 3: pagesize = 8192; /* 8K */
+						break;
+					case 4: pagesize = 16384; /* 16K */
+						break;
+					case 5: pagesize = 32768; /* 32K */
+						break;
+					case 6: pagesize = 65536; /* 64K */
+						break;
+					case 7: pagesize = 131072; /* 128K */
+						break;
+					case 8: pagesize = 262144; /* 256K */
+						break;
+					case 9: pagesize = 524288; /* 512K */
+						break;
+					default: pagesize = 0; /* error */
+				}
+				break; 
 
 			default: fprintf(stderr, "Usage: %s [-cdpt] sourcefile targetfile\n", argv[0]); 
 					 return(2);
@@ -55,8 +79,8 @@ int main(int argc, char* argv[])
 		fprintf(stderr,"Error: The volume size must be a non-zero value\n");
 		return (4);
 	}
-	if ((pflag) && (pagesize <= 1u)) {
-		fprintf(stderr,"Error: El tamaño de página debe ser mayor a 1 byte.\n");
+	if ((qflag) && (pagesize <= 1u)) {
+		fprintf(stderr,"Error: El nivel de compresión debe ser entre 0 (menor) y 9 (mayor).\n");
 		return (5);
 	}
 		
@@ -67,6 +91,9 @@ int main(int argc, char* argv[])
 		Uint32 i, j, total, k;
 		char *mtf;
 		char *salida, *data, c;
+		char *z;
+		int z_len;
+
 		data = malloc(sizeof(char)*pagesize);
 		/* Reservo lugar tambien para guardar el k y el tamaño  */
 		salida = malloc(sizeof(char)*(pagesize)+sizeof(Uint32)*2);
@@ -89,24 +116,33 @@ int main(int argc, char* argv[])
 			bs_solve(data, salida, bs, &k, i);
 
 			/* Le aplico el MTF, salteo el tamaño del bloque para que no se pierda. */
-			mtf = jacu_mtf(salida+sizeof(Uint32), i+sizeof(Uint32));
+			mtf = jacu_mtf(salida+sizeof(Uint32), i+sizeof(Uint32), &z, &z_len);
 
 			/* Si me lo piden, aplico ZG. */
-			if (zflag)
-			{
+			if (zflag) {
 				size_t len;
 				char buff[2];
 				ZG zg;
 				zg_init(&zg);
+				/* TODO HACER LO MISMO QUE EN EL ELSE XXX */
 				for (j = 0; j < i; ++j)
 					if ((len = zg_group(&zg, buff, mtf[j]))) fwrite(buff, 1, len, fp_out);
-			}
-			else
-			{
-				for(j=0; j<i; j++)
+			} else {
+				/* Guardo el PageSize */
+				//for(j=0; j<sizeof(Uint32); j++)
+				//	fputc(mtf[j], fp_out);
+				fwrite(mtf, sizeof(Uint32), 1, fp_out);
+
+				/* Guardo el Z len y el Z */
+				fwrite(&z_len, sizeof(int), 1, fp_out);
+				fwrite(z, z_len, sizeof(char), fp_out);
+
+				/* Guardo la salida del MTF */
+				for(j=sizeof(Uint32); j<i; j++)
 					fputc(mtf[j], fp_out);
 			}
 			free(mtf);
+			free(z);
 		}
 
 		/* Limpiando */
@@ -115,10 +151,10 @@ int main(int argc, char* argv[])
 		bs_destroy(bs);
 
 		/* Comprimo con huffman */
-		i = shuff_encode_file("tmp.comp",argv[optind+1], volumesize);
+		i = shuff_encode_file("tmp.comp", argv[optind+1], volumesize);
 
 		/* borro el temporal */
-		unlink("tmp.comp");
+		remove("tmp.comp");
 
 		/* Muestro bpb */
 		printf("Comprimido a %.04f bpb.\n", get_file_size(argv[optind+1])*8.0/get_file_size(argv[optind]));
@@ -128,25 +164,33 @@ int main(int argc, char* argv[])
 	if (dflag == 1) { 
 		/* Descomprimo */
 		FILE *fp_out;
-		VFILE *fp_in;
+		FILE *fp_in;
 		Uint32 block_size, k;
 		char *block, *mtf, *orig;
 		char *z;
+		int z_len;
 
 		shuff_decode_file(argv[optind], "tmp.comp"); /*argv[optind+1]);*/
-		fp_in = vfopen("tmp.comp", "r", 0);
+		fp_in = fopen("tmp.comp", "rb");
 		fp_out = fopen(argv[optind+1], "wb");
 
-		while (!vfeof(fp_in)) {
+		while (!feof(fp_in)) {
 			block_size = 0;
-			vfread(&block_size, sizeof(Uint32), 1, fp_in);
+			PERR("Leo bloque");
+			fread(&block_size, sizeof(Uint32), 1, fp_in);
+			fread(&z_len, sizeof(int), 1, fp_in);
+			z = malloc(sizeof(char)*z_len);
+			fread(z, z_len, sizeof(char), fp_in);
+
 			if (block_size > 0) {
-				block = malloc((block_size+sizeof(Uint32))*sizeof(char));
+				block = malloc(block_size*sizeof(char)+sizeof(Uint32));
 				orig = malloc(block_size*sizeof(char));
-				vfread(block, block_size, sizeof(char), fp_in);
+				fread(block, block_size, sizeof(char), fp_in);
 
+				/* Hago el MTF inverso */
 				mtf = jacu_mtf_inv(z, block, block_size);
 
+				/* Luego de hacer el MTF inverso ya puedo recuperar el k */
 				memcpy(&k, block, sizeof(Uint32));
 
 				bs_restore(orig, block+sizeof(Uint32), k, block_size);
@@ -157,7 +201,7 @@ int main(int argc, char* argv[])
 				free(mtf);
 			}
 		}
-		vfclose(fp_in);
+		fclose(fp_in);
 		fclose(fp_out);
 	}