V0.2.8

1、CurlFtp可以获取到文件列表了，包括文件大小、文件类型、文件名

common/CurlFtp/CurlFtp.cpp

@@ -4,13 +4,26 @@
 #include <regex>
 #include <iosfwd>
 
+#include "fmtlog.h"
+#include "CurlFtpInfo.h"
+
+
+#if defined(_WIN32)
+
+#endif /* _WIN32 */
+
+/* ==================================================================================
+ * *********************************** 全局变量 *************************************
+ * ==================================================================================
+ */
 
 /* 是否有初始化实例，主要用于静态函数调用curl_global_cleanup()函数前判断，有实例就不调用 */
 static bool hasInstace = false;
 
 /* ==================================================================================
  * *********************************** 全局函数 *************************************
- * ================================================================================== */
+ * ==================================================================================
+ */
 
 /**
  * @brief 写入回调函数
@@ -18,25 +31,24 @@ static bool hasInstace = false;
  * @param contents curl的数据缓冲区
  * @param size 数据大小，单位是size_t
  * @param nmemb size_t的单位字节数
- * @param s 用户提供的字符串
+ * @param userStr 用户提供的字符串，格式可以是任意的
  * @return size_t 总共获取到的数据大小，单位是字节
  */
-static size_t writeStringCallback(void *contents, size_t size, size_t nmemb, std::string *s) 
+static size_t writeStringCallback(void *contents, size_t size, size_t nmemb, std::string *userStr) 
 {
-    size_t newLength = size*nmemb;
-    size_t oldLength = s->size();
+    size_t newLength = size * nmemb;
+    size_t oldLength = userStr->size();
     try
     {
-        s->resize(oldLength + newLength);
+        userStr->resize(oldLength + newLength);
     }
     catch(std::bad_alloc &e)
     {
         //handle memory problem
         return 0;
     }
-
-    std::copy((char*)contents,(char*)contents+newLength,s->begin()+oldLength);
-    return size*nmemb;
+    std::copy_n((char*)contents, newLength, userStr->begin() + oldLength);
+    return size * nmemb;
 }
 
 
@@ -58,6 +70,86 @@ static int writeStringListCallback(void* buffer, size_t size, size_t nmemb, void
     return size * nmemb;
 }
 
