|
1 | 1 | #include "importfolderutils.h" |
2 | 2 |
|
3 | | -#include "legacynotebookutils.h" |
4 | 3 | #include <QCoreApplication> |
5 | 4 | #include <core/exception.h> |
6 | 5 | #include <notebook/nodeparameters.h> |
@@ -45,85 +44,3 @@ void ImportFolderUtils::importFolderContents(Notebook *p_notebook, Node *p_node, |
45 | 44 | } |
46 | 45 | } |
47 | 46 | } |
48 | | - |
49 | | -void ImportFolderUtils::importFolderContentsByLegacyConfig(Notebook *p_notebook, Node *p_node, |
50 | | - QString &p_errMsg) { |
51 | | - auto rootDir = p_node->toDir(); |
52 | | - |
53 | | - QJsonObject config; |
54 | | - try { |
55 | | - config = LegacyNotebookUtils::getFolderConfig(rootDir.absolutePath()); |
56 | | - } catch (Exception &p_e) { |
57 | | - Utils::appendMsg(p_errMsg, |
58 | | - ImportFolderUtilsTranslate::tr("Failed to read folder config (%1) (%2).") |
59 | | - .arg(rootDir.absolutePath(), p_e.what())); |
60 | | - return; |
61 | | - } |
62 | | - |
63 | | - // Remove the config file. |
64 | | - LegacyNotebookUtils::removeFolderConfigFile(rootDir.absolutePath()); |
65 | | - |
66 | | - // Folders. |
67 | | - LegacyNotebookUtils::forEachFolder(config, [&rootDir, p_notebook, p_node, |
68 | | - &p_errMsg](const QString &name) { |
69 | | - if (!rootDir.exists(name)) { |
70 | | - Utils::appendMsg(p_errMsg, |
71 | | - ImportFolderUtilsTranslate::tr("Folder (%1) does not exist.").arg(name)); |
72 | | - return; |
73 | | - } |
74 | | - |
75 | | - if (p_notebook->isBuiltInFolder(p_node, name)) { |
76 | | - Utils::appendMsg( |
77 | | - p_errMsg, |
78 | | - ImportFolderUtilsTranslate::tr("Folder (%1) conflicts with built-in folder.").arg(name)); |
79 | | - return; |
80 | | - } |
81 | | - |
82 | | - QSharedPointer<Node> node; |
83 | | - try { |
84 | | - NodeParameters paras; |
85 | | - paras.m_createdTimeUtc = |
86 | | - LegacyNotebookUtils::getCreatedTimeUtcOfFolder(rootDir.filePath(name)); |
87 | | - node = p_notebook->addAsNode(p_node, Node::Flag::Container, name, paras); |
88 | | - } catch (Exception &p_e) { |
89 | | - Utils::appendMsg(p_errMsg, |
90 | | - ImportFolderUtilsTranslate::tr("Failed to add folder (%1) as node (%2).") |
91 | | - .arg(name, p_e.what())); |
92 | | - return; |
93 | | - } |
94 | | - |
95 | | - ImportFolderUtils::importFolderContentsByLegacyConfig(p_notebook, node.data(), p_errMsg); |
96 | | - }); |
97 | | - |
98 | | - // Files. |
99 | | - LegacyNotebookUtils::forEachFile(config, [&rootDir, p_notebook, p_node, |
100 | | - &p_errMsg](const LegacyNotebookUtils::FileInfo &info) { |
101 | | - if (!rootDir.exists(info.m_name)) { |
102 | | - Utils::appendMsg( |
103 | | - p_errMsg, ImportFolderUtilsTranslate::tr("File (%1) does not exist.").arg(info.m_name)); |
104 | | - return; |
105 | | - } |
106 | | - |
107 | | - if (p_notebook->isBuiltInFile(p_node, info.m_name)) { |
108 | | - Utils::appendMsg(p_errMsg, |
109 | | - ImportFolderUtilsTranslate::tr("File (%1) conflicts with built-in file.") |
110 | | - .arg(info.m_name)); |
111 | | - return; |
112 | | - } |
113 | | - |
114 | | - QSharedPointer<Node> node; |
115 | | - try { |
116 | | - NodeParameters paras; |
117 | | - paras.m_createdTimeUtc = info.m_createdTimeUtc; |
118 | | - paras.m_modifiedTimeUtc = info.m_modifiedTimeUtc; |
119 | | - paras.m_attachmentFolder = info.m_attachmentFolder; |
120 | | - paras.m_tags = info.m_tags; |
121 | | - node = p_notebook->addAsNode(p_node, Node::Flag::Content, info.m_name, paras); |
122 | | - } catch (Exception &p_e) { |
123 | | - Utils::appendMsg(p_errMsg, |
124 | | - ImportFolderUtilsTranslate::tr("Failed to add file (%1) as node (%2).") |
125 | | - .arg(info.m_name, p_e.what())); |
126 | | - return; |
127 | | - } |
128 | | - }); |
129 | | -} |
0 commit comments