Browse Source

no message

NHH 2 years ago
parent
commit
ca0db47d52
3 changed files with 1 additions and 77 deletions
  1. 1 2
      AnyClearnerMain.cpp
  2. 0 72
      RtpFilesCleaner.cpp
  3. 0 3
      RtpFilesCleaner.h

+ 1 - 2
AnyClearnerMain.cpp

@@ -18,7 +18,7 @@ log4cxx::LoggerPtr app_logger(log4cxx::Logger::getLogger(APPLOG_NAME));
 int main()
 {
 	AppLogConfigure(nullptr, APPLOG_NAME, APPLOG_NAME);
-
+	BLOG_DEBUG(fmt::format("App 0.0.0.2 start"));
     ClearRtpFiles rtpfiles_cleaner;
 	if (!rtpfiles_cleaner.LoadDeviceInfo()) {
 		return -1;
@@ -26,7 +26,6 @@ int main()
 
 	rtpfiles_cleaner.init();
 
-	BLOG_DEBUG(fmt::format("App start"));
 	while (true) {
 		Sleep(1000);
 	}

+ 0 - 72
RtpFilesCleaner.cpp

@@ -848,47 +848,6 @@ void ClearRtpFiles::Get_Channels(const char* backup_folder, const char* src_fold
 			}
 		}
 	}
-
-	//for (auto back : vec_back_foldernames) {
-	//	std::string bak = std::string(back);
-	//	std::string back_channel = get_Item(bak);
-	//	for (auto src : vec_src_foldernames) {
-	//		std::string src_ = std::string(src);
-	//		std::string src_channel = get_Item(src_);
-	//		if (back_channel == src_channel) {
-	//			Check_Channels(src_, bak);
-	//			break;
-	//		}
-	//	}
-	//}
-#if 0
-	//删除备份的空目录
-	{
-		std::vector<char*>::iterator iter;
-		for (auto back : vec_back_foldernames) {
-			Get_DateFiles(&vec_back_date_folder, back);
-				for (auto d : vec_back_date_folder) {
-					std::string file = std::string(d);
-					std::wstring stemp = s2ws(file);
-					LPCWSTR result = stemp.c_str();
-					BOOL ret = PathIsDirectoryEmpty(result);
-					if (ret) {
-						BLOG_DEBUG(fmt::format("Delete BACKUP Folder {}", file));
-#ifdef _DEBUG1
-						SHDeleteFolder(file, false);
-#endif 
-					}
-						
-				}
-				for (iter = vec_back_date_folder.begin(); iter != vec_back_date_folder.end();) {
-					delete (*iter);
-					*iter = NULL;
-					iter = vec_back_date_folder.erase(iter);
-				}
-				vec_back_date_folder.clear();
-			}
-	}
-#endif
 	//剩余空间小于要求值,删除主存储
 	std::string serial = std::string(vec_src_foldernames.front());
 	serial = serial.substr(0, serial.find("\\"));
@@ -1302,37 +1261,6 @@ void ClearRtpFiles::Get_Rtp_Times(std::list<RTPFILEDESC*>* list_rtpfiles, TIME_S
 #endif
 }
 
-int ClearRtpFiles::Get_List_File(const char* backup_folder, const char* src_folder)
-{
-	// # read in file list and divide then into trunk ...
-	rtp_listfile(&list_src_rtpfiles, src_folder);
-
-	BLOG_DEBUG(fmt::format("list_src_rtpfiles src_folder{}, size {}", src_folder, list_src_rtpfiles.size()));
-
-	if (list_src_rtpfiles.empty()) {
-		BLOG_WARN(fmt::format("[F] *** src_folder file[{}] is empty***", src_folder));
-		return -1;
-	}
-	rtp_listfile(&list_backup_rtpfiles, backup_folder);
-	BLOG_DEBUG(fmt::format("list_backup_rtpfiles backup_folder{}, size {}", backup_folder, list_backup_rtpfiles.size()));
-	if (list_backup_rtpfiles.empty()) {
-		BLOG_WARN(fmt::format("[F] *** backup_folder file[{}] is empty ***", backup_folder));
-		return -1;
-	}
-
-	Get_Rtp_Times(&list_src_rtpfiles, src_time_span);
-	Get_Rtp_Times(&list_backup_rtpfiles, back_time_span);
-
-	//src_time_span.start_timesec = list_src_rtpfiles.front()->start_timesec;
-	//src_time_span.end_timesec = list_src_rtpfiles.back()->end_timesec;
-
-	//back_time_span.start_timesec = list_backup_rtpfiles.front()->start_timesec;
-	//back_time_span.end_timesec = list_backup_rtpfiles.back()->end_timesec;
-	BLOG_DEBUG(fmt::format("src_time_span {}, {}~{}", src_folder,src_time_span.start_timesec, src_time_span.end_timesec));
-	BLOG_DEBUG(fmt::format("backup_time_span {}, {}~{}", backup_folder,back_time_span.start_timesec, back_time_span.end_timesec));
-	return 1;
-}
-
 int ClearRtpFiles::Get_Disk_Free(std::string serial)
 {
 	int pSize = MultiByteToWideChar(CP_OEMCP, 0, serial.c_str(), serial.size() + 1, NULL, 0);

+ 0 - 3
RtpFilesCleaner.h

@@ -114,14 +114,11 @@ public:
 	BOOL SHDeleteFolder(std::string pstrFolder, BOOL bAllowUndo);
 	int Get_Date_List(std::vector<char*>* pVecFolderName, char* folder_name);
 	void Get_DateFiles(std::vector<char*>* vec_foldernames, const char* src_folder);
-	int Identical_file_check();
 	bool LoadDeviceInfo();
 	void Get_Channels(const char* backup_folder, const char* src_folder);
 	void Get_Folder(std::vector<char*>* vec_foldernames, const char* src_folder);
 	int Get_Folder_List(std::vector<char*>* pVecFolderName, char* folder_name);
 	void init();
-	// find src_folder all *.rtp within [start_time, end_time] to dst_folder with the same file structure
-	int Get_List_File(const char* backup_folder, const char* src_folder);
 	//	int rtp_proc(RTPFILEDESC* rtp_filedesc, Buffer_t* mem_buffer, CRtpFrame* rtp_frame, FRAMEDATACALLBACK framedata_cb, void* user_data);
 	int rtp_listfile(std::list<RTPFILEDESC*>* list_rtpfiles, const char* src_folder);