+/* 使用Windows API进行编码转换 */
+#if defined(_WIN32)
+static char* GBToUTF8(const char* gb2312)
+{
+    int len = MultiByteToWideChar(CP_ACP, 0, gb2312, -1, NULL, 0);
+    wchar_t* wstr = new wchar_t[len+1];
+    memset(wstr, 0, len+1);
+    MultiByteToWideChar(CP_ACP, 0, gb2312, -1, wstr, len);
+    len = WideCharToMultiByte(CP_UTF8, 0, wstr, -1, NULL, 0, NULL, NULL);
+    char* str = new char[len+1];
+    memset(str, 0, len+1);
+    WideCharToMultiByte(CP_UTF8, 0, wstr, -1, str, len, NULL, NULL);
+    if(wstr) delete[] wstr;
+    return str;
+}
+#endif /* _WIN32 */
+
+/**
+ * @brief 解析字符串文件信息
+ * 
+ * @param strSrc 
+ * @param fileList 
+ * @return true 
+ * @return false 
+ */
+static bool parseFileInfo(const std::string& strSrc, std::vector<CF_FileInfo>& fileInfo)
+{
+#if defined(_WIN32)
+    auto str1 = GBToUTF8(strSrc.c_str());
+    std::string str2 = str1;
+#else
+    std::string str2 = strSrc;
+#endif /* _WIN32 */
+    
+    // FMTLOG_DEBUG("\n{}", str2);
+    /* 正则表达式，匹配多个空格 */
+    std::regex reg(R"(( )+)");
+    /* 匹配以非空格开头的字符，空格隔开，中间任意字符，空格隔开，非空格组成的结尾
+     * (文件类型) ... (文件大小,$5) ... (文件名)
+     */
+    std::regex reg1(R"(^([^ ]+) (\d*) (\w*) (\w*) (\d*) (.*) ([^ ]+)$)");
+    // FMTLOG_INFO("\n-------------------\n");
+    /* 匹配换行符，分割每一行 */
+    std::regex reg2(R"(\n)");
+    /* 匹配文件夹 */
+    std::regex reg3(R"(^d.*)");
+    /* 匹配文件 */
+    std::regex reg4(R"(^-.*$)");
+
+    /* -1 表示对正则表达式之前的子序列感兴趣
+     * 0 表示对正则表达式本身感兴趣，输出的就是换行符 */
+    std::sregex_token_iterator it2(str2.begin(), str2.end(), reg2, -1);
+    /* 这里取出每一行 */
+    for(; it2 != std::sregex_token_iterator(); ++it2)
+    {
+        /* 去掉多余的空格 */
+        auto line = std::regex_replace(it2->str(), reg, " ");
+        // FMTLOG_INFO("{}", line);
+        CF_FileInfo fi;
+        /* 取出文件类型 */
+        std::string strFileType = std::regex_replace(line, reg1, "$1");
+        if(std::regex_match(strFileType, reg3))
+        {
+            fi.type = CF_FileType::DIR;
+        }else if (std::regex_match(strFileType, reg4))
+        {
+            fi.type = CF_FileType::FILE;
+        }
+        /* 取出文件大小 */
+        std::string strFileSize = std::regex_replace(line, reg1, "$5");
+        fi.size = std::stoull(strFileSize);
+        /* 取出文件名 */
+        std::string strFileName = std::regex_replace(line, reg1, "$7");
+        fi.name = strFileName;
+        /* 加入队列 */
+        fileInfo.push_back(fi);
+    }
+
+    return true;
+}
 
 
 /* ==================================================================================
@@ -308,8 +400,34 @@ bool CurlFtp::setFtpUsernameAndPassword(const std::string& username, const std::
     return true;
 }
 
+
+/* 列出文件列表 */
+bool CurlFtp::getFileList(std::string dir, std::vector<std::string>& fileList)
+{
+    if(m_IP.empty() || m_port.empty())
+    {
+        FMTLOG_WARN("IP or port is empty");
+        return false;
+    }
+    if(m_curl == nullptr)
+    {
+        FMTLOG_WARN("m_curl is nullptr");
+        return false;
+    }
+    std::vector<CF_FileInfo> listInfo;
+    listAll(dir, listInfo);
+    // for(const CF_FileInfo& fi : listInfo)
+    // {
+    //     FMTLOG_INFO("type = {}, size = {}, name = {}", (int)fi.type, fi.size, fi.name);
+    // }
+    
+    return true;
+}
+
+
+
 /* 列出文件列表 */
