Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 16:00:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't allow folder overwrite

Browse source
This commit is contained in:
Atlante45 2016-03-10 15:50:02 -08:00
parent 2fb478ff3c
commit 35f5ebb938
3 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/resources/qml/AssetServer.qml
View file

@ -72,12 +72,16 @@ Window {
}
function doRenameFile(oldPath, newPath) {
console.log("Renaming " + oldPath + " to " + newPath);
if (newPath[0] != "/") {
newPath = "/" + newPath;
}
if (Assets.isKnownFolder(newPath)) {
box = errorMessageBox("Cannot override existing directory.");
box.selected.connect(reload);
}
console.log("Renaming " + oldPath + " to " + newPath);
Assets.renameMapping(oldPath, newPath, function(err) {
if (err) {
console.log("Error renaming: ", oldPath, "=>", newPath, " - error ", err);

13
interface/src/scripting/AssetMappingsScriptingInterface.cpp
View file

@ -174,6 +174,19 @@ void AssetMappingsScriptingInterface::renameMapping(QString oldPath, QString new
request->start();
}
bool AssetMappingModel::isKnownFolder(QString path) const {
if (!path.endsWith("/")) {
return false;
}
auto existingPaths = _pathToItemMap.keys();
for (auto& entry : existingPaths) {
if (entry.startsWith(path)) {
return true;
}
}
return false;
}
AssetMappingItem::AssetMappingItem(const QString& name, const QString& fullPath, bool isFolder) :
name(name),

6
interface/src/scripting/AssetMappingsScriptingInterface.h
View file

@ -35,7 +35,8 @@
public:
Q_INVOKABLE void refresh();
bool isKnownMapping(QString path) const { return _pathToItemMap.contains(path); };
bool isKnownMapping(QString path) const { return _pathToItemMap.contains(path); }
bool isKnownFolder(QString path) const;
signals:
void errorGettingMappings(int error);
@ -55,7 +56,8 @@ public:
Q_INVOKABLE AssetMappingModel* getAssetMappingModel() { return &_assetMappingModel; }
Q_INVOKABLE QAbstractProxyModel* getProxyModel() { return &_proxyModel; }
Q_INVOKABLE bool isKnownMapping(QString path) const { return _assetMappingModel.isKnownMapping(path); };
Q_INVOKABLE bool isKnownMapping(QString path) const { return _assetMappingModel.isKnownMapping(path); }
Q_INVOKABLE bool isKnownFolder(QString path) const { return _assetMappingModel.isKnownFolder(path); }
Q_INVOKABLE QString getErrorString(int errorCode) const;