2 files changed, 54 insertions, 31 deletions
diff --git a/src/filetreemodel.cpp b/src/filetreemodel.cpp
index 493a432e..87de1d45 100644
--- a/src/filetreemodel.cpp
+++ b/src/filetreemodel.cpp
@@ -444,17 +444,7 @@ void FileTreeModel::addNewDirectories(
       // this is a new directory
       trace([&]{ log::debug("new dir {}", QString::fromStdWString(d->getName())); });
 
-      auto item = std::make_unique<FileTreeItem>(
-        &parentItem, 0, parentPath, L"", FileTreeItem::Directory,
-        d->getName(), L"");
-
-      if (d->isEmpty()) {
-        // if this directory is empty, mark the item as loaded so the expand
-        // arrow doesn't show
-        item->setLoaded(true);
-      }
-
-      toAdd.push_back(std::move(item));
+      toAdd.push_back(createDirectoryItem(parentItem, parentPath, *d));
       range.includeCurrent();
     }
 
@@ -568,26 +558,7 @@ void FileTreeModel::addNewFiles(
       // this is a new file
       trace([&]{ log::debug("new file {}", QString::fromStdWString(file->getName())); });
 
-      bool isArchive = false;
-      int originID = file->getOrigin(isArchive);
-
-      FileTreeItem::Flags flags = FileTreeItem::NoFlags;
-
-      if (isArchive) {
-        flags |= FileTreeItem::FromArchive;
-      }
-
-      if (!file->getAlternatives().empty()) {
-        flags |= FileTreeItem::Conflicted;
-      }
-
-      auto item = std::make_unique<FileTreeItem>(
-        &parentItem, originID, parentPath, file->getFullPath(), flags,
-        file->getName(), makeModName(*file, originID));
-
-      item->setLoaded(true);
-
-      toAdd.push_back(std::move(item));
+      toAdd.push_back(createFileItem(parentItem, parentPath, *file));
       range.includeCurrent();
     }
 
@@ -600,6 +571,49 @@ void FileTreeModel::addNewFiles(
   range.add(std::move(toAdd));
 }
 
+std::unique_ptr<FileTreeItem> FileTreeModel::createDirectoryItem(
+  FileTreeItem& parentItem, const std::wstring& parentPath,
+  const DirectoryEntry& d)
+{
+  auto item = std::make_unique<FileTreeItem>(
+    &parentItem, 0, parentPath, L"", FileTreeItem::Directory,
+    d.getName(), L"");
+
+  if (d.isEmpty()) {
+    // if this directory is empty, mark the item as loaded so the expand
+    // arrow doesn't show
+    item->setLoaded(true);
+  }
+
+  return item;
+}
+
+std::unique_ptr<FileTreeItem> FileTreeModel::createFileItem(
+  FileTreeItem& parentItem, const std::wstring& parentPath,
+  const FileEntry& file)
+{
+  bool isArchive = false;
+  int originID = file.getOrigin(isArchive);
+
+  FileTreeItem::Flags flags = FileTreeItem::NoFlags;
+
+  if (isArchive) {
+    flags |= FileTreeItem::FromArchive;
+  }
+
+  if (!file.getAlternatives().empty()) {
+    flags |= FileTreeItem::Conflicted;
+  }
+
+  auto item = std::make_unique<FileTreeItem>(
+    &parentItem, originID, parentPath, file.getFullPath(), flags,
+    file.getName(), makeModName(file, originID));
+
+  item->setLoaded(true);
+
+  return item;
+}
+
 std::wstring FileTreeModel::makeModName(
   const MOShared::FileEntry& file, int originID) const
 {
diff --git a/src/filetreemodel.h b/src/filetreemodel.h
index ac82a66a..305aba2a 100644
--- a/src/filetreemodel.h
+++ b/src/filetreemodel.h
@@ -106,6 +106,15 @@ private:
     const std::unordered_set<MOShared::FileEntry::Index>& seen);
 
 
+  std::unique_ptr<FileTreeItem> createDirectoryItem(
+    FileTreeItem& parentItem, const std::wstring& parentPath,
+    const MOShared::DirectoryEntry& d);
+
+  std::unique_ptr<FileTreeItem> createFileItem(
+    FileTreeItem& parentItem, const std::wstring& parentPath,
+    const MOShared::FileEntry& file);
+
+
   std::wstring makeModName(const MOShared::FileEntry& file, int originID) const;
 
   void ensureLoaded(FileTreeItem* item) const;