hane 1.1.0 → 1.2.0

package/vendor/zsign/src/common/fs.h

@@ -1,50 +1,50 @@
-#pragma once
-#include "common.h"
-
-typedef function<bool (bool bFolder, const string& strPath)> enum_folder_callback;
-
-class ZFile
-{
-public:
-	static bool		ReadFile(const char* szFile, string& strData);
-	static bool		ReadFileV(string& strData, const char* szPath, ...);
-	static bool		WriteFile(const char* szFile, const string& strData);
-	static bool		WriteFile(const char* szFile, const char* szData, size_t sLen);
-	static bool		WriteFileV(string& strData, const char* szPath, ...);
-	static bool		WriteFileV(const char* szData, size_t sLen, const char* szPath, ...);
-	static bool		AppendFile(const char* szFile, const string& strData);
-	static bool		AppendFile(const char* szFile, const char* szData, size_t sLen);
-	static bool		IsRegularFile(const char* szFile);
-	static bool		IsFolder(const char* szFolder);
-	static bool		IsFolderV(const char* szPath, ...);
-	static bool		CreateFolder(const char* szFolder);
-	static bool		CreateFolderV(const char* szPath, ...);
-	static bool		RemoveFile(const char* szFile);
-	static bool		RemoveFileV(const char* szPath, ...);
-	static bool		RemoveFolder(const char* szFolder);
-	static bool		RemoveFolderV(const char* szPath, ...);
-	static bool		IsFileExists(const char* szFile);
-	static bool		IsFileExistsV(const char* szPath, ...);
-	static int64_t	GetFileSize(FILE* fp);
-	static int64_t	GetFileSize(const char* szPath);
-	static int64_t	GetFileSizeV(const char* szPath, ...);
-	static string	GetFileSizeString(const char* szFile);
-	static bool		IsZipFile(const char* szFile);
-	static bool		CopyFile(const char* szSrcFile, const char* szDestFile);
-	static bool		CopyFileV(const char* szSrcFile, const char* szDestPath, ...);
-	static string	GetFullPath(const char* szPath);
-	static string	GetRealPathV(const char* szPath, ...);
-	static void*	MapFile(const char* path, size_t offset, size_t size, size_t* psize, bool ro);
-	static bool		UnmapFile(void* base, size_t size);
-	static bool		IsPathSuffix(const string& strPath, const char* suffix);
-	static const char* GetTempFolder();
-	static bool		EnumFolder(const char* szFolder, bool bRecursive, enum_folder_callback filter, enum_folder_callback callback);
-
-	static bool		PathRemoveFileSpec(string& path);
-
-private:
-	static int RemoveFolderCallBack(const char* fpath, const struct stat* sb, int typeflag, struct FTW* ftwbuf);
-
-private:
-	static map<void*, void*> s_mapFiles;
-};
+#pragma once
+#include "common.h"
+
+typedef function<bool (bool bFolder, const string& strPath)> enum_folder_callback;
+
+class ZFile
+{
+public:
+	static bool		ReadFile(const char* szFile, string& strData);
+	static bool		ReadFileV(string& strData, const char* szPath, ...);
+	static bool		WriteFile(const char* szFile, const string& strData);
+	static bool		WriteFile(const char* szFile, const char* szData, size_t sLen);
+	static bool		WriteFileV(string& strData, const char* szPath, ...);
+	static bool		WriteFileV(const char* szData, size_t sLen, const char* szPath, ...);
+	static bool		AppendFile(const char* szFile, const string& strData);
+	static bool		AppendFile(const char* szFile, const char* szData, size_t sLen);
+	static bool		IsRegularFile(const char* szFile);
+	static bool		IsFolder(const char* szFolder);
+	static bool		IsFolderV(const char* szPath, ...);
+	static bool		CreateFolder(const char* szFolder);
+	static bool		CreateFolderV(const char* szPath, ...);
+	static bool		RemoveFile(const char* szFile);
+	static bool		RemoveFileV(const char* szPath, ...);
+	static bool		RemoveFolder(const char* szFolder);
+	static bool		RemoveFolderV(const char* szPath, ...);
+	static bool		IsFileExists(const char* szFile);
+	static bool		IsFileExistsV(const char* szPath, ...);
+	static int64_t	GetFileSize(FILE* fp);
+	static int64_t	GetFileSize(const char* szPath);
+	static int64_t	GetFileSizeV(const char* szPath, ...);
+	static string	GetFileSizeString(const char* szFile);
+	static bool		IsZipFile(const char* szFile);
+	static bool		CopyFile(const char* szSrcFile, const char* szDestFile);
+	static bool		CopyFileV(const char* szSrcFile, const char* szDestPath, ...);
+	static string	GetFullPath(const char* szPath);
+	static string	GetRealPathV(const char* szPath, ...);
+	static void*	MapFile(const char* path, size_t offset, size_t size, size_t* psize, bool ro);
+	static bool		UnmapFile(void* base, size_t size);
+	static bool		IsPathSuffix(const string& strPath, const char* suffix);
+	static const char* GetTempFolder();
+	static bool		EnumFolder(const char* szFolder, bool bRecursive, enum_folder_callback filter, enum_folder_callback callback);
+
+	static bool		PathRemoveFileSpec(string& path);
+
+private:
+	static int RemoveFolderCallBack(const char* fpath, const struct stat* sb, int typeflag, struct FTW* ftwbuf);
+
+private:
+	static map<void*, void*> s_mapFiles;
+};

package/vendor/zsign/src/common/log.cpp

@@ -1,145 +1,145 @@
-#include "log.h"
-
-
-int ZLog::g_nLogLevel = ZLog::E_INFO;
-
-void ZLog::_Print(const char* szLog, int nColor)
-{
-	if (g_nLogLevel <= E_NONE) {
-		return;
-	}
-
-#ifdef _WIN32
-
-	string strLog = szLog;
-	HANDLE hConsole = ::GetStdHandle(STD_OUTPUT_HANDLE);
-	if (nColor > 0) {
-		::SetConsoleTextAttribute(hConsole, nColor);
-	}
-	::WriteFile(hConsole, strLog.data(), (DWORD)strLog.size(), NULL, NULL);
-	if (nColor > 0) {
-		::SetConsoleTextAttribute(hConsole, 7);
-	}
-
-#else
-
-	const char* szColor = NULL;
-	switch (nColor) {
-		case 6:
-			szColor = "\033[33m";
-			break;
-		case 10:
-			szColor = "\033[32m";
-			break;
-		case 12: 
-			szColor = "\033[31m";
-			break;
-		default:
-			break;
-	}
-
-	if (NULL != szColor) {
-		write(STDOUT_FILENO, szColor, strlen(szColor));
-	}
-	write(STDOUT_FILENO, szLog, strlen(szLog));
-	if (NULL != szColor) {
-		write(STDOUT_FILENO, "\033[0m", 4);
-	}
-	
-#endif
-}
-
-void ZLog::Print(int nLevel, const char* szLog)
-{
-	if (g_nLogLevel >= nLevel) {
-		_Print(szLog);
-	}
-}
-
-void ZLog::PrintV(int nLevel, const char* szFormat, ...)
-{
-	if (g_nLogLevel >= nLevel) {
-		FORMAT_V(szFormat, szLog);
-		_Print(szLog);
-	}
-}
-
-bool ZLog::Error(const char* szLog)
-{
-	_Print(szLog, 12);
-	return false;
-}
-
-bool ZLog::ErrorV(const char* szFormat, ...)
-{
-	FORMAT_V(szFormat, szLog);
-	_Print(szLog, 12);
-	return false;
-}
-
-bool ZLog::Success(const char* szLog)
-{
-	_Print(szLog, 10);
-	return true;
-}
-
-bool ZLog::SuccessV(const char* szFormat, ...)
-{
-	FORMAT_V(szFormat, szLog);
-	_Print(szLog, 10);
-	return true;
-}
-
-bool ZLog::PrintResult(bool bSuccess, const char* szLog)
-{
-	return bSuccess ? Success(szLog) : Error(szLog);
-}
-
-bool ZLog::PrintResultV(bool bSuccess, const char* szFormat, ...)
-{
-	FORMAT_V(szFormat, szLog);
-	return bSuccess ? Success(szLog) : Error(szLog);
-}
-
-bool ZLog::Warn(const char* szLog)
-{
-	_Print(szLog, 6);
-	return false;
-}
-
-bool ZLog::WarnV(const char* szFormat, ...)
-{
-	FORMAT_V(szFormat, szLog);
-	_Print(szLog, 6);
-	return false;
-}
-
-void ZLog::Print(const char* szLog)
-{
-	if (g_nLogLevel >= E_INFO) {
-		_Print(szLog);
-	}
-}
-
-void ZLog::PrintV(const char* szFormat, ...)
-{
-	if (g_nLogLevel >= E_INFO) {
-		FORMAT_V(szFormat, szLog);
-		_Print(szLog);
-	}
-}
-
-void ZLog::Debug(const char* szLog)
-{
-	if (g_nLogLevel >= E_DEBUG) {
-		_Print(szLog);
-	}
-}
-
-void ZLog::DebugV(const char* szFormat, ...)
-{
-	if (g_nLogLevel >= E_DEBUG) {
-		FORMAT_V(szFormat, szLog);
-		_Print(szLog);
-	}
-}
+#include "log.h"
+
+
+int ZLog::g_nLogLevel = ZLog::E_INFO;
+
+void ZLog::_Print(const char* szLog, int nColor)
+{
+	if (g_nLogLevel <= E_NONE) {
+		return;
+	}
+
+#ifdef _WIN32
+
+	string strLog = szLog;
+	HANDLE hConsole = ::GetStdHandle(STD_OUTPUT_HANDLE);
+	if (nColor > 0) {
+		::SetConsoleTextAttribute(hConsole, nColor);
+	}
+	::WriteFile(hConsole, strLog.data(), (DWORD)strLog.size(), NULL, NULL);
+	if (nColor > 0) {
+		::SetConsoleTextAttribute(hConsole, 7);
+	}
+
+#else
+
+	const char* szColor = NULL;
+	switch (nColor) {
+		case 6:
+			szColor = "\033[33m";
+			break;
+		case 10:
+			szColor = "\033[32m";
+			break;
+		case 12: 
+			szColor = "\033[31m";
+			break;
+		default:
+			break;
+	}
+
+	if (NULL != szColor) {
+		write(STDOUT_FILENO, szColor, strlen(szColor));
+	}
+	write(STDOUT_FILENO, szLog, strlen(szLog));
+	if (NULL != szColor) {
+		write(STDOUT_FILENO, "\033[0m", 4);
+	}
+	
+#endif
+}
+
+void ZLog::Print(int nLevel, const char* szLog)
+{
+	if (g_nLogLevel >= nLevel) {
+		_Print(szLog);
+	}
+}
+
+void ZLog::PrintV(int nLevel, const char* szFormat, ...)
+{
+	if (g_nLogLevel >= nLevel) {
+		FORMAT_V(szFormat, szLog);
+		_Print(szLog);
+	}
+}
+
+bool ZLog::Error(const char* szLog)
+{
+	_Print(szLog, 12);
+	return false;
+}
+
+bool ZLog::ErrorV(const char* szFormat, ...)
+{
+	FORMAT_V(szFormat, szLog);
+	_Print(szLog, 12);
+	return false;
+}
+
+bool ZLog::Success(const char* szLog)
+{
+	_Print(szLog, 10);
+	return true;
+}
+
+bool ZLog::SuccessV(const char* szFormat, ...)
+{
+	FORMAT_V(szFormat, szLog);
+	_Print(szLog, 10);
+	return true;
+}
+
+bool ZLog::PrintResult(bool bSuccess, const char* szLog)
+{
+	return bSuccess ? Success(szLog) : Error(szLog);
+}
+
+bool ZLog::PrintResultV(bool bSuccess, const char* szFormat, ...)
+{
+	FORMAT_V(szFormat, szLog);
+	return bSuccess ? Success(szLog) : Error(szLog);
+}
+
+bool ZLog::Warn(const char* szLog)
+{
+	_Print(szLog, 6);
+	return false;
+}
+
+bool ZLog::WarnV(const char* szFormat, ...)
+{
+	FORMAT_V(szFormat, szLog);
+	_Print(szLog, 6);
+	return false;
+}
+
+void ZLog::Print(const char* szLog)
+{
+	if (g_nLogLevel >= E_INFO) {
+		_Print(szLog);
+	}
+}
+
+void ZLog::PrintV(const char* szFormat, ...)
+{
+	if (g_nLogLevel >= E_INFO) {
+		FORMAT_V(szFormat, szLog);
+		_Print(szLog);
+	}
+}
+
+void ZLog::Debug(const char* szLog)
+{
+	if (g_nLogLevel >= E_DEBUG) {
+		_Print(szLog);
+	}
+}
+
+void ZLog::DebugV(const char* szFormat, ...)
+{
+	if (g_nLogLevel >= E_DEBUG) {
+		FORMAT_V(szFormat, szLog);
+		_Print(szLog);
+	}
+}

package/vendor/zsign/src/common/log.h

@@ -1,37 +1,37 @@
-#pragma once
-#include "common.h"
-
-class ZLog
-{
-public:
-	enum eLogType
-	{
-		E_NONE = 0,
-		E_ERROR = 1,
-		E_WARN = 2,
-		E_INFO = 3,
-		E_DEBUG = 4
-	};
-
-public:
-	static bool IsDebug() { return (E_DEBUG == g_nLogLevel); }
-	static void Print(const char* szLog);
-	static void PrintV(const char* szFormat, ...);
-	static void Debug(const char* szLog);
-	static void DebugV(const char* szFormat, ...);
-	static bool Warn(const char* szLog);
-	static bool WarnV(const char* szFormat, ...);
-	static bool Error(const char* szLog);
-	static bool ErrorV(const char* szFormat, ...);
-	static bool Success(const char* szLog);
-	static bool SuccessV(const char* szFormat, ...);
-	static bool PrintResult(bool bSuccess, const char* szLog);
-	static bool PrintResultV(bool bSuccess, const char* szFormat, ...);
-	static void Print(int nLevel, const char* szLog);
-	static void PrintV(int nLevel, const char* szFormat, ...);
-	static void SetLogLever(int nLogLevel) { g_nLogLevel = nLogLevel; }
-
-private:
-	static void _Print(const char* szLog, int nColor = 0);
-	static int g_nLogLevel;
-};
+#pragma once
+#include "common.h"
+
+class ZLog
+{
+public:
+	enum eLogType
+	{
+		E_NONE = 0,
+		E_ERROR = 1,
+		E_WARN = 2,
+		E_INFO = 3,
+		E_DEBUG = 4
+	};
+
+public:
+	static bool IsDebug() { return (E_DEBUG == g_nLogLevel); }
+	static void Print(const char* szLog);
+	static void PrintV(const char* szFormat, ...);
+	static void Debug(const char* szLog);
+	static void DebugV(const char* szFormat, ...);
+	static bool Warn(const char* szLog);
+	static bool WarnV(const char* szFormat, ...);
+	static bool Error(const char* szLog);
+	static bool ErrorV(const char* szFormat, ...);
+	static bool Success(const char* szLog);
+	static bool SuccessV(const char* szFormat, ...);
+	static bool PrintResult(bool bSuccess, const char* szLog);
+	static bool PrintResultV(bool bSuccess, const char* szFormat, ...);
+	static void Print(int nLevel, const char* szLog);
+	static void PrintV(int nLevel, const char* szFormat, ...);
+	static void SetLogLever(int nLogLevel) { g_nLogLevel = nLogLevel; }
+
+private:
+	static void _Print(const char* szLog, int nColor = 0);
+	static int g_nLogLevel;
+};