oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

project: fix bug importing folders

Browse Source
This commit is contained in:
itsmattkc
2021-04-10 13:22:42 +10:00
parent b161ff710d
commit 72669761a7
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/task/project/import/import.cpp
+14 -9
View File
@@ -96,13 +96,10 @@ void ProjectImportTask::Import(Folder *folder, QFileInfoList import, int &counte
// Create a folder corresponding to the directory
Folder* f = new Folder();
f->moveToThread(folder->thread());
f->SetLabel(file_info.fileName());
// Create undoable command that adds the items to the model
parent_command->add_child(new NodeAddCommand(folder->parent(), f));
parent_command->add_child(new FolderAddChild(folder, f));
AddItemToFolder(folder, f, parent_command);
// Recursively follow this path
Import(f, entry_list, counter, parent_command);
@@ -119,11 +116,7 @@ void ProjectImportTask::Import(Folder *folder, QFileInfoList import, int &counte
ValidateImageSequence(footage, import, i);
// Create undoable command that adds the items to the model
NodeAddCommand* nac = new NodeAddCommand(folder->parent(), footage);
nac->PushToThread(folder->thread());
parent_command->add_child(nac);
parent_command->add_child(new FolderAddChild(folder, footage));
AddItemToFolder(folder, footage, parent_command);
} else {
// Add to list so we can tell the user about it later
invalid_files_.append(file_info.absoluteFilePath());
@@ -223,6 +216,18 @@ void ProjectImportTask::ValidateImageSequence(Footage *footage, QFileInfoList& i
}
}
void ProjectImportTask::AddItemToFolder(Folder *folder, Node *item, MultiUndoCommand *command)
{
// Create undoable command that adds the items to the model
Project* project = model_->project();
NodeAddCommand* nac = new NodeAddCommand(project, item);
nac->PushToThread(project->thread());
command->add_child(nac);
command->add_child(new FolderAddChild(folder, item));
}
bool ProjectImportTask::ItemIsStillImageFootageOnly(Footage* footage)
{
if (footage->GetTotalStreamCount() != 1) {
app/task/project/import/import.h
+2
View File
@@ -61,6 +61,8 @@ private:
void ValidateImageSequence(Footage *footage, QFileInfoList &info_list, int index);
void AddItemToFolder(Folder* folder, Node* item, MultiUndoCommand* command);
static bool ItemIsStillImageFootageOnly(Footage *footage);
static bool CompareStillImageSize(Footage *footage, const QSize& sz);