Failprove segget.cpp and log errors to error.log

2 files changed, 210 insertions, 151 deletions

diff --git a/segget/segget.cpp b/segget/segget.cpp
index 4738f38..5684806 100644
--- a/segget/segget.cpp
+++ b/segget/segget.cpp
@@ -13,180 +13,223 @@ Tpkg **Ppkg_array;
 
 CURLM *cm;
 
-void load_pkgs(){
-	ifstream myfile("pkg.list");
-	string buff((std::istreambuf_iterator<char>(myfile)), std::istreambuf_iterator<char>());
-	myfile>>buff;
-	myfile.close();
-	//	cout<< buff<<"\n";
-	json_object *json_array_pkg_list;
-	json_array_pkg_list = json_tokener_parse(buff.c_str());
-	if (is_error(json_array_pkg_list))
-		printf("error parsing json: %s\n",json_tokener_errors[-(unsigned long)json_array_pkg_list]);
-	else {
-		stats.pkg_count=json_object_array_length(json_array_pkg_list);
-		Ppkg_array= new Tpkg* [stats.pkg_count];
-		for(uint array_item_num=0;array_item_num<stats.pkg_count;array_item_num++){
-			Ppkg_array[array_item_num]=new Tpkg;
-			Ppkg_array[array_item_num]->load_pkg_from_json(json_object_array_get_idx(json_array_pkg_list,array_item_num));
+int load_pkgs(){
+	try{
+		ifstream json_pkg_list_file;
+		try{
+			json_pkg_list_file.open("pkg.list");
+		}catch(...){
+			error_log("Error: Can't open pkg.list file");
+			return 1;
+		}
+		string buff((std::istreambuf_iterator<char>(json_pkg_list_file)), std::istreambuf_iterator<char>());
+		try{
+			json_pkg_list_file>>buff;
+		}catch(...){
+			error_log("Error: Can't read pkg.list file");
+			return 1;
 		}
+		try{
+			json_pkg_list_file.close();
+		}catch(...){
+			error_log("Error: Can't close pkg.list file");
+		}
+		try{
+			//	cout<< buff<<"\n";
+			json_object *json_array_pkg_list;
+			json_array_pkg_list = json_tokener_parse(buff.c_str());
+			if (is_error(json_array_pkg_list))
+				printf("error parsing json: %s\n",json_tokener_errors[-(unsigned long)json_array_pkg_list]);
+			else {
+				stats.pkg_count=json_object_array_length(json_array_pkg_list);
+				Ppkg_array= new Tpkg* [stats.pkg_count];
+				for(uint array_item_num=0;array_item_num<stats.pkg_count;array_item_num++){
+					Ppkg_array[array_item_num]=new Tpkg;
+					Ppkg_array[array_item_num]->load_pkg_from_json(json_object_array_get_idx(json_array_pkg_list,array_item_num));
+				}
+			}
+			return 0;
+		}catch(...){
+			error_log("Error: Can't parse json data from pkg.list file");
+			return 1;
+		}
+	}catch(...){
+		error_log("Error in segget.cpp: load_pkgs()");
+		return 1;
 	}
 }
-void set_settings(){
-	settings.set_resume(true);
-	settings.distfiles_dir="./distfiles";  
-	settings.segments_dir="./tmp";  
-}
 void show_pkgs(){
-	for (uint array_item_num=0;array_item_num<stats.pkg_count;array_item_num++){
-		cout <<"PKG:"<<array_item_num<<") cat:"<< Ppkg_array[array_item_num]->category <<" name:"<< Ppkg_array[array_item_num]->name <<"\n";
-		for(uint distfile_array_item_num=0;distfile_array_item_num<Ppkg_array[array_item_num]->distfile_count;distfile_array_item_num++){
-			cout << "    "<< distfile_array_item_num<<") distfile_name:"<< Ppkg_array[array_item_num]->Pdistfile_list[distfile_array_item_num]->name<<"\n";
-			for(uint urllist_array_item_num=0;urllist_array_item_num<Ppkg_array[array_item_num]->Pdistfile_list[distfile_array_item_num]->url_count;urllist_array_item_num++){
-				cout <<"        "<<Ppkg_array[array_item_num]->Pdistfile_list[distfile_array_item_num]->url_list[urllist_array_item_num]<<"\n";
+	try{
+		for (uint array_item_num=0;array_item_num<stats.pkg_count;array_item_num++){
+			cout <<"PKG:"<<array_item_num<<") cat:"<< Ppkg_array[array_item_num]->category <<" name:"<< Ppkg_array[array_item_num]->name <<"\n";
+			for(uint distfile_array_item_num=0;distfile_array_item_num<Ppkg_array[array_item_num]->distfile_count;distfile_array_item_num++){
+				cout << "    "<< distfile_array_item_num<<") distfile_name:"<< Ppkg_array[array_item_num]->Pdistfile_list[distfile_array_item_num]->name<<"\n";
+				for(uint urllist_array_item_num=0;urllist_array_item_num<Ppkg_array[array_item_num]->Pdistfile_list[distfile_array_item_num]->url_count;urllist_array_item_num++){
+					cout <<"        "<<Ppkg_array[array_item_num]->Pdistfile_list[distfile_array_item_num]->url_list[urllist_array_item_num]<<"\n";
+				}
 			}
 		}
+	}catch(...){
+		error_log("Error in segget.cpp: show_pkgs()");
 	}
 }
 
 int choose_segment(uint connection_num){
-	uint pkg_num (0);
-	uint distfile_num(0);
-	uint segment_num(0);
-	while (pkg_num<stats.pkg_count){
-//		debug("pkg_num:"+toString(pkg_num));
-		while(distfile_num<Ppkg_array[pkg_num]->distfile_count){
-			if (not(Ppkg_array[pkg_num]->Pdistfile_list[distfile_num]->downloaded)){
-//				debug("	distfile_num:"+toString(distfile_num));
-				if (Ppkg_array[pkg_num]->Pdistfile_list[distfile_num]->active_connections_num<settings.max_connection_num_per_distfile)
-					while (segment_num<Ppkg_array[pkg_num]->Pdistfile_list[distfile_num]->segments_count){
-//						debug("		segment_num:"+toString(segment_num));
-						//	segments_in_progress[connection_num]=
-						//	if not(Ppkg_array[pkg_num]->Pdistfile_list[distfile_num]->get_segment_downloaded_status(segment_num);
-						if (Ppkg_array[pkg_num]->Pdistfile_list[distfile_num]->dn_segments[segment_num].status==WAITING){
-							Ppkg_array[pkg_num]->Pdistfile_list[distfile_num]->provide_segment(cm, connection_num, segment_num);
-							return 0; // success segment.max_tries has not been reached
+	try{
+		uint pkg_num (0);
+		uint distfile_num(0);
+		uint segment_num(0);
+		while (pkg_num<stats.pkg_count){
+//			debug("pkg_num:"+toString(pkg_num));
+			while(distfile_num<Ppkg_array[pkg_num]->distfile_count){
+				if (not(Ppkg_array[pkg_num]->Pdistfile_list[distfile_num]->downloaded)){
+//					debug("	distfile_num:"+toString(distfile_num));
+					if (Ppkg_array[pkg_num]->Pdistfile_list[distfile_num]->active_connections_num<settings.max_connection_num_per_distfile)
+						while (segment_num<Ppkg_array[pkg_num]->Pdistfile_list[distfile_num]->segments_count){
+//							debug("		segment_num:"+toString(segment_num));
+							//	segments_in_progress[connection_num]=
+							//	if not(Ppkg_array[pkg_num]->Pdistfile_list[distfile_num]->get_segment_downloaded_status(segment_num);
+							if (Ppkg_array[pkg_num]->Pdistfile_list[distfile_num]->dn_segments[segment_num].status==WAITING){
+								Ppkg_array[pkg_num]->Pdistfile_list[distfile_num]->provide_segment(cm, connection_num, segment_num);
+								return 0; // success segment.max_tries has not been reached
+							}
+							else
+									segment_num++; // segment already downloaded/downloading => go for the next one
 						}
 						else
-								segment_num++; // segment already downloaded/downloading => go for the next one
-					}
-					else
-						debug("	distfile #"+toString(distfile_num)+" has "
-						+toString(Ppkg_array[pkg_num]->Pdistfile_list[distfile_num]->active_connections_num)
-						+" connections => choosing another distfile.");
-				segment_num=0;
+							debug("	distfile #"+toString(distfile_num)+" has "
+							+toString(Ppkg_array[pkg_num]->Pdistfile_list[distfile_num]->active_connections_num)
+							+" connections => choosing another distfile.");
+					segment_num=0;
+				}
+				distfile_num++;
 			}
-			distfile_num++;
+			distfile_num=0;
+			pkg_num++;
 		}
-		distfile_num=0;
-		pkg_num++;
+		//  for (uint array_item_num=0;array_item_num<pkg_count;array_item_num++){
+		//for(int distfile_array_item_num=0;distfile_array_item_num<Ppkg_array[array_item_num]->distfile_count;distfile_array_item_num++){
+		//  if (Ppkg_array[array_item_num]->Pdistfile_list[distfile_array_item_num]->url_count)
+		//	Ppkg_array[array_item_num]->Pdistfile_list[distfile_array_item_num]->dosegments();
+		//}
+		//}
+		return 1;
+	}catch(...){
+		error_log("Error: segget.cpp : choose_segment()");
+		return 1;
 	}
-	//  for (uint array_item_num=0;array_item_num<pkg_count;array_item_num++){
-	//for(int distfile_array_item_num=0;distfile_array_item_num<Ppkg_array[array_item_num]->distfile_count;distfile_array_item_num++){
-	//  if (Ppkg_array[array_item_num]->Pdistfile_list[distfile_array_item_num]->url_count)
-	//	Ppkg_array[array_item_num]->Pdistfile_list[distfile_array_item_num]->dosegments();
-	//}
-	//}
-	return 1;
 }
 int download_pkgs(){
-	//  cout << "Need to download: " << segments_count << " segments\n";
-	CURLMsg *msg;
-	long L;
-	int M, Q, U = -1;
-	fd_set R, W, E;
-	struct timeval T;
-	curl_global_init(CURL_GLOBAL_ALL);
-	cm = curl_multi_init();
+	try{
+		//  cout << "Need to download: " << segments_count << " segments\n";
+		CURLMsg *msg;
+		long L;
+		int M, Q, U = -1;
+		fd_set R, W, E;
+		struct timeval T;
 
-	// we can optionally limit the total amount of connections this multi handle uses
-	curl_multi_setopt(cm, CURLMOPT_MAXCONNECTS, (long)MAX_CONNECTS);
+		try{
+			curl_global_init(CURL_GLOBAL_ALL);
+			cm = curl_multi_init();
+			// we can optionally limit the total amount of connections this multi handle uses
+			curl_multi_setopt(cm, CURLMOPT_MAXCONNECTS, (long)MAX_CONNECTS);
+		}catch(...){
+			error_log("Error in segget.cpp: download_pkgs() : while calling curl_global_init() and curl_multi_init()");
+			return EXIT_FAILURE;
+		}
 
-	for (uint connection_num = 0; connection_num < MAX_CONNECTS; ++connection_num) {
-		choose_segment(connection_num);
-	};
-	while (U) {
-		while (CURLM_CALL_MULTI_PERFORM == curl_multi_perform(cm, &U)){};
-		if (U) {
-			FD_ZERO(&R);
-			FD_ZERO(&W);
-			FD_ZERO(&E);
-			if (curl_multi_fdset(cm, &R, &W, &E, &M)) {
-				fprintf(stderr, "E: curl_multi_fdset\n");
-				return EXIT_FAILURE;
-			}
-			if (curl_multi_timeout(cm, &L)) {
-				fprintf(stderr, "E: curl_multi_timeout\n");
-				return EXIT_FAILURE;
-			}
-			if (L == -1)
-				L = 100;
-			if (M == -1) {
-				#ifdef WIN32
-				Sleep(L);
-				#else
-					sleep(L / 1000);
-				#endif
-			} else {
-				T.tv_sec = L/1000;
-				T.tv_usec = (L%1000)*1000;
-				if (0 > select(M+1, &R, &W, &E, &T)) {
-					fprintf(stderr, "E: select(%i,,,,%li): %i: %s\n",
-					M+1, L, errno, strerror(errno));
+		for (uint connection_num = 0; connection_num < MAX_CONNECTS; ++connection_num) {
+			if (choose_segment(connection_num))
+				break;
+		};
+		while (U) {
+			while (CURLM_CALL_MULTI_PERFORM == curl_multi_perform(cm, &U)){};
+			if (U) {
+				FD_ZERO(&R);
+				FD_ZERO(&W);
+				FD_ZERO(&E);
+				if (curl_multi_fdset(cm, &R, &W, &E, &M)) {
+					error_log("Error: curl_multi_fdset");
+//					fprintf(stderr, "E: curl_multi_fdset\n");
 					return EXIT_FAILURE;
 				}
-			}
-		}
-		while ((msg = curl_multi_info_read(cm, &Q))) {
-			if (msg->msg == CURLMSG_DONE) {
-				Tsegment *current_segment;
-				CURL *e = msg->easy_handle;
-				curl_easy_getinfo(msg->easy_handle, CURLINFO_PRIVATE, &current_segment);
-				uint result=msg->data.result;
-				string result_msg_text="RESULT:"+toString(result)+" "+curl_easy_strerror(msg->data.result)+" while downloading segment";
-				msg_status1(current_segment->connection_num,current_segment->segment_num,result_msg_text);
-				curl_multi_remove_handle(cm, e);
-				current_segment->segment_file.close();
-				Tmirror *Pcurr_mirror=find_mirror(strip_mirror_name(current_segment->url));
-				time_t now_time = time((time_t *)NULL);
-				Tdistfile* prnt_distfile;
-				prnt_distfile=(Tdistfile*)current_segment->parent_distfile;
-				prnt_distfile->active_connections_num--;
-				if (result!=0){
-					// error -> start downloading again
-					msg_status2(current_segment->connection_num, toString(result)+"]- Failed download "+current_segment->file_name);
-					debug(toString(result)+"]- Failed download "+current_segment->url);
-					Pcurr_mirror->stop(now_time-connection_array[current_segment->connection_num].start_time,0);
-					if (current_segment->try_num>=settings.max_tries){
-						current_segment->status=FAILED;
-						error_log("Segment:"+current_segment->file_name+" has reached max_tries limit - segment.status set to FAILED");
+				if (curl_multi_timeout(cm, &L)) {
+					error_log("Error: curl_multi_timeout");
+//					fprintf(stderr, "E: curl_multi_timeout\n");
+					return EXIT_FAILURE;
+				}
+				if (L == -1)
+					L = 100;
+				if (M == -1) {
+					#ifdef WIN32
+					Sleep(L);
+					#else
+						sleep(L / 1000);
+					#endif
+				} else {
+					T.tv_sec = L/1000;
+					T.tv_usec = (L%1000)*1000;
+					if (0 > select(M+1, &R, &W, &E, &T)) {
+//						fprintf(stderr, "E: select(%i,,,,%li): %i: %s\n",
+						error_log("Error: select ("+toString(M+1)+","+toString(L)+"):"+toString(errno)+": "+strerror(errno));
+						return EXIT_FAILURE;
 					}
-					else current_segment->status=WAITING;
-						//log("Restarting "+current_segment->file_name+" on connection#"+toString(current_segment->connection_num));
-						//prnt_distfile->provide_segment(cm,current_segment->connection_num,current_segment->segment_num);
-						//U++;
-				}else{
-					// no error => count this one and start new
-					log("Succesfully downloaded "+current_segment->file_name+" on connection#"+toString(current_segment->connection_num));
-					debug(" Successful download "+current_segment->url);
-					Pcurr_mirror->stop(now_time-connection_array[current_segment->connection_num].start_time,current_segment->segment_size);
-					current_segment->status=DOWNLOADED;
-					prnt_distfile->inc_dld_segments_count(current_segment);
-				};
-				if (not choose_segment(current_segment->connection_num)) {
-					U++; // just to prevent it from remaining at 0 if there are more URLs to get
-				};
-				stats.show_totals();
-				curl_easy_cleanup(e);
-			}else {
-				msg_error("ERROR: CURLMsg: "+msg->msg);
+				}
+			}
+			while ((msg = curl_multi_info_read(cm, &Q))) {
+				if (msg->msg == CURLMSG_DONE) {
+					Tsegment *current_segment;
+					CURL *e = msg->easy_handle;
+					curl_easy_getinfo(msg->easy_handle, CURLINFO_PRIVATE, &current_segment);
+					uint result=msg->data.result;
+					string result_msg_text="RESULT:"+toString(result)+" "+curl_easy_strerror(msg->data.result)+" while downloading segment";
+					msg_status1(current_segment->connection_num,current_segment->segment_num,result_msg_text);
+					curl_multi_remove_handle(cm, e);
+					current_segment->segment_file.close();
+					Tmirror *Pcurr_mirror=find_mirror(strip_mirror_name(current_segment->url));
+					time_t now_time = time((time_t *)NULL);
+					Tdistfile* prnt_distfile;
+					prnt_distfile=(Tdistfile*)current_segment->parent_distfile;
+					prnt_distfile->active_connections_num--;
+					if (result!=0){
+						// error -> start downloading again
+						msg_status2(current_segment->connection_num, toString(result)+"]- Failed download "+current_segment->file_name);
+						debug(toString(result)+"]- Failed download "+current_segment->url);
+						Pcurr_mirror->stop(now_time-connection_array[current_segment->connection_num].start_time,0);
+						if (current_segment->try_num>=settings.max_tries){
+							current_segment->status=FAILED;
+							error_log("Segment:"+current_segment->file_name+" has reached max_tries limit - segment.status set to FAILED");
+						}
+						else current_segment->status=WAITING;
+							//log("Restarting "+current_segment->file_name+" on connection#"+toString(current_segment->connection_num));
+							//prnt_distfile->provide_segment(cm,current_segment->connection_num,current_segment->segment_num);
+							//U++;
+					}else{
+						// no error => count this one and start new
+						log("Succesfully downloaded "+current_segment->file_name+" on connection#"+toString(current_segment->connection_num));
+						debug(" Successful download "+current_segment->url);
+						Pcurr_mirror->stop(now_time-connection_array[current_segment->connection_num].start_time,current_segment->segment_size);
+						current_segment->status=DOWNLOADED;
+						prnt_distfile->inc_dld_segments_count(current_segment);
+					};
+					if (not choose_segment(current_segment->connection_num)) {
+						U++; // just to prevent it from remaining at 0 if there are more URLs to get
+					};
+					stats.show_totals();
+					curl_easy_cleanup(e);
+				}else {
+					msg_error("ERROR: CURLMsg: "+msg->msg);
+				}
 			}
 		}
+		curl_multi_cleanup(cm);
+		curl_global_cleanup();
+		log("Nothing to download - Exiting... (Press any key to exit) ");
+		return EXIT_SUCCESS;
+	}catch(...){
+		error_log("Error in segget.cpp: download_pkgs()");
+		return EXIT_FAILURE;
 	}
-	curl_multi_cleanup(cm);
-	curl_global_cleanup();
-	debug("Exiting... (Press any key to exit) ");
-	return EXIT_SUCCESS;
 }
 
 int main()
diff --git a/segget/stats.cpp b/segget/stats.cpp
index fd87836..bf201cb 100644
--- a/segget/stats.cpp
+++ b/segget/stats.cpp
@@ -14,6 +14,15 @@ class Tstats{
 		ulong last_time_interval;
 		uint pkg_count;
 		uint distfiles_count;
+		Tstats():
+			dld_size(0),
+			dld_distfiles_count(0),
+			total_size(0),
+			total_bytes_per_last_interval(0),
+			last_time_interval(1),
+			pkg_count(0),
+			distfiles_count(0)
+			{};
 		void inc_dld_size(ulong more_bytes){ dld_size+=more_bytes;};
 		ulong get_dld_size(){return dld_size;};
 		void inc_dld_distfiles_count(){ dld_distfiles_count++;};
@@ -25,14 +34,21 @@ class Tstats{
 
 void Tstats::show_totals(){
 	try{
+		ulong show_last_time_interval=1;
+		ulong show_total_size=1;
+		if (last_time_interval>1)
+			show_last_time_interval=last_time_interval;
+		if (total_size>1)
+			show_total_size=total_size;
 		msg_total("Total" 
 			+field(" PKGs:",          pkg_count,4)
 			+field(" = DFs:",         dld_distfiles_count,4)
 			+field(" / ",             distfiles_count,4)
 			+field(" = Size:",        dld_size/1000,7)
 			+field(" / ",             total_size/1000,7)+" Kb "
-			+field(" = ",             dld_size*100/total_size,3)+"%%"
-			+field(" Total speed: ",  (total_bytes_per_last_interval/1000/(1+last_time_interval)),7)+" Kb/s");
+			+field(" = ",             dld_size*100/(1+show_total_size),3)+"%%"
+			+field(" Total speed: ",  (total_bytes_per_last_interval/1000/(show_last_time_interval)),7)
+			+" Kb/s");
 	}
 	catch(...)
 	{