Database: import file to database from json #53

Author: KangLin

App/Client/Favorite/FavoriteDatabase.cpp

@@ -147,6 +147,9 @@ bool CFavoriteDatabase::OnInitializeDatabase()
 
     m_IconDB.SetDatabase(GetDatabase(), m_pPara);
     bRet = m_IconDB.OnInitializeDatabase();
+    if(!bRet) return false;
+    m_FileDB.SetDatabase(GetDatabase(), m_pPara);
+    bRet = m_FileDB.OnInitializeDatabase();
     return bRet;
 }
 
@@ -468,7 +471,7 @@ bool CFavoriteDatabase::ImportFromJson(int parentId, const QJsonArray &obj)
         }
 
         QString szFile;
-        bool bRet = CDatabaseFile::ImportFileFromJson(itemObj, szFile);
+        bool bRet = m_FileDB.ImportFileToDatabaseFromJson(itemObj, szFile);
         if(!bRet) continue;
         QIcon icon;
         bRet = CDatabaseIcon::ImportIconFromJson(itemObj, icon);

App/Client/Favorite/FavoriteDatabase.h

@@ -57,6 +57,7 @@ class CFavoriteDatabase : public CDatabaseTree
     bool OnInitializeSqliteDatabase() override;
     bool OnInitializeMySqlDatabase() override;
     CDatabaseIcon m_IconDB;
+    CDatabaseFile m_FileDB;
 
     // CDatabaseTree interface
 protected:

App/Client/Recent/RecentDatabase.cpp

@@ -36,6 +36,9 @@ bool CRecentDatabase::OnInitializeDatabase()
     // Create icon table
     m_IconDB.SetDatabase(GetDatabase(), m_pPara);
     bRet = m_IconDB.OnInitializeDatabase();
+    if(!bRet) return bRet;
+    m_FileDB.SetDatabase(GetDatabase(), m_pPara);
+    bRet = m_FileDB.OnInitializeDatabase();
     return bRet;
 }
 
@@ -343,7 +346,7 @@ bool CRecentDatabase::ImportFromJson(const QJsonObject &obj)
         QJsonObject itemObj = it->toObject();
         RecentItem item;
 
-        bool bRet = CDatabaseFile::ImportFileFromJson(itemObj, item.szFile);
+        bool bRet = m_FileDB.ImportFileToDatabaseFromJson(itemObj, item.szFile);
         if(!bRet) continue;
 
         // Check if is exist in recent

App/Client/Recent/RecentDatabase.h

@@ -41,5 +41,6 @@ class CRecentDatabase : public CDatabase
     virtual bool ImportFromJson(const QJsonObject &obj) override;
 
     CDatabaseIcon m_IconDB;
+    CDatabaseFile m_FileDB;
 };
 

Src/Database.cpp

@@ -601,6 +601,14 @@ bool CDatabaseFile::ImportFileFromJson(const QJsonObject &obj, QString &szFile)
     return true;
 }
 
+bool CDatabaseFile::ImportFileToDatabaseFromJson(const QJsonObject &obj, QString &szFile)
+{
+    bool bRet = ImportFileFromJson(obj, szFile);
+    if(!bRet) return bRet;
+    bRet = Save(szFile);
+    return bRet;
+}
+
 CDatabaseFile::CDatabaseFile(QObject* parent) : CDatabase(parent)
 {
     m_szConnectName = "file_connect";

Src/Database.h

@@ -86,6 +86,10 @@ class PLUGIN_EXPORT CDatabaseIcon : public CDatabase
     QString m_szTableName;
 };
 
+/*!
+ * \brief The CDatabaseFile class
+ * \note The file field is filename, don't include path.
+ */
 class PLUGIN_EXPORT CDatabaseFile : public CDatabase
 {
     Q_OBJECT
@@ -94,15 +98,26 @@ class PLUGIN_EXPORT CDatabaseFile : public CDatabase
     explicit CDatabaseFile(QObject* parent = nullptr);
     explicit CDatabaseFile(const QString& szPrefix, QObject *parent = nullptr);
 
+    /*!
+     * \brief Load
+     * \param szFile: the file path
+     * \note The file field in database is filename, don't include path.
+     */
     QByteArray Load(const QString &szFile);
+    /*!
+     * \brief Save
+     * \param szFile: the file path
+     * \note The file field in database is filename, don't include path.
+     */
     bool Save(const QString& szFile);
 
     virtual bool ExportToJson(QJsonObject &obj) override;
     virtual bool ImportFromJson(const QJsonObject &obj) override;
 
     static bool ExportFileToJson(const QString &szFile, QJsonObject &obj);
     static bool ImportFileFromJson(const QJsonObject &obj, QString &szFile);
-    
+    bool ImportFileToDatabaseFromJson(const QJsonObject &obj, QString &szFile);
+
 protected:
     virtual bool OnInitializeSqliteDatabase() override;
     virtual bool OnInitializeMySqlDatabase() override;