-bool CurlFtp::listAll(std::string dir, std::vector<std::string>& fileList)
+bool CurlFtp::listAll(std::string dir, std::vector<CF_FileInfo>& fileList)
 {
     if(m_IP.empty() || m_port.empty())
     {
@@ -320,8 +438,9 @@ bool CurlFtp::listAll(std::string dir, std::vector<std::string>& fileList)
     {
         printf("m_curl is nullptr\n");
         return false;
-    } 
+    }
     bool result = false;
+    std::string strSrc;
     /* 先设置FTP地址 */
     std::string ftpUrl = m_ftpUrl + dir;
     curl_easy_setopt(m_curl, CURLOPT_URL, ftpUrl.c_str());
@@ -332,24 +451,21 @@ bool CurlFtp::listAll(std::string dir, std::vector<std::string>& fileList)
     /* 设置列出文件命令，只列出文件名称，不携带信息 */
     // curl_easy_setopt(m_curl, CURLOPT_DIRLISTONLY, 1L);
     /* 设置回调函数 */
-    curl_easy_setopt(m_curl, CURLOPT_WRITEFUNCTION, writeStringListCallback);
-    /* 设置需要写入的容器 */
-    curl_easy_setopt(m_curl, CURLOPT_WRITEDATA, &fileList);
+    curl_easy_setopt(m_curl, CURLOPT_WRITEFUNCTION, writeStringCallback);
+    /* 设置需要写入的容器，回调函数的第四个参数 */
+    curl_easy_setopt(m_curl, CURLOPT_WRITEDATA, &strSrc);
 
     /* 发送请求 */
     m_res = curl_easy_perform(m_curl);
     if(m_res != CURLE_OK) 
     {
-        fprintf(stderr, "Failed to get file list, error code :%d ,%s\n", m_res, curl_easy_strerror(m_res));
-        result = false;
-    } else 
-    {
-        result = true;
+        FMTLOG_ERROR("Failed to get file list, error code: {} ,{}", (int)m_res, curl_easy_strerror(m_res));
+        return false;
     }
+    /* 解析字符串 */
+    parseFileInfo(strSrc, fileList);
 
-
-    // curl_easy_cleanup(m_curl);
-    return result;
+    return true;
 }
 
 

common/CurlFtp/CurlFtp.h

@@ -6,6 +6,8 @@
 #include <vector>
 #include <mutex>
 
