Failprove segment.cpp and log errors to error.log

5 files changed, 133 insertions, 110 deletions

diff --git a/segget/segget.cpp b/segget/segget.cpp
index 1cfa71d..4738f38 100644
--- a/segget/segget.cpp
+++ b/segget/segget.cpp
@@ -146,7 +146,7 @@ int download_pkgs(){
 				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);
-				fclose(current_segment->segment_file);
+				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;
diff --git a/segget/segment.cpp b/segget/segment.cpp
index afa4bac..2b21bd2 100644
--- a/segget/segment.cpp
+++ b/segget/segment.cpp
@@ -35,7 +35,7 @@ class Tsegment{
 		unsigned long downloaded_bytes;
 		string url;
 		string range;
-		FILE *segment_file;
+		ofstream segment_file;
 		Tsegment():
 			easyhandle(0),
 			urllist(0),
@@ -63,143 +63,166 @@ class Tsegment{
 Tsegment *segments_in_progress[MAX_CONNECTS]={0};
 
 void Tsegment::set_segment(void *prnt_distfile, uint seg_num, string distfile_name, ulong default_seg_size, ulong range_end){
-	parent_distfile=prnt_distfile;
-	segment_num=seg_num;
-	segment_size=range_end-seg_num*default_seg_size+1;
-	range=toString(seg_num*default_seg_size)+"-"+toString(range_end);
-	file_name="."+distfile_name+".seg"+toString(seg_num);
-	ulong downloaded_size;
-	if (settings.get_resume()){
-		//check if downloaded
-		ifstream file((settings.segments_dir+"/"+file_name).c_str(), ios::in|ios::binary);
-		ulong start = file.tellg();
-		file.seekg (0, ios::end);
-		ulong end = file.tellg();
-		downloaded_size = end - start;
-		debug("seg:"+toString(seg_num)+" Dsize="+toString(downloaded_size)+" seg_size="+toString(segment_size));
-		file.close();
-		if (downloaded_size==segment_size){
-			status=DOWNLOADED;
-			debug("seg:"+toString(seg_num)+" Downloaded");
-		}
-		else{
-			debug("seg:"+toString(seg_num)+" not downloaded");
-			downloaded_bytes=0;
+	try{
+		parent_distfile=prnt_distfile;
+		segment_num=seg_num;
+		segment_size=range_end-seg_num*default_seg_size+1;
+		range=toString(seg_num*default_seg_size)+"-"+toString(range_end);
+		file_name="."+distfile_name+".seg"+toString(seg_num);
+		ulong downloaded_size;
+		if (settings.get_resume()){
+			//check if downloaded
+			ifstream file((settings.segments_dir+"/"+file_name).c_str(), ios::in|ios::binary);
+			ulong start = file.tellg();
+			file.seekg (0, ios::end);
+			ulong end = file.tellg();
+			downloaded_size = end - start;
+			debug("seg:"+toString(seg_num)+" Dsize="+toString(downloaded_size)+" seg_size="+toString(segment_size));
+			file.close();
+			if (downloaded_size==segment_size){
+				status=DOWNLOADED;
+				debug("seg:"+toString(seg_num)+" Downloaded");
+			}
+			else{
+				debug("seg:"+toString(seg_num)+" not downloaded");
+				downloaded_bytes=0;
+			}
 		}
+	}catch(...){
+		error_log("Error in segment.cpp: prepare_for_connection()");
 	}
-	//try
 }
 void Tsegment::prepare_for_connection(CURLM *cm, uint con_num, uint distfile_num, string segment_url){
-	msg_connecting(con_num,distfile_num, segment_num,"Downloading from "+segment_url);
-	segments_in_progress[con_num]=this;
-	status=DOWNLOADING;
-	downloaded_bytes=0;
-	connection_num=con_num;
-	connection_array[con_num].start_time=time((time_t *)NULL);
-	url=segment_url;
-	try_num++;
-	add_easy_handle_to_multi(cm);
+	try{
+		msg_connecting(con_num,distfile_num, segment_num,"Downloading from "+segment_url);
+		segments_in_progress[con_num]=this;
+		status=DOWNLOADING;
+		downloaded_bytes=0;
+		connection_num=con_num;
+		connection_array[con_num].start_time=time((time_t *)NULL);
+		url=segment_url;
+		try_num++;
+		add_easy_handle_to_multi(cm);
+	}catch(...){
+		error_log("Error in segment.cpp: prepare_for_connection()");
+	}
 }
 
 Tsegment::~Tsegment(){
 	//try
-		fclose(segment_file);
+		segment_file.close();
 }
 
 int Tsegment::add_easy_handle_to_multi(CURLM *cm){
-	//  CURLcode curl_result;
-	segment_file = fopen((settings.segments_dir+"/"+file_name).c_str(), "w" );
-	easyhandle = curl_easy_init();
-	//  cout << "Started downloading\n";
-	//  curl_easy_setopt(eh, CURLOPT_WRITEFUNCTION, cb);
-	//  curl_easy_setopt(eh, CURLOPT_HEADER, 0L);
-	//  curl_easy_setopt(eh, CURLOPT_URL, urls[i]);
-	//  curl_easy_setopt(eh, CURLOPT_VERBOSE, 0L);
-	//  cout << "UUURRLL:" <<url.c_str()<<"\n";
-	//  cout << "range:" <<range <<"\n";
-	if(easyhandle) {
-		curl_easy_setopt(easyhandle, CURLOPT_URL, url.c_str() );
-		//    curl_easy_setopt(easyhandle, CURLOPT_URL, "http://www.mail.ru");
-		curl_easy_setopt(easyhandle, CURLOPT_WRITEDATA, this);
-		curl_easy_setopt(easyhandle, CURLOPT_PRIVATE, this);
-		curl_easy_setopt(easyhandle, CURLOPT_RANGE, range.c_str());
-		curl_easy_setopt(easyhandle, CURLOPT_TIMEOUT, settings.time_out);
-		curl_easy_setopt(easyhandle, CURLOPT_FTP_RESPONSE_TIMEOUT, settings.ftp_response_timeout);
-		curl_easy_setopt(easyhandle, CURLOPT_LOW_SPEED_LIMIT, settings.low_connection_speed_limit);
-		curl_easy_setopt(easyhandle, CURLOPT_LOW_SPEED_TIME, settings.low_connection_speed_time);
-		curl_easy_setopt(easyhandle, CURLOPT_MAX_RECV_SPEED_LARGE, settings.max_connection_speed);
-		curl_easy_setopt(easyhandle, CURLOPT_USERAGENT, settings.user_agent.c_str());
+	try{
+		segment_file.open((settings.segments_dir+"/"+file_name).c_str(), ios::trunc|ios::binary );
+	}
+	catch(...){
+		error_log("Can't open segment file:"+settings.segments_dir+"/"+file_name);
+		return 1;
+	}
+	try{
+		easyhandle = curl_easy_init();
+		if(easyhandle) {
+			curl_easy_setopt(easyhandle, CURLOPT_URL, url.c_str() );
+			curl_easy_setopt(easyhandle, CURLOPT_WRITEDATA, this);
+			curl_easy_setopt(easyhandle, CURLOPT_PRIVATE, this);
+			curl_easy_setopt(easyhandle, CURLOPT_RANGE, range.c_str());
+			curl_easy_setopt(easyhandle, CURLOPT_TIMEOUT, settings.time_out);
+			curl_easy_setopt(easyhandle, CURLOPT_FTP_RESPONSE_TIMEOUT, settings.ftp_response_timeout);
+			curl_easy_setopt(easyhandle, CURLOPT_LOW_SPEED_LIMIT, settings.low_connection_speed_limit);
+			curl_easy_setopt(easyhandle, CURLOPT_LOW_SPEED_TIME, settings.low_connection_speed_time);
+			curl_easy_setopt(easyhandle, CURLOPT_MAX_RECV_SPEED_LARGE, settings.max_connection_speed);
+			curl_easy_setopt(easyhandle, CURLOPT_USERAGENT, settings.user_agent.c_str());
 
-		if (settings.proxy_off)
-			curl_easy_setopt(easyhandle, CURLOPT_NOPROXY, "*");
-		else{
-			if ((settings.proxy_ip_or_name!="none") and (settings.proxy_port!=0)){
-				curl_easy_setopt(easyhandle, CURLOPT_PROXY, settings.proxy_ip_or_name.c_str());
-				curl_easy_setopt(easyhandle, CURLOPT_PROXYPORT, settings.proxy_port);
-				debug("Using proxy:"+settings.proxy_ip_or_name+":"+toString(settings.proxy_port));
-			}
-			if (settings.proxy_user!="none"){
-				curl_easy_setopt(easyhandle, CURLOPT_PROXYUSERNAME, settings.proxy_user.c_str());
-				if (settings.proxy_password!="none")
-					curl_easy_setopt(easyhandle, CURLOPT_PROXYPASSWORD, settings.proxy_password.c_str());
+			if (settings.proxy_off)
+				curl_easy_setopt(easyhandle, CURLOPT_NOPROXY, "*");
+			else{
+				if ((settings.proxy_ip_or_name!="none") and (settings.proxy_port!=0)){
+					curl_easy_setopt(easyhandle, CURLOPT_PROXY, settings.proxy_ip_or_name.c_str());
+					curl_easy_setopt(easyhandle, CURLOPT_PROXYPORT, settings.proxy_port);
+					debug("Using proxy:"+settings.proxy_ip_or_name+":"+toString(settings.proxy_port));
+				}
+				if (settings.proxy_user!="none"){
+					curl_easy_setopt(easyhandle, CURLOPT_PROXYUSERNAME, settings.proxy_user.c_str());
+					if (settings.proxy_password!="none")
+						curl_easy_setopt(easyhandle, CURLOPT_PROXYPASSWORD, settings.proxy_password.c_str());
+				}
 			}
-		}
 
-		if ((settings.bind_interface!="none") 
-				and (settings.bind_interface!="") 
-				and (settings.bind_interface!="NONE"))
-			curl_easy_setopt(easyhandle, CURLOPT_INTERFACE, settings.bind_interface.c_str());
-		
-		//set connection timeout
-		curl_easy_setopt(easyhandle, CURLOPT_CONNECTTIMEOUT, settings.connection_timeout);
-		curl_easy_setopt(easyhandle, CURLOPT_WRITEFUNCTION, write_data);
-		curl_multi_add_handle(cm, easyhandle);
-		return 0;
+			if ((settings.bind_interface!="none") 
+					and (settings.bind_interface!="") 
+					and (settings.bind_interface!="NONE"))
+				curl_easy_setopt(easyhandle, CURLOPT_INTERFACE, settings.bind_interface.c_str());
+			//set connection timeout
+			curl_easy_setopt(easyhandle, CURLOPT_CONNECTTIMEOUT, settings.connection_timeout);
+			curl_easy_setopt(easyhandle, CURLOPT_WRITEFUNCTION, write_data);
+			curl_multi_add_handle(cm, easyhandle);
+			return 0;
+		}else
+			return 1;
+	}catch(...){
+		error_log("Error in segment.cpp: add_easy_handle_to_multi()");
+		return 1;
 	}
-	else
-	return 1;
 }
 void show_progress(ulong time_diff){
-	stats.total_bytes_per_last_interval=0;
-	for (uint con_num=0; con_num<MAX_CONNECTS; con_num++){
-		//    ulong speed=bytes_written*1000/(diff_sec+diff_milli);
-		//if connection is not NULL
-		if (connection_array[con_num].segment){
-			Tsegment* segment=(Tsegment*)connection_array[con_num].segment;
-			stats.total_bytes_per_last_interval+=connection_array[con_num].get_bytes_per_last_interval();
-			msg_segment_progress(con_num,segment->segment_num, segment->try_num,
-				segment->downloaded_bytes,segment->segment_size,
-				(connection_array[con_num].get_bytes_per_last_interval())/time_diff);
-			connection_array[con_num].reset_bytes_per_last_interval();
+	try{
+		stats.total_bytes_per_last_interval=0;
+		for (uint con_num=0; con_num<MAX_CONNECTS; con_num++){
+			//    ulong speed=bytes_written*1000/(diff_sec+diff_milli);
+			//if connection is not NULL
+			if (connection_array[con_num].segment){
+				Tsegment* segment=(Tsegment*)connection_array[con_num].segment;
+				stats.total_bytes_per_last_interval+=connection_array[con_num].get_bytes_per_last_interval();
+				msg_segment_progress(con_num,segment->segment_num, segment->try_num,
+					segment->downloaded_bytes,segment->segment_size,
+					(connection_array[con_num].get_bytes_per_last_interval())/time_diff);
+				connection_array[con_num].reset_bytes_per_last_interval();
+			}
 		}
+		stats.last_time_interval=time_diff;
+		stats.show_totals();
+	}
+	catch(...){
+		error_log("Error in segment.cpp: show_progress()");
 	}
-	stats.last_time_interval=time_diff;
-	stats.show_totals();
 }
 
 size_t write_data(void *buffer, size_t size, size_t nmemb, void *cur_segment){
-	Tsegment *segment;
-	segment =(Tsegment*)cur_segment;
-	segment->downloaded_bytes+=nmemb;
-	ulong bytes_written=fwrite(buffer,size,nmemb,segment->segment_file);
-//	debug(settings.segments_dir+"/"+segment->file_name);
-	connection_array[segment->connection_num].inc_bytes_per_last_interval(bytes_written);
+	ulong bytes_written=size*nmemb;
+	try{
+		Tsegment *segment;
+		segment =(Tsegment*)cur_segment;
+		segment->downloaded_bytes+=nmemb;
+
+		try{
+			segment->segment_file.write((char*)buffer,nmemb*size);
+		}
+		catch(...){
+			error_log("Can't write segment file:"+segment->file_name);
+		}
+		connection_array[segment->connection_num].inc_bytes_per_last_interval(bytes_written);
 
-	time_t now_time;
-	now_time = time((time_t *)NULL);
+		time_t now_time;
+		now_time = time((time_t *)NULL);
 //	ulong diff_sec = difftime(now_time.tv_sec, prev_time.tv_sec) * 1000000;
 //	ulong diff_milli = difftime(now_time.tv_usec, prev_time.tv_usec) + diff_sec;
-	ulong time_diff=now_time-prev_time;
+		ulong time_diff=now_time-prev_time;
 //	debug(segment->file_name+"==="+toString((ulong)now_time)+"=="+toString(now_time));
-	if (time_diff >= 1){
+		if (time_diff >= 1){
 //		debug(segment->file_name+"--->"+toString((ulong)()));
-		show_progress(time_diff);
-		prev_time=now_time;
-	};
+			show_progress(time_diff);
+			prev_time=now_time;
+		};
 //	else 
 //	debug(segment->file_name+"==="+toString(prev_time.tv_sec)+"=="+toString(prev_time.tv_usec)+"==="+toString((ulong)(diff_milli)));
 	      //toString(diff_milli));
 	//refresh();
+	}
+	catch(...){
+		error_log("Error in segment.cpp: write_data()");
+	}
 	return bytes_written;
 }
 #endif
\ No newline at end of file
diff --git a/segget/settings.cpp b/segget/settings.cpp
index c669119..16f83ab 100644
--- a/segget/settings.cpp
+++ b/segget/settings.cpp
@@ -39,6 +39,7 @@ void Tsettings::load_from_conf_file(){
 		conf.set(proxy_off,							"proxy",			"proxy_off");
 		conf.set(proxy_user,						"proxy",			"proxy_user");
 		conf.set(proxy_password,					"proxy",			"proxy_password");
+	}
 	catch(...)
 	{
 		error_log_no_msg("Error calling msg() in settings.cpp: load_from_conf_file()");
diff --git a/segget/tui.cpp b/segget/tui.cpp
index 0b7b260..a7907ed 100644
--- a/segget/tui.cpp
+++ b/segget/tui.cpp
@@ -2,8 +2,6 @@
 extern Tsettings settings;
 
 const uint CONNECTION_LINES=5;
-void msg(uint y, uint x, string msg_text);
-void error_log_no_msg(string error_msg_text);
 
 template<typename T> string toString(T t)
 {
diff --git a/segget/tui.h b/segget/tui.h
index 24a550b..8217f6b 100644
--- a/segget/tui.h
+++ b/segget/tui.h
@@ -19,4 +19,5 @@ void msg_total(string msg_text);
 void log(string log_msg_text);
 void debug(string debug_msg_text);
 void error_log(string error_msg_text);
+void error_log_no_msg(string error_msg_text);
 #endif
\ No newline at end of file