Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tracker: handle copying files from virtual directories

Browse Source 
If virtual directory first resolve the symlink before copying/moving/linking the file.

Fixes #11091

R1/B1 bug squashed!
This commit is contained in:
John Scipione 2015-02-27 18:38:39 -05:00
parent 27c5746706
commit 7d515bdbd6
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/kits/tracker/PoseView.cpp
View File

@ -5017,18 +5017,24 @@ BPoseView::MoveSelectionInto(Model* destFolder, BContainerWindow* srcWindow,
okToMove = alert->Go() == 1;
}
// TODO: Handle correctly!
if (srcWindow->TargetModel()->IsVirtualDirectory())
okToMove = false;
if (okToMove) {
PoseList* selectionList = srcWindow->PoseView()->SelectionList();
BList* pointList = destWindow->PoseView()->GetDropPointList(clickPoint,
loc, selectionList, srcWindow->PoseView()->ViewMode() == kListMode,
dropOnGrid);
BObjectList<entry_ref>* srcList = new BObjectList<entry_ref>(
selectionList->CountItems(), true);
CopySelectionListToEntryRefList(selectionList, srcList);
int32 selectionSize = selectionList->CountItems();
BObjectList<entry_ref>* srcList
= new BObjectList<entry_ref>(selectionSize, true);
if (srcWindow->TargetModel()->IsVirtualDirectory()) {
// resolve symlink and add the resulting entry_ref to the list
for (int32 i = 0; i < selectionSize; i++) {
Model* model = selectionList->ItemAt(i)->ResolvedModel();
if (model != NULL)
srcList->AddItem(new entry_ref(*(model->EntryRef())));
}
} else
CopySelectionListToEntryRefList(selectionList, srcList);
uint32 moveMode;
if (forceCopy)