+struct CF_FileInfo;
+
 class CurlFtp
 {
 public:
@@ -28,7 +30,11 @@ public:
     /* 设置用户名和密码 */
     bool setFtpUsernameAndPassword(const std::string& username, const std::string& password);
     /* 列出文件列表 */
-    bool listAll(std::string dir, std::vector<std::string>& fileList);
+    bool getFileList(std::string dir, std::vector<std::string>& fileList);
+
+private:
+    /* 列出所有内容 */
+    bool listAll(std::string dir, std::vector<CF_FileInfo>& fileList);
 
 private:
     std::mutex m_mutexCurl;                 /* curl互斥锁 */

common/CurlFtp/CurlFtpInfo.h

@@ -0,0 +1,43 @@
+#ifndef CURLFTPINFO_H
+#define CURLFTPINFO_H
+
+#include <string>
+#include <Regex>
+
+
+
+
+
+
+/* 文件类型 */
+enum class CF_FileType
+{
+    FILE,
+    DIR,
+    LINK,
+    UNKNOWN
+};
+
+/* 文件信息 */
+struct CF_FileInfo
+{
+    CF_FileType type;           /* 文件类型 */
+    uint64_t size;              /* 文件大小 */
+    std::string name;           /* 文件名 */
+
+    CF_FileInfo() : type(CF_FileType::UNKNOWN), size(0), name(""){}
+    CF_FileInfo(CF_FileType type, uint64_t size, const std::string& name)
+        : type(type), size(size), name(name)
+    {}
+    CF_FileInfo& operator=(const CF_FileInfo& info)
+    {
+        type = info.type;
+        size = info.size;
+        name = info.name;
+        return *this;
+    }
+};
+
+
+
+#endif /* CURLFTPINFO_H */

common/LightLog/LightLog.h

@@ -14,7 +14,7 @@
 // #define LOG_WARN(_log_msg) do{ QString _log_file = __FILE__; QString _log_str = '[' +  QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss.zzz") + ']' + '[' + _log_file.right(file.count() - _log_file.lastIndexOf('/') -1) + ':' + QString::number(__LINE__) + "] " + _log_msg; qWarning() << _log_str; }while(0)
 
 /********** LOG_DEBUG **********/
-#define LOG_DEBUG(_log_msg)                                                     \
+#define QLOG_DEBUG(_log_msg)                                                     \
     do {                                                                        \
         QString _log_file = __FILE__;                                           \
         QString _log_str = '[' +                                                \
@@ -28,7 +28,7 @@
 
 
 /********** LOG_INFO **********/
-#define LOG_INFO(_log_msg)                                                     \
+#define QLOG_INFO(_log_msg)                                                     \
   do {                                                                         \
     QString _log_file = __FILE__;                                              \
     QString _log_str =                                                         \
@@ -42,7 +42,7 @@
   } while (0)
 
 /********** LOG_WARN **********/
-  #define LOG_WARN(_log_msg)                                                   \
+  #define QLOG_WARN(_log_msg)                                                   \
   do {                                                                         \
     QString _log_file = __FILE__;                                              \
     QString _log_str =                                                         \

common/ftp/QtFtp.cpp

@@ -56,7 +56,7 @@ void QtFtp::putFile(const QString &fileName, const QString &farPath)
     m_fileUpload.setFileName(fileName);
     if(!m_fileUpload.open(QFile::ReadOnly))
     {
-        LOG_WARN("open file failed , file path : " + fileName);
+        QLOG_WARN("open file failed , file path : " + fileName);
         return;
     }
 
@@ -114,7 +114,7 @@ void QtFtp::getFile(const QString &fileName,const QString &srcPath)
     m_file.setFileName(fileName);
     if(!m_file.open(QFile::WriteOnly | QFile::Truncate))
     {
-        LOG_WARN("open file failed , file path : " + fileName);
+        QLOG_WARN("open file failed , file path : " + fileName);
         return;
     }
 
@@ -221,10 +221,10 @@ void QtFtp::do_uploadFinished()
     {
         m_result = true;
         emit signal_uploadState(true);
-        LOG_INFO("----- FTP upload success -----");
+        QLOG_INFO("----- FTP upload success -----");
     } else
     {
-        LOG_WARN("FTP upload failed : " + m_reply->errorString());
+        QLOG_WARN("FTP upload failed : " + m_reply->errorString());
         emit signal_uploadState(false);
     }
     m_fileUpload.close();
@@ -247,7 +247,7 @@ bool QtFtp::createDir(const QString& path)
     url.setUserName(m_url.userName());
     url.setPassword(m_url.password());
     url.setPath(path);
-    LOG_DEBUG("create dir : " + url.path());
+    QLOG_DEBUG("create dir : " + url.path());
     
     request.setUrl(url);
     request.setRawHeader("Content-Type", "application/x-www-form-urlencoded");
@@ -290,10 +290,10 @@ void QtFtp::do_downloadFinished()
             /* 每次读取10MB */
             QByteArray data = m_reply->read(10485760);
             quint64 writenBytes = m_file.write(data);
-            LOG_DEBUG("write file : " + QString::number(writenBytes));
+            QLOG_DEBUG("write file : " + QString::number(writenBytes));
             if(writenBytes != data.size())
             {
-                LOG_WARN("FTP download failed: write file failed");
+                QLOG_WARN("FTP download failed: write file failed");
                 emit signal_downloadState(false);
                 m_result = false;
                 break;
@@ -302,10 +302,10 @@ void QtFtp::do_downloadFinished()
         m_file.flush();
         emit signal_downloadState(true);
         m_result = true;
-        LOG_DEBUG("----- FTP download success -----");
+        QLOG_DEBUG("----- FTP download success -----");
     }else
     {
-        LOG_WARN("FTP download failed:" + m_reply->errorString());
+        QLOG_WARN("FTP download failed:" + m_reply->errorString());
         /* 下载失败就删除创建的文件 */
         m_file.remove();
         emit signal_downloadState(false);
@@ -330,10 +330,10 @@ void QtFtp::do_downloadFinishedToData()
         
         emit signal_downloadState(true);
         m_result = true;
-        LOG_DEBUG("----- FTP download success -----");
+        QLOG_DEBUG("----- FTP download success -----");
     }else
     {
-        LOG_WARN("FTP download failed:" + m_reply->errorString());
+        QLOG_WARN("FTP download failed:" + m_reply->errorString());
         
         emit signal_downloadState(false);
     }
@@ -347,13 +347,13 @@ void QtFtp::do_downloadFinishedToData()
 /* 上传进度 */
 void QtFtp::do_uploadProgress(qint64 bytesSent, qint64 bytesTotal)
 {
-    LOG_DEBUG("sent / total : " + QString::number(bytesSent) + " / " + QString::number(bytesTotal));
+    QLOG_DEBUG("sent / total : " + QString::number(bytesSent) + " / " + QString::number(bytesTotal));
 }
 
 /* 下载进度 */
 void QtFtp::do_downloadProgress(qint64 bytesReceived, qint64 bytesTotal)
 {
-    LOG_DEBUG("received / total : " + QString::number(bytesReceived) + " / " + QString::number(bytesTotal));
+    QLOG_DEBUG("received / total : " + QString::number(bytesReceived) + " / " + QString::number(bytesTotal));
 }
 
 /* ftp其他任务完成槽函数 */
@@ -366,12 +366,12 @@ void QtFtp::do_finished()
     m_isFinished = true;
     if(m_reply->error() == QNetworkReply::NoError)
     {
-        LOG_INFO("----- FTP operation success -----");
+        QLOG_INFO("----- FTP operation success -----");
         
         m_result = true;
     }else
     {
-        LOG_WARN("FTP operation failed : " + m_reply->errorString());
+        QLOG_WARN("FTP operation failed : " + m_reply->errorString());
 
         m_result = false;
     }
@@ -401,11 +401,11 @@ void QtFtp::do_ftpReplyError(QNetworkReply::NetworkError error)
 {
    if(error == QNetworkReply::NoError)
    {
-       LOG_INFO("FTP发送成功");
+       QLOG_INFO("FTP发送成功");
    }
    else
    {
-       LOG_WARN("FTP发送失败:" + QString::number(error));
+       QLOG_WARN("FTP发送失败:" + QString::number(error));
    }
 }
 #endif

common/http/QtHttps.cpp

@@ -18,9 +18,9 @@ QtHttps::QtHttps(QObject *parent) :
     bool isSupport = QSslSocket::supportsSsl();
     QString opensslVersion = QSslSocket::sslLibraryVersionString();
     QString openSSLBuildVersion = QSslSocket::sslLibraryBuildVersionString();
-    LOG_INFO("OpenSSL is support : " + QString::number(isSupport));
-    // LOG_INFO("OpenSSL version : " + opensslVersion);
-    // LOG_INFO("OpenSSL build version : " + openSSLBuildVersion);
+    QLOG_INFO("OpenSSL is support : " + QString::number(isSupport));
+    // QLOG_INFO("OpenSSL version : " + opensslVersion);
+    // QLOG_INFO("OpenSSL build version : " + openSSLBuildVersion);
     /* 查看支持的协议 */
     auto list = m_manager->supportedSchemes();
     QString str;
@@ -28,7 +28,7 @@ QtHttps::QtHttps(QObject *parent) :
     {
         str = str + item + " ";
     }
-    LOG_INFO("supportedSchemes : " + str);
+    QLOG_INFO("supportedSchemes : " + str);
 
     /* 连接信号和槽 */
     connect(&m_timer, &QTimer::timeout, this, &QtHttps::do_timeout);
@@ -57,7 +57,7 @@ bool QtHttps::Get(const QString &url)
 {
     if(m_manager == nullptr)
     {
-        LOG_WARN("m_manager is nullptr");
+        QLOG_WARN("m_manager is nullptr");
         return false;
     }
     QNetworkRequest request;
@@ -85,7 +85,7 @@ bool QtHttps::GetHead(const QString &url)
 {
     if(m_manager == nullptr)
     {
-        LOG_WARN("m_manager is nullptr");
+        QLOG_WARN("m_manager is nullptr");
         return false;
     }
     QNetworkRequest request;
@@ -125,7 +125,7 @@ void QtHttps::downloadFile(const QString &url, const QString &filePath)
 {
     if(m_manager == nullptr)
     {
-        LOG_WARN("m_manager is nullptr");
+        QLOG_WARN("m_manager is nullptr");
         return;
     }
     /* 检查文件有效性 */
@@ -133,7 +133,7 @@ void QtHttps::downloadFile(const QString &url, const QString &filePath)
     m_file->setFileName(filePath);
     if(!m_file->open(QIODevice::WriteOnly | QIODevice::Truncate))
     {
-        LOG_WARN("open file failed , file path : " + filePath);
+        QLOG_WARN("open file failed , file path : " + filePath);
         m_file->close();
         delete m_file;
         m_file = nullptr;
@@ -195,7 +195,7 @@ bool QtHttps::waitFinished(int msecs)
 /* 请求完成的槽函数 */
 void QtHttps::do_replyFinished()
 {
-    LOG_DEBUG("do_replyFinished");
+    QLOG_DEBUG("do_replyFinished");
     /* 停止定时器 */
     if(m_timer.isActive())
     {
@@ -205,12 +205,12 @@ void QtHttps::do_replyFinished()
     auto retCode = m_reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
     if(m_reply->error() == QNetworkReply::NoError)
     {
-        LOG_DEBUG("reply : " + QString::number(retCode));
+        QLOG_DEBUG("reply : " + QString::number(retCode));
         auto list = m_reply->rawHeaderList();
         for(auto &item : list)
         {
-            // SPDLOG_INFO("{} : {}", item.toStdString(), m_reply->rawHeader(item).toStdString());
-            LOG_DEBUG(item + " : " + m_reply->rawHeader(item));
+            // SPDQLOG_INFO("{} : {}", item.toStdString(), m_reply->rawHeader(item).toStdString());
+            QLOG_DEBUG(item + " : " + m_reply->rawHeader(item));
         }
         /* 检查文件是否打开 */
         if(m_file != nullptr)
@@ -225,7 +225,7 @@ void QtHttps::do_replyFinished()
     }
     else
     {
-        LOG_WARN("reply error : " + QString::number(retCode) + " " + m_reply->errorString());
+        QLOG_WARN("reply error : " + QString::number(retCode) + " " + m_reply->errorString());
     }
     /* 检查文件是否打开 */
     if(m_file != nullptr)
@@ -247,7 +247,7 @@ void QtHttps::do_replyFinished()
 /* 读取数据 */
 void QtHttps::do_replyReadyRead()
 {
-    // LOG_DEBUG("do_replyReadyRead");
+    // QLOG_DEBUG("do_replyReadyRead");
     if(m_file != nullptr)
     {
         m_file->write(m_reply->readAll());
@@ -257,14 +257,14 @@ void QtHttps::do_replyReadyRead()
 /* 下载进度 */
 void QtHttps::do_downloadProgress(qint64 bytesReceived, qint64 bytesTotal)
 {
-    // LOG_DEBUG("do_downloadProgress");
-    LOG_DEBUG("bytesReceived / bytesTotal : " + QString::number(bytesReceived) + " / " + QString::number(bytesTotal));
+    // QLOG_DEBUG("do_downloadProgress");
+    QLOG_DEBUG("bytesReceived / bytesTotal : " + QString::number(bytesReceived) + " / " + QString::number(bytesTotal));
 }
 
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
 void QtHttps::do_error(QNetworkReply::NetworkError code)
 {
-    LOG_WARN("error : " + QString::number(code));
+    QLOG_WARN("error : " + QString::number(code));
 }
 #endif
 
@@ -272,7 +272,7 @@ void QtHttps::do_error(QNetworkReply::NetworkError code)
 /* 超时，断开reply连接，删除reply */
 void QtHttps::do_timeout()
 {
-    LOG_WARN("Http timeout");
+    QLOG_WARN("Http timeout");
     if(m_reply != nullptr)
     {
         m_reply->disconnect();