no message

RtpFilesCleaner.cpp

@@ -458,103 +458,6 @@ void ClearRtpFiles::Delete_file(std::string filename)
 	}
 }
 
-int ClearRtpFiles::Identical_file_check()
-{
-	std::list<RTPFILEDESC*>::iterator iter;
-	//备份跨度不在主目录跨度内
-	if (back_time_span.end_timesec < src_time_span.start_timesec ||
-		back_time_span.start_timesec > src_time_span.end_timesec) {
-
-		BLOG_DEBUG("differert time span");
-	}
-	//备份跨度在主目录跨度的左侧
-	if (back_time_span.start_timesec < src_time_span.start_timesec &&
-		back_time_span.end_timesec < src_time_span.end_timesec &&
-		back_time_span.end_timesec > src_time_span.start_timesec) {
-
-		for (iter = list_backup_rtpfiles.begin(); iter != list_backup_rtpfiles.end();) {
-			if ((*iter)->end_timesec <= back_time_span.end_timesec) {
-				BLOG_DEBUG(fmt::format("left Delete_file {}", (*iter)->file_name));
-#ifdef _DEBUG1
-				Delete_file((*iter)->file_name);
-#endif 
-			}
-			iter++;
-		}
-	}
-	//备份跨度都在主目录跨度内
-	if (back_time_span.start_timesec >= src_time_span.start_timesec &&
-		back_time_span.end_timesec <= src_time_span.end_timesec) {
-		for (iter = list_backup_rtpfiles.begin(); iter != list_backup_rtpfiles.end();) {
-			BLOG_DEBUG(fmt::format("all Delete_file {}", (*iter)->file_name));
-#ifdef _DEBUG1
-			Delete_file((*iter)->file_name);
-#endif 
-			iter++;
-		}
-	}
-	//备份跨度包含主目录跨度
-	if (back_time_span.start_timesec < src_time_span.start_timesec &&
-		back_time_span.end_timesec > src_time_span.end_timesec) {
-
-		if ((*iter)->start_timesec >= src_time_span.start_timesec && (*iter)->end_timesec <= src_time_span.end_timesec) {
-			BLOG_DEBUG(fmt::format("all have Delete_file {}", (*iter)->file_name));
-#ifdef _DEBUG1
-			Delete_file((*iter)->file_name);
-#endif 
-		}
-			
-		iter++;
-	}
-	//备份跨度在主目录跨度右侧
-	if (back_time_span.start_timesec > src_time_span.start_timesec &&
-		back_time_span.end_timesec > src_time_span.end_timesec &&
-		back_time_span.start_timesec < src_time_span.end_timesec) {
-
-		for (iter = list_backup_rtpfiles.begin(); iter != list_backup_rtpfiles.end();) {
-			if ((*iter)->end_timesec <= src_time_span.end_timesec) {
-				BLOG_DEBUG(fmt::format("right Delete_file {}", (*iter)->file_name));
-#ifdef _DEBUG1
-				Delete_file((*iter)->file_name);
-#endif 
-			}
-			iter++;
-		}
-	}
-#if 0
-	std::string src;
-	std::string back;
-	std::list<RTPFILEDESC*>::iterator iter = list_backup_rtpfiles.begin();
-	for (iter; iter != list_backup_rtpfiles.end();) {
-		back = std::string((*iter)->folder);
-		for (auto l : list_src_rtpfiles) {
-			src = std::string(l->folder);
-			if (back == src) {
-				if ((*iter)->name == l->name) {
-					//delete file
-					BLOG_DEBUG(fmt::format("Delete_file {}", (*iter)->file_name));
-					//Delete_file((*iter)->file_name);
-				}
-			}
-		}
-		iter++;
-	}
-#endif
-	for (iter = list_src_rtpfiles.begin(); iter != list_src_rtpfiles.end();) {
-		delete (*iter);
-		*iter = NULL;
-		iter = list_src_rtpfiles.erase(iter);
-	}
-	list_src_rtpfiles.clear();
-
-	for (iter = list_backup_rtpfiles.begin(); iter != list_backup_rtpfiles.end();) {
-		delete (*iter);
-		*iter = NULL;
-		iter = list_backup_rtpfiles.erase(iter);
-	}
-	list_backup_rtpfiles.clear();
-	return 0;
-}
 void get_Item_ex(std::string src,std::string& head,std::string& end)
 {
 	std::string data = src;
@@ -750,10 +653,6 @@ void ClearRtpFiles::Folder_Sort(std::vector<char*>* src_folder, std::vector<char
 }
 void ClearRtpFiles::Check_Channels(std::string src, std::string backup)
 {
-#if 0
-		Get_List_File(backup.c_str(), src.c_str());
-		Identical_file_check();
-#else
 	std::string last_day;
 	std::string next_day;
 	std::string src_day;
@@ -923,7 +822,6 @@ void ClearRtpFiles::Check_Channels(std::string src, std::string backup)
 		it_char = backup_day_name.erase(it_char);
 	}
 	backup_day_name.clear();
-#endif
 }
 void ClearRtpFiles::Get_Channels(const char* backup_folder, const char* src_folder)
 {