commit 0a0326675c0bc5d35e1710c29f43df5761d42850 parent 6397e72977b9315e06b91fd2cb0d87958b2dc92c Author: Andrew Costa <[email protected]> Date: Thu, 24 Nov 2022 16:24:33 -0500 ReaWwise 1.0.5 - Added the ability to copy lines from the preview to the clipboard. - Object names with unresolved wildcards now display the placeholder text "<wildcard_missing>". During transfer operations, users will be warned about incomplete paths. They have the option to proceed while skipping the import or creation of objects that contain these incomplete paths. Bug Fixes: - Fixed: Possible to import sound voices without selecting a language. Sound voice objects now default to the appropriate language based on the version of Wwise being used. For Wwise Version 21.1 and earlier, the default language is set to the first language in the project's language list. For Wwise 22.1 and later, the default language is set to the reference language of the Wwise project. - Fixed: Incorrect icon displayed for actor mixer containers in the preview panel. - Fixed: When the import summary has many errors, the View Details and Close buttons overlap some text. - Fixed: Import fails when the file path contains non English characters. Changed the font from Open Sans to GoNotoCurrent to support additional languages including Japanese and Chinese. More information on the exact character set supported is on GitHub at: https://github.com/satbyy/go-noto-universal Change-Id: I826d57f001065f02cd8831cca57f3dc2ca157f4e Diffstat:
102 files changed, 2462 insertions(+), 517 deletions(-)
diff --git a/.gitattributes b/.gitattributes @@ -0,0 +1 @@ +*.ttf filter=lfs diff=lfs merge=lfs -text diff --git a/Readme.md b/Readme.md @@ -79,10 +79,10 @@ For general questions about usage, refer to Audiokinetic's [Community Q&A](https ## Contributing The repository is not open to pull request but in the case of a bug report, bugfix or a suggestions, please feel free to [open an issue](https://github.com/audiokinetic/ReaWwise/issues). -Feature requests can also be submitted to the [feature request section](https://www.audiokinetic.com/qa/feature-requests/) of Audiokinetic's Community Q&A. Use ReaWwise as the Category when submitting a question. +Feature requests can also be submitted to the [feature request section](https://www.audiokinetic.com/qa/questions/reawwise) of Audiokinetic's Community Q&A. Use ReaWwise as the Category when submitting a question. ## Legal -Copyright © 2022 [Audiokinetic Inc.](https://audiokinetic.com) All rights reserved. +Copyright © 2023 [Audiokinetic Inc.](https://audiokinetic.com) All rights reserved. ## Acknowledgements Inspired by the work of [Karl Davis](https://github.com/karltechno) \ No newline at end of file diff --git a/src/extension/Extension.cpp b/src/extension/Extension.cpp @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #define REAPERAPI_IMPLEMENT #include "Core/WaapiClient.h" diff --git a/src/extension/IReaperPlugin.h b/src/extension/IReaperPlugin.h @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #pragma once class ReaProject; diff --git a/src/extension/ReaperContext.cpp b/src/extension/ReaperContext.cpp @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #include "ReaperContext.h" #include "Helpers/StringHelper.h" @@ -117,7 +132,7 @@ namespace AK::ReaWwise auto result = getProjectStringBuffer(proj, key); if(result.buffer.size() > 0) - return juce::String(&result.buffer[0], result.buffer.size()); + return WwiseTransfer::StringHelper::utf8EncodedCharArrayToString(result.buffer); return {}; } diff --git a/src/extension/ReaperContext.h b/src/extension/ReaperContext.h @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #pragma once #include "Core/DawContext.h" diff --git a/src/extension/ReaperPlugin.cpp b/src/extension/ReaperPlugin.cpp @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #include "ReaperPlugin.h" namespace AK::ReaWwise diff --git a/src/extension/ReaperPlugin.h b/src/extension/ReaperPlugin.h @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #pragma once #include "IReaperPlugin.h" diff --git a/src/shared/Core/AssertHook.cpp b/src/shared/Core/AssertHook.cpp @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #include <AK/Tools/Common/AkAssert.h> #include <cassert> diff --git a/src/shared/Core/DawContext.h b/src/shared/Core/DawContext.h @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #pragma once #include "Model/Import.h" diff --git a/src/shared/Core/DawWatcher.cpp b/src/shared/Core/DawWatcher.cpp @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #include "DawWatcher.h" #include "Helpers/ImportHelper.h" @@ -79,6 +94,9 @@ namespace AK::WwiseTransfer if(importItemsHash != lastImportItemsHash || previewOptionsChanged) { + auto pathParts = WwiseHelper::pathToPathParts(WwiseHelper::pathToPathWithoutObjectTypes(importDestination) + + WwiseHelper::pathToPathWithoutObjectTypes(hierarchyMappingPath)); + previewOptionsChanged = false; std::set<juce::String> objectPaths; @@ -90,6 +108,7 @@ namespace AK::WwiseTransfer for(const auto& importItem : importItems) { auto currentNode = rootNode; + int depth = 0; for(const auto& ancestorPath : WwiseHelper::pathToAncestorPaths(importItem.path)) { @@ -103,13 +122,17 @@ namespace AK::WwiseTransfer auto name = WwiseHelper::pathToObjectName(pathWithoutType); auto type = WwiseHelper::pathToObjectType(ancestorPath); - child = ImportHelper::previewItemNodeToValueTree(pathWithoutType, {name, type, Import::ObjectStatus::New, "", Import::WavStatus::Unknown}); + auto unresolvedWildcard = name.isEmpty() && pathParts[depth].isNotEmpty(); + + Import::PreviewItemNode previewItemNode{name, type, Import::ObjectStatus::New, "", Import::WavStatus::Unknown, unresolvedWildcard}; + child = ImportHelper::previewItemNodeToValueTree(pathWithoutType, previewItemNode); currentNode.appendChild(child, nullptr); pathToValueTreeMapping[pathWithoutType] = child; } currentNode = child; + depth++; } auto pathWithoutType = WwiseHelper::pathToPathWithoutObjectTypes(importItem.path); @@ -134,7 +157,10 @@ namespace AK::WwiseTransfer wavStatus = Import::WavStatus::New; } - auto child = ImportHelper::previewItemNodeToValueTree(pathWithoutType, {name, type, Import::ObjectStatus::New, originalsWav, wavStatus}); + auto unresolvedWildcard = name.isEmpty() && pathParts[depth].isNotEmpty(); + + Import::PreviewItemNode previewItemNode{name, type, Import::ObjectStatus::New, originalsWav, wavStatus, unresolvedWildcard}; + auto child = ImportHelper::previewItemNodeToValueTree(pathWithoutType, previewItemNode); currentNode.appendChild(child, nullptr); pathToValueTreeMapping[pathWithoutType] = child; diff --git a/src/shared/Core/DawWatcher.h b/src/shared/Core/DawWatcher.h @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #pragma once #include "Core/DawContext.h" diff --git a/src/shared/Core/ImportTask.h b/src/shared/Core/ImportTask.h @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #pragma once #include "Helpers/ImportHelper.h" @@ -45,191 +60,201 @@ namespace AK::WwiseTransfer for(const auto& importItem : options.importItems) { - importItemRequests.emplace_back(Waapi::ImportItemRequest{importItem.path, importItem.originalsSubFolder, importItem.renderFilePath}); + if(WwiseHelper::isPathComplete(importItem.path)) + { + importItemRequests.emplace_back(Waapi::ImportItemRequest{importItem.path, importItem.originalsSubFolder, importItem.renderFilePath}); - auto pathWithoutObjectTypes = WwiseHelper::pathToPathWithoutObjectTypes(importItem.path); - objectsInExtension.insert(pathWithoutObjectTypes); + auto pathWithoutObjectTypes = WwiseHelper::pathToPathWithoutObjectTypes(importItem.path); + objectsInExtension.insert(pathWithoutObjectTypes); - for(const auto& ancestorPath : WwiseHelper::pathToAncestorPaths(pathWithoutObjectTypes)) - objectsInExtension.insert(ancestorPath); + for(const auto& ancestorPath : WwiseHelper::pathToAncestorPaths(pathWithoutObjectTypes)) + objectsInExtension.insert(ancestorPath); + } + else + juce::Logger::writeToLog("File with incomplete object path " + importItem.path + " will not be imported."); } - // Will be eventullay compared to the results of the import to figure out what was newly created - Waapi::Response<Waapi::ObjectResponseSet> existingObjectsResponse; + if(!importItemRequests.empty()) + { + // Will be eventullay compared to the results of the import to figure out what was newly created + Waapi::Response<Waapi::ObjectResponseSet> existingObjectsResponse; - if(options.waqlEnabled) - existingObjectsResponse = waapiClient.getObjectAncestorsAndDescendants(options.importDestination); - else - existingObjectsResponse = waapiClient.getObjectAncestorsAndDescendantsLegacy(options.importDestination); + if(options.waqlEnabled) + existingObjectsResponse = waapiClient.getObjectAncestorsAndDescendants(options.importDestination); + else + existingObjectsResponse = waapiClient.getObjectAncestorsAndDescendantsLegacy(options.importDestination); - if(existingObjectsResponse.status) - { - for(const auto& object : existingObjectsResponse.result) + if(existingObjectsResponse.status) { - // We only care about objects defined in the extension - auto it = objectsInExtension.find(object.path); - - if(it != objectsInExtension.end()) + for(const auto& object : existingObjectsResponse.result) { - // Create an entry in the summary data structure (It will eventually be used to produce the import summary page) - // Ignore sounds that would be newly created. We need to get their paths from the import response because they may change. - if(options.containerNameExistsOption != Import::ContainerNameExistsOption::CreateNew || object.type != Wwise::ObjectType::Sound) + // We only care about objects defined in the extension + auto it = objectsInExtension.find(object.path); + + if(it != objectsInExtension.end()) { - auto& summaryObject = summary.objects[object.path]; - summaryObject.type = object.type; - summaryObject.id = object.id; + // Create an entry in the summary data structure (It will eventually be used to produce the import summary page) + // Ignore sounds that would be newly created. We need to get their paths from the import response because they may change. + if(options.containerNameExistsOption != Import::ContainerNameExistsOption::CreateNew || object.type != Wwise::ObjectType::Sound) + { + auto& summaryObject = summary.objects[object.path]; + summaryObject.type = object.type; + summaryObject.id = object.id; + } } } - } - const ScopedUndoGroup scopedundogroup(waapiClient, options.undoGroupFeatureEnabled); + const ScopedUndoGroup scopedundogroup(waapiClient, options.undoGroupFeatureEnabled); - juce::String objectLanguage = ImportTaskContants::defaultObjectLanguage; - if(options.hierarchyMappingNodeList.back().type == Wwise::ObjectType::SoundVoice) - objectLanguage = options.hierarchyMappingNodeList.back().language; + juce::String objectLanguage = ImportTaskContants::defaultObjectLanguage; + if(options.hierarchyMappingNodeList.back().type == Wwise::ObjectType::SoundVoice) + objectLanguage = options.hierarchyMappingNodeList.back().language; - // Check if wav files will be replaced. Only works if we have the originals folder. - // Basically checks to see if the audio file is already present in the originals folder. - std::set<juce::String> existingAudioFiles; + // Check if wav files will be replaced. Only works if we have the originals folder. + // Basically checks to see if the audio file is already present in the originals folder. + std::set<juce::String> existingAudioFiles; - if(options.originalsFolder.isNotEmpty()) - { - for(const auto& importItemRequest : importItemRequests) + if(options.originalsFolder.isNotEmpty()) { - // Build the final file path - auto pathInWwise = options.originalsFolder + options.languageSubfolder + juce::File::getSeparatorString() + - importItemRequest.originalsSubFolder + juce::File::getSeparatorString() + - juce::File(importItemRequest.renderFilePath).getFileName(); + for(const auto& importItemRequest : importItemRequests) + { + // Build the final file path + auto pathInWwise = options.originalsFolder + options.languageSubfolder + juce::File::getSeparatorString() + + (importItemRequest.originalsSubFolder.isNotEmpty() ? importItemRequest.originalsSubFolder + juce::File::getSeparatorString() : "") + + juce::File(importItemRequest.renderFilePath).getFileName(); - if(juce::File(pathInWwise).exists()) - existingAudioFiles.emplace(pathInWwise); + if(juce::File(pathInWwise).exists()) + existingAudioFiles.emplace(pathInWwise); - for(const auto& existingObject : existingObjectsResponse.result) - { - if(existingObject.originalWavFilePath == pathInWwise) + for(const auto& existingObject : existingObjectsResponse.result) { - auto& summaryObject = summary.objects[existingObject.path]; - summaryObject.id = existingObject.id; - summaryObject.originalWavFilePath = pathInWwise; - summaryObject.wavStatus = Import::WavStatus::Replaced; - summaryObject.type = existingObject.type; + if(existingObject.originalWavFilePath == pathInWwise) + { + auto& summaryObject = summary.objects[existingObject.path]; + summaryObject.id = existingObject.id; + summaryObject.originalWavFilePath = pathInWwise; + summaryObject.wavStatus = Import::WavStatus::Replaced; + summaryObject.type = existingObject.type; + } } } } - } - auto importResponse = waapiClient.import(importItemRequests, options.containerNameExistsOption, objectLanguage); + auto importResponse = waapiClient.import(importItemRequests, options.containerNameExistsOption, objectLanguage); - if(importResponse.status) - { - // Result will include newly created and existing (affected) objects - for(const auto& object : importResponse.result) + if(importResponse.status) { - // Check against existing objects to see if object was truely newly created - auto it = summary.objects.find(object.path); - - if(it == summary.objects.end()) + // Result will include newly created and existing (affected) objects + for(const auto& object : importResponse.result) { - auto& summaryObject = summary.objects[object.path]; - summaryObject.objectStatus = Import::ObjectStatus::New; - summaryObject.type = object.type; - summaryObject.originalWavFilePath = object.originalWavFilePath; + // Check against existing objects to see if object was truely newly created + auto it = summary.objects.find(object.path); - if(object.originalWavFilePath.isNotEmpty()) + if(it == summary.objects.end()) { - // Some objects are associated with an originalWavFilePath that may have been replaced. - auto it = existingAudioFiles.find(object.originalWavFilePath); - if(it != existingAudioFiles.end()) - { - summary.objects[object.path].wavStatus = Import::WavStatus::Replaced; - } - else + auto& summaryObject = summary.objects[object.path]; + summaryObject.objectStatus = Import::ObjectStatus::New; + summaryObject.type = object.type; + summaryObject.originalWavFilePath = object.originalWavFilePath; + + if(object.originalWavFilePath.isNotEmpty()) { - summary.objects[object.path].wavStatus = Import::WavStatus::New; + // Some objects are associated with an originalWavFilePath that may have been replaced. + auto it = existingAudioFiles.find(object.originalWavFilePath); + if(it != existingAudioFiles.end()) + { + summary.objects[object.path].wavStatus = Import::WavStatus::Replaced; + } + else + { + summary.objects[object.path].wavStatus = Import::WavStatus::New; + } } } - } - // If the object was found but the id is different, it was replaced - else if(it->second.id != object.id) - { - summary.objects[object.path].objectStatus = Import::ObjectStatus::Replaced; - } - } - - // Applying templates only works in custom hierarchy mapping mode - if(options.applyTemplateFeatureEnabled) - { - // Will store node depth in relation to template property path - std::map<int, juce::String> depthToTemplatePropertyPathMap; - - int importDestinationDepth = WwiseHelper::pathToPathParts(options.importDestination).size(); - - for(int i = 0; i < options.hierarchyMappingNodeList.size(); ++i) - { - const auto& hierarchyMappingNode = options.hierarchyMappingNodeList[i]; - - if(hierarchyMappingNode.propertyTemplatePath.isNotEmpty() && - hierarchyMappingNode.propertyTemplatePathEnabled && - hierarchyMappingNode.propertyTemplatePathValid) + // If the object was found but the id is different, it was replaced + else if(it->second.id != object.id) { - depthToTemplatePropertyPathMap[importDestinationDepth + i + 1] = hierarchyMappingNode.propertyTemplatePath; + summary.objects[object.path].objectStatus = Import::ObjectStatus::Replaced; } } - if(depthToTemplatePropertyPathMap.size() > 0) + // Applying templates only works in custom hierarchy mapping mode + if(options.applyTemplateFeatureEnabled) { - std::map<PropertyTemplatePath, std::vector<ObjectPath>> propertyTemplatePathToObjectMapping; + // Will store node depth in relation to template property path + std::map<int, juce::String> depthToTemplatePropertyPathMap; - // Go through all objects and if their depth matches a hierarchy node that has a template defined in it, add it to propertyTemplatePathToObjectMapping - // We will eventually use this map to submit paste property requests in waaapi - for(const auto& [objectPath, object] : summary.objects) - { - const int depth = WwiseHelper::pathToPathParts(objectPath).size(); + int importDestinationDepth = WwiseHelper::pathToPathParts(options.importDestination).size(); - auto it = depthToTemplatePropertyPathMap.find(depth); + for(int i = 0; i < options.hierarchyMappingNodeList.size(); ++i) + { + const auto& hierarchyMappingNode = options.hierarchyMappingNodeList[i]; - if(it != depthToTemplatePropertyPathMap.end() && (options.applyTemplateOption == Import::ApplyTemplateOption::Always || object.objectStatus == Import::ObjectStatus::New)) - propertyTemplatePathToObjectMapping[it->second].emplace_back(objectPath); + if(hierarchyMappingNode.propertyTemplatePath.isNotEmpty() && + hierarchyMappingNode.propertyTemplatePathEnabled && + hierarchyMappingNode.propertyTemplatePathValid) + { + depthToTemplatePropertyPathMap[importDestinationDepth + i + 1] = hierarchyMappingNode.propertyTemplatePath; + } } - for(const auto& [source, targets] : propertyTemplatePathToObjectMapping) + if(depthToTemplatePropertyPathMap.size() > 0) { - const auto response = waapiClient.pasteProperties({source, targets}); - if(!response.status) + std::map<PropertyTemplatePath, std::vector<ObjectPath>> propertyTemplatePathToObjectMapping; + + // Go through all objects and if their depth matches a hierarchy node that has a template defined in it, add it to propertyTemplatePathToObjectMapping + // We will eventually use this map to submit paste property requests in waaapi + for(const auto& [objectPath, object] : summary.objects) { - summary.errorMessage << juce::NewLine() << response.errorMessage; + const int depth = WwiseHelper::pathToPathParts(objectPath).size(); + + auto it = depthToTemplatePropertyPathMap.find(depth); + + if(it != depthToTemplatePropertyPathMap.end() && (options.applyTemplateOption == Import::ApplyTemplateOption::Always || object.objectStatus == Import::ObjectStatus::New)) + propertyTemplatePathToObjectMapping[it->second].emplace_back(objectPath); } - else + + for(const auto& [source, targets] : propertyTemplatePathToObjectMapping) { - for(const auto& target : targets) - summary.objects[target].propertyTemplatePath = source; + const auto response = waapiClient.pasteProperties({source, targets}); + if(!response.status) + { + summary.errors.push_back(response.error); + } + else + { + for(const auto& target : targets) + summary.objects[target].propertyTemplatePath = source; + } } } } - } - if(importResponse.result.size() > 0) - { - std::vector<juce::String> importedObjectPaths; + if(importResponse.result.size() > 0) + { + std::vector<juce::String> importedObjectPaths; - // Assumes that importResponse.result is sorted by path - auto first = importResponse.result.begin()->path; - auto last = importResponse.result.rbegin()->path; + // Assumes that importResponse.result is sorted by path + auto first = importResponse.result.begin()->path; + auto last = importResponse.result.rbegin()->path; - importedObjectPaths.emplace_back(WwiseHelper::getCommonAncestor(first, last)); + importedObjectPaths.emplace_back(WwiseHelper::getCommonAncestor(first, last)); - waapiClient.selectObjects(options.selectObjectsOnImportCommand, importedObjectPaths); + waapiClient.selectObjects(options.selectObjectsOnImportCommand, importedObjectPaths); + } + } + else + { + summary.errors.push_back(importResponse.error); } } else { - summary.errorMessage << juce::NewLine() << importResponse.errorMessage; + summary.errors.push_back(existingObjectsResponse.error); } } else - { - summary.errorMessage << juce::NewLine() << existingObjectsResponse.errorMessage; - } + juce::Logger::writeToLog("Import items list was empty. Nothing to import."); auto onCallAsync = [this, summary = summary] { diff --git a/src/shared/Core/Logger.cpp b/src/shared/Core/Logger.cpp @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #include "Logger.h" namespace AK::WwiseTransfer diff --git a/src/shared/Core/Logger.h b/src/shared/Core/Logger.h @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #pragma once #include <juce_gui_basics/juce_gui_basics.h> diff --git a/src/shared/Core/WaapiClient.cpp b/src/shared/Core/WaapiClient.cpp @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #include "WaapiClient.h" #include "Helpers/ImportHelper.h" @@ -33,14 +48,19 @@ namespace AK::WwiseTransfer static constexpr const char* const unknownObject = "ak.wwise.query.unknown_object"; } - WaapiClientWatcher::WaapiClientWatcher(juce::ValueTree appState, WaapiClient& waapiClient, WaapiClientWatcherConfig waapiClientWatcherConfig) + namespace WaapiMessages + { + static constexpr const char* const objectNotFound = "Object not found"; + } + + WaapiClientWatcher::WaapiClientWatcher(juce::ValueTree appState, WaapiClient& waapiClient, WaapiClientWatcherConfig&& waapiClientWatcherConfig) : juce::Thread("WaapiService") , applicationState(appState) , projectId(applicationState, IDs::projectId, nullptr) , waapiConnected(applicationState, IDs::waapiConnected, nullptr) , wwiseObjectsChanged(applicationState, IDs::wwiseObjectsChanged, nullptr) , waapiClient(waapiClient) - , waapiClientWatcherConfig(std::move(waapiClientWatcherConfig)) + , waapiClientWatcherConfig(waapiClientWatcherConfig) , connectionRetryDelay(waapiClientWatcherConfig.MinConnectionRetryDelay) , languages(applicationState.getChildWithName(IDs::languages)) { @@ -385,7 +405,7 @@ namespace AK::WwiseTransfer } else { - response.errorMessage << WaapiHelper::getErrorMessage(result); + response.error = WaapiHelper::parseError(WaapiCommands::audioImport, result); } return response; @@ -471,6 +491,7 @@ namespace AK::WwiseTransfer break; } } + if(response.status) { if(result.HasKey("return")) @@ -485,7 +506,14 @@ namespace AK::WwiseTransfer } else { - response.errorMessage << WaapiHelper::getErrorMessage(result); + if(result.HasKey("message")) + { + juce::String message(result["message"].GetVariant().GetString()); + if(message.contains(WaapiMessages::objectNotFound)) + response.status = true; + } + + response.error = WaapiHelper::parseError(WaapiCommands::objectGet, result); } return response; @@ -547,7 +575,7 @@ namespace AK::WwiseTransfer } else { - response.errorMessage << WaapiHelper::getErrorMessage(result); + response.error = WaapiHelper::parseError(WaapiCommands::objectGet, result); } return response; @@ -671,31 +699,7 @@ namespace AK::WwiseTransfer } if(!response.status) - response.errorMessage << WaapiHelper::getErrorMessage(result); - - return response; - } - - Waapi::Response<juce::String> WaapiClient::getOriginalsFolder() - { - using namespace WwiseAuthoringAPI; - - Waapi::Response<juce::String> response; - - AkJson result; - response.status = call(WaapiCommands::getProjectInfo, AkJson::Map{}, AkJson::Map{}, result); - - if(result.HasKey("directories") && result["directories"].HasKey("originals")) - { - auto originalsFolder = juce::String(result["directories"]["originals"].GetVariant().GetString()); - -#ifndef WIN32 - // Waapi returns the path as a windows path - originalsFolder = originalsFolder.replace("\\", juce::File::getSeparatorString()).replace("Y:", "~").replace("Z:", "/"); -#endif - - response.result = originalsFolder; - } + response.error = WaapiHelper::parseError(WaapiCommands::objectGet, result); return response; } @@ -756,7 +760,7 @@ namespace AK::WwiseTransfer } else { - response.errorMessage << WaapiHelper::getErrorMessage(result); + response.error = WaapiHelper::parseError(WaapiCommands::objectGet, result); } return response; @@ -821,7 +825,7 @@ namespace AK::WwiseTransfer if(!response.status) { - response.errorMessage << juce::NewLine() << WaapiHelper::getErrorMessage(result); + response.error = WaapiHelper::parseError(WaapiCommands::objectPasteProperties, result); } return response; @@ -850,7 +854,7 @@ namespace AK::WwiseTransfer } else { - response.errorMessage = WaapiHelper::getErrorMessage(result); + response.error = WaapiHelper::parseError(WaapiCommands::getInfo, result); } return response; @@ -912,7 +916,52 @@ namespace AK::WwiseTransfer } else { - response.errorMessage = WaapiHelper::getErrorMessage(result); + response.error = WaapiHelper::parseError(WaapiCommands::objectGet, result); + } + + return response; + } + Waapi::Response<Waapi::AdditionalProjectInfo> WaapiClient::getAdditionalProjectInfo() + { + using namespace WwiseAuthoringAPI; + + Waapi::Response<Waapi::AdditionalProjectInfo> response; + + AkJson result; + response.status = call(WaapiCommands::getProjectInfo, AkJson::Map{}, AkJson::Map{}, result); + + if(result.HasKey("directories") && result["directories"].HasKey("originals")) + { + auto originalsFolder = juce::String(result["directories"]["originals"].GetVariant().GetString()); + +#ifndef WIN32 + // Waapi returns the path as a windows path + originalsFolder = originalsFolder.replace("\\", juce::File::getSeparatorString()).replace("Y:", "~").replace("Z:", "/"); +#endif + + response.result.originalsFolder = originalsFolder; + } + + if(result.HasKey("referenceLanguageId") && result.HasKey("languages")) + { + const auto& referenceLanguageId = result["referenceLanguageId"].GetVariant().GetString(); + const auto& languages = result["languages"].GetArray(); + + for(const auto& languageAsAkJson : languages) + { + const auto& language = languageAsAkJson.GetMap(); + const auto& langIdIt = language.find("id"); + const auto& langNameIt = language.find("name"); + + if(langIdIt != language.cend() && langNameIt != language.cend()) + { + if(langIdIt->second.GetVariant().GetString() == referenceLanguageId) + { + response.result.referenceLanguage = langNameIt->second.GetVariant().GetString(); + break; + } + } + } } return response; @@ -950,7 +999,7 @@ namespace AK::WwiseTransfer } else { - response.errorMessage = WaapiHelper::getErrorMessage(result); + response.error = WaapiHelper::parseError(WaapiCommands::getSelectedObjects, result); } return response; diff --git a/src/shared/Core/WaapiClient.h b/src/shared/Core/WaapiClient.h @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #pragma once #include "AK/WwiseAuthoringAPI/AkAutobahn/AkJson.h" @@ -77,13 +92,13 @@ namespace AK::WwiseTransfer Waapi::Response<Wwise::Version> getVersion(); Waapi::Response<Waapi::ProjectInfo> getProjectInfo(); + Waapi::Response<Waapi::AdditionalProjectInfo> getAdditionalProjectInfo(); Waapi::Response<Waapi::ObjectResponse> getSelectedObject(); Waapi::Response<Waapi::ObjectResponseSet> pasteProperties(const Waapi::PastePropertiesRequest& pastePropertiesRequest); Waapi::Response<Waapi::ObjectResponseSet> import(const std::vector<Waapi::ImportItemRequest>& importItemsRequest, Import::ContainerNameExistsOption containerNameExistsOption, const juce::String& objectLanguage); Waapi::Response<Waapi::ObjectResponseSet> getObjectAncestorsAndDescendants(const juce::String& objectPath); Waapi::Response<Waapi::ObjectResponseSet> getObjectAncestorsAndDescendantsLegacy(const juce::String& objectPath); Waapi::Response<std::vector<juce::String>> getProjectLanguages(); - Waapi::Response<juce::String> getOriginalsFolder(); Waapi::Response<Waapi::ObjectResponse> getObject(const juce::String& objectPath); bool selectObjects(const juce::String& selectObjectsCommand, const std::vector<juce::String>& objectPaths); @@ -115,6 +130,17 @@ namespace AK::WwiseTransfer } template <typename Callback> + void getAdditionalProjectInfoAsync(const Callback& callback) + { + auto onJobExecute = [this]() + { + return getAdditionalProjectInfo(); + }; + + threadPool.addJob(new AsyncJob(onJobExecute, callback), true); + } + + template <typename Callback> void getSelectedObjectAsync(const Callback& callback) { auto onJobExecute = [this]() @@ -158,17 +184,6 @@ namespace AK::WwiseTransfer } template <typename Callback> - void getOriginalsFolderAsync(Callback& callback) - { - auto onJobExecute = [this]() - { - return getOriginalsFolder(); - }; - - threadPool.addJob(new AsyncJob(onJobExecute, callback), true); - } - - template <typename Callback> void getObjectAncestorsAndDescendantsAsync(const juce::String& objectPath, Callback& callback) { auto onJobExecute = [objectPath, this]() @@ -209,7 +224,7 @@ namespace AK::WwiseTransfer : private juce::Thread { public: - WaapiClientWatcher(juce::ValueTree applicationState, WaapiClient& waapiClient, WaapiClientWatcherConfig waapiClientWatcherConfig); + WaapiClientWatcher(juce::ValueTree applicationState, WaapiClient& waapiClient, WaapiClientWatcherConfig&& waapiClientWatcherConfig); void start(); void stop(); diff --git a/src/shared/Helpers/FileHelper.h b/src/shared/Helpers/FileHelper.h @@ -0,0 +1,38 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + +#pragma once + +#include <juce_gui_basics/juce_gui_basics.h> +#include <set> + +namespace AK::WwiseTransfer::FileHelper +{ + inline int countModifiedFilesInDirectoriesSince(const std::set<juce::File>& directorySet, const juce::Time& lastWriteTime) + { + int modifiedFiles = 0; + + for(const auto& directory : directorySet) + { + for(const auto& file : directory.findChildFiles(juce::File::TypesOfFileToFind::findFiles, false)) + { + if(file.getLastModificationTime() > lastWriteTime) + ++modifiedFiles; + } + } + + return modifiedFiles; + } +} // namespace AK::WwiseTransfer::FileHelper diff --git a/src/shared/Helpers/ImportHelper.h b/src/shared/Helpers/ImportHelper.h @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #pragma once #include "Helpers/WwiseHelper.h" @@ -61,6 +76,7 @@ namespace AK::WwiseTransfer::ImportHelper juce::VariantConverter<Import::ObjectStatus>::fromVar(valueTree[IDs::objectStatus]), valueTree[IDs::audioFilePath], juce::VariantConverter<Import::WavStatus>::fromVar(valueTree[IDs::wavStatus]), + valueTree[IDs::unresolvedWildcard], }; } @@ -73,6 +89,8 @@ namespace AK::WwiseTransfer::ImportHelper valueTree.setProperty(IDs::audioFilePath, previewItem.audioFilePath, nullptr); valueTree.setProperty(IDs::wavStatus, juce::VariantConverter<Import::WavStatus>::toVar(previewItem.wavStatus), nullptr); + valueTree.setProperty(IDs::unresolvedWildcard, previewItem.unresolvedWildcard, nullptr); + return valueTree; } @@ -218,4 +236,53 @@ namespace AK::WwiseTransfer::ImportHelper return hash.Get(); } + + inline juce::String createImportSummary(const juce::String& applicationName, juce::Time currentTime, const Import::Summary& summary, const Import::Task::Options& importTaskOptions) + { + juce::String report; + + auto hasErrors = !summary.errors.empty(); + + report << "<style>table td, th { border:1px solid black; padding:10px; }"; + report << "table { border-collapse:collapse; }"; + report << "table th { text-align: left; }</style>"; + report << applicationName + ": Wwise Import Summary " + currentTime.formatted("%Y-%m-%d %H:%M:%S") + "<br><br>"; + report << "Import Destination: " + importTaskOptions.importDestination + "<br>"; + report << "Container Name Exists: " + ImportHelper::containerNameExistsOptionToReadableString(importTaskOptions.containerNameExistsOption) + "<br>"; + report << "Apply Template: " + ImportHelper::applyTemplateOptionToReadableString(importTaskOptions.applyTemplateOption) + "<br><br>"; + + report << "Objects created: " + juce::String(summary.getNumObjectsCreated()) + "<br>"; + report << "Object Templates Applied: " + juce::String(summary.getNumObjectTemplatesApplied()) + "<br>"; + report << "Audio Files Imported: " + juce::String(summary.getNumAudiofilesTransfered()) + "<br>"; + + if(hasErrors) + report << "<br>Wwise Imported with <a href='#waapi-errors'>Errors!</a><br>"; + + report << "<h3>Wwise Objects</h3>"; + report << "<pre><table><tr><th>Object Path</th><th>Type</th><th>Object Status</th><th>Originals Wav</th><th>Wav Status</th><th>Property Template Applied</th></tr>"; + + for(const auto& [objectPath, object] : summary.objects) + { + report << "<tr><td>" + objectPath + "</td><td>" + WwiseHelper::objectTypeToReadableString(object.type) + "</td>"; + report << "<td>" + ImportHelper::objectStatusToReadableString(object.objectStatus) + "</td><td>" + object.originalWavFilePath + "</td>"; + report << "<td>" + ImportHelper::wavStatusToReadableString(object.wavStatus) + "</td><td>" + object.propertyTemplatePath + "</td></tr>"; + } + + report << "</table></pre>"; + + if(hasErrors) + { + report << "<h3 id='waapi-errors'>Waapi Errors</h3>"; + + for(const auto& error : summary.errors) + { + report << "<h4>" + error.procedureUri + "</h4>"; + + // Using juce::JSON for pretty printing + report << "<pre>" + juce::JSON::toString(juce::JSON::fromString(error.raw)) + "</pre>"; + } + } + + return report; + } } // namespace AK::WwiseTransfer::ImportHelper diff --git a/src/shared/Helpers/PersistanceHelper.h b/src/shared/Helpers/PersistanceHelper.h @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #pragma once #include "Helpers/ImportHelper.h" @@ -18,6 +33,8 @@ namespace AK::WwiseTransfer::PersistanceHelper auto hierarchyMappingNodeCopy = hierarchyMappingCopy.getChild(i); hierarchyMappingNodeCopy.removeProperty(IDs::objectTypeValid, nullptr); hierarchyMappingNodeCopy.removeProperty(IDs::objectTypeErrorMessage, nullptr); + hierarchyMappingNodeCopy.removeProperty(IDs::objectNameValid, nullptr); + hierarchyMappingNodeCopy.removeProperty(IDs::objectNameErrorMessage, nullptr); hierarchyMappingNodeCopy.removeProperty(IDs::propertyTemplatePathValid, nullptr); hierarchyMappingNodeCopy.removeProperty(IDs::propertyTemplatePathErrorMessage, nullptr); } diff --git a/src/shared/Helpers/StringHelper.h b/src/shared/Helpers/StringHelper.h @@ -1,5 +1,22 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #pragma once +#include <juce_gui_basics/juce_gui_basics.h> + #include <algorithm> #include <iostream> #include <iterator> @@ -8,6 +25,12 @@ namespace AK::WwiseTransfer::StringHelper { + template <typename CharArray> + juce::String utf8EncodedCharArrayToString(const CharArray& charArray) + { + return {juce::CharPointer_UTF8(&charArray[0]), std::size(charArray)}; + } + inline std::vector<juce::String> splitDoubleNullTerminatedString(const std::vector<char>& buffer) { std::vector<juce::String> stringArray; @@ -19,7 +42,7 @@ namespace AK::WwiseTransfer::StringHelper tempBuffer.push_back(character); else if(!tempBuffer.empty()) { - stringArray.push_back(juce::String(&tempBuffer[0], tempBuffer.size())); + stringArray.push_back(utf8EncodedCharArrayToString(tempBuffer)); tempBuffer.clear(); } else diff --git a/src/shared/Helpers/WaapiHelper.h b/src/shared/Helpers/WaapiHelper.h @@ -1,7 +1,23 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #pragma once -#include "AK/WwiseAuthoringAPI/AkAutobahn/AkJson.h" +#include "Model/Waapi.h" +#include <JSONHelpers.h> #include <juce_core/juce_core.h> namespace AK::WwiseTransfer::WaapiHelper @@ -13,26 +29,18 @@ namespace AK::WwiseTransfer::WaapiHelper juce::Time::waitForMillisecondCounter(juce::Time::getMillisecondCounter() + retryDelayMs); } - inline juce::String getErrorMessage(AK::WwiseAuthoringAPI::AkJson result) + inline Waapi::Error parseError(const juce::String& procedureUri, AK::WwiseAuthoringAPI::AkJson result) { - juce::String message; + Waapi::Error error; + error.procedureUri = procedureUri; + error.raw = WwiseAuthoringAPI::JSONHelpers::GetAkJsonString(result); if(result.HasKey("message")) - { - message << "Error: "; - message << result["message"].GetVariant().GetString().c_str(); - - if(result.HasKey("details") && result["details"].HasKey("log")) - { - message << juce::NewLine() << "Details:" << juce::NewLine() << juce::NewLine(); - for(auto& item : result["details"]["log"].GetArray()) - { - if(item.HasKey("message")) - message << juce::NewLine() << item["message"].GetVariant().GetString(); - } - } - } - - return message; + error.message = result["message"].GetVariant().GetString().c_str(); + + if(result.HasKey("uri")) + error.uri = result["uri"].GetVariant().GetString().c_str(); + + return error; } } // namespace AK::WwiseTransfer::WaapiHelper diff --git a/src/shared/Helpers/WwiseHelper.h b/src/shared/Helpers/WwiseHelper.h @@ -1,7 +1,21 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #pragma once #include "Model/IDs.h" -#include "Model/Import.h" #include "Model/Wwise.h" #include <juce_gui_basics/juce_gui_basics.h> @@ -147,13 +161,12 @@ namespace AK::WwiseTransfer::WwiseHelper inline std::vector<juce::String> pathToPathParts(const juce::String& objectPath) { juce::StringArray parts; - parts.addTokens(objectPath, "\\", ""); + parts.addTokens(objectPath.trimCharactersAtStart("\\"), "\\", ""); std::vector<juce::String> objectPathParts; for(auto& part : parts) { - if(part.isNotEmpty()) - objectPathParts.emplace_back(part); + objectPathParts.emplace_back(part); } return objectPathParts; @@ -262,4 +275,18 @@ namespace AK::WwiseTransfer::WwiseHelper return commonAncestorPath; } + + inline bool isPathComplete(const juce::String path) + { + for(int i = 1; i < path.length(); ++i) + { + if(path[i] == '\\' && (path[i - 1] == '\\' || path[i - 1] == '>')) + return false; + + if(i == path.length() - 1 && (path[i] == '>' || path[i] == '\\')) + return false; + } + + return true; + } } // namespace AK::WwiseTransfer::WwiseHelper diff --git a/src/shared/Model/IDs.h b/src/shared/Model/IDs.h @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #pragma once #include <juce_gui_basics/juce_gui_basics.h> @@ -14,6 +29,7 @@ namespace AK::WwiseTransfer::IDs inline const juce::Identifier originalsSubfolderValid = "originalsSubfolderValid"; inline const juce::Identifier originalsSubfolderErrorMessage = "originalsSubfolderErrorMessage"; inline const juce::Identifier languageSubfolder = "languageSubfolder"; + inline const juce::Identifier referenceLanguage = "referenceLanguage"; inline const juce::Identifier importDestination = "importDestination"; inline const juce::Identifier importDestinationType = "importDestinationType"; @@ -40,6 +56,7 @@ namespace AK::WwiseTransfer::IDs inline const juce::Identifier audioFilePath = "audioFilePath"; inline const juce::Identifier renderFilePath = "renderFilePath"; inline const juce::Identifier wavStatus = "wavStatus"; + inline const juce::Identifier unresolvedWildcard = "unresolvedWildcard"; inline const juce::Identifier propertyTemplatePath = "propertyTemplatePath"; inline const juce::Identifier propertyTemplatePathType = "propertyTemplatePathType"; @@ -62,11 +79,12 @@ namespace AK::WwiseTransfer::IDs inline const juce::Identifier applyTemplateFeatureEnabled = "applyTemplateFeatureEnabled"; inline const juce::Identifier undoGroupFeatureEnabled = "undoGroupFeatureEnabled"; inline const juce::Identifier waqlEnabled = "waqlEnabled"; - inline const juce::Identifier originalsFolderLookupEnabled = "originalsFolderLookupEnabled"; + inline const juce::Identifier additionalProjectInfoLookupEnabled = "additionalProjectInfoLookupEnabled"; inline const juce::Identifier wwiseObjectsChanged = "wwiseObjectsChanged"; inline const juce::Identifier previewLoading = "previewLoading"; + inline const juce::Identifier transferInProgress = "transferInProgress"; inline const juce::Identifier sessionName = "sessionName"; diff --git a/src/shared/Model/Import.h b/src/shared/Model/Import.h @@ -1,6 +1,22 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #pragma once #include "Model/IDs.h" +#include "Model/Waapi.h" #include "Model/Wwise.h" #include <algorithm> @@ -61,6 +77,7 @@ namespace AK::WwiseTransfer::Import ObjectStatus objectStatus{}; juce::String audioFilePath; WavStatus wavStatus{}; + bool unresolvedWildcard{false}; }; struct HierarchyMappingNode @@ -131,10 +148,19 @@ namespace AK::WwiseTransfer::Import }; std::map<juce::String, Object> objects; - juce::String errorMessage; + std::vector<AK::WwiseTransfer::Waapi::Error> errors; using PathObjectPair = std::pair<juce::String, Object>; + int getNumAudiofilesTransfered() const + { + auto predicate = [](const PathObjectPair& pathObjectPair) + { + return pathObjectPair.second.type == Wwise::ObjectType::AudioFileSource; + }; + return std::count_if(objects.begin(), objects.end(), predicate); + } + int getNumObjectsCreated() const { auto predicate = [](const PathObjectPair& pathObjectPair) diff --git a/src/shared/Model/Waapi.h b/src/shared/Model/Waapi.h @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #pragma once #include "AK/WwiseAuthoringAPI/AkAutobahn/AkJson.h" @@ -22,6 +37,12 @@ namespace AK::WwiseTransfer::Waapi juce::String projectId; }; + struct AdditionalProjectInfo + { + juce::String originalsFolder; + juce::String referenceLanguage; + }; + struct ObjectResponse { ObjectResponse(AK::WwiseAuthoringAPI::AkJson json) @@ -56,7 +77,7 @@ namespace AK::WwiseTransfer::Waapi juce::String id; juce::String name; - Wwise::ObjectType type{ Wwise::ObjectType::Unknown }; + Wwise::ObjectType type{Wwise::ObjectType::Unknown}; juce::String path; juce::String originalWavFilePath; }; @@ -69,11 +90,20 @@ namespace AK::WwiseTransfer::Waapi std::vector<juce::String> targets; }; + struct Error + { + juce::String uri; + juce::String procedureUri; + juce::String message; + juce::String raw; + }; + template <typename Result> struct Response { bool status = false; Result result; - juce::String errorMessage; + Error error; }; + } // namespace AK::WwiseTransfer::Waapi diff --git a/src/shared/Model/Wwise.h b/src/shared/Model/Wwise.h @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #pragma once #include <juce_gui_basics/juce_gui_basics.h> diff --git a/src/shared/Persistance/ApplicationProperties.cpp b/src/shared/Persistance/ApplicationProperties.cpp @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #include "ApplicationProperties.h" namespace AK::WwiseTransfer diff --git a/src/shared/Persistance/ApplicationProperties.h b/src/shared/Persistance/ApplicationProperties.h @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #pragma once #include <juce_data_structures/juce_data_structures.h> diff --git a/src/shared/Persistance/ApplicationState.h b/src/shared/Persistance/ApplicationState.h @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #pragma once #include "FeatureSupport.h" @@ -45,7 +60,7 @@ namespace AK::WwiseTransfer::ApplicationState featureSupport.setProperty(IDs::applyTemplateFeatureEnabled, false, nullptr); featureSupport.setProperty(IDs::undoGroupFeatureEnabled, false, nullptr); featureSupport.setProperty(IDs::waqlEnabled, false, nullptr); - featureSupport.setProperty(IDs::originalsFolderLookupEnabled, false, nullptr); + featureSupport.setProperty(IDs::additionalProjectInfoLookupEnabled, false, nullptr); applicationState.appendChild(featureSupport, nullptr); @@ -63,6 +78,7 @@ namespace AK::WwiseTransfer::ApplicationState applicationState.appendChild(hierarchyMapping, nullptr); applicationState.setProperty(IDs::previewLoading, false, nullptr); + applicationState.setProperty(IDs::transferInProgress, false, nullptr); applicationState.setProperty(IDs::sessionName, "", nullptr); diff --git a/src/shared/Persistance/ApplicationStateValidator.cpp b/src/shared/Persistance/ApplicationStateValidator.cpp @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #include "ApplicationStateValidator.h" #include "Helpers/ImportHelper.h" diff --git a/src/shared/Persistance/ApplicationStateValidator.h b/src/shared/Persistance/ApplicationStateValidator.h @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #pragma once #include "Core/DawContext.h" diff --git a/src/shared/Persistance/FeatureSupport.cpp b/src/shared/Persistance/FeatureSupport.cpp @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #include "FeatureSupport.h" #include "Helpers/WwiseHelper.h" @@ -15,7 +30,7 @@ namespace AK::WwiseTransfer applyTemplateFeatureEnabled.referTo(featureSupport, IDs::applyTemplateFeatureEnabled, nullptr); undoGroupFeatureEnabled.referTo(featureSupport, IDs::undoGroupFeatureEnabled, nullptr); waqlEnabled.referTo(featureSupport, IDs::waqlEnabled, nullptr); - originalsFolderLookupEnabled.referTo(featureSupport, IDs::originalsFolderLookupEnabled, nullptr); + additionalProjectInfoLookupEnabled.referTo(featureSupport, IDs::additionalProjectInfoLookupEnabled, nullptr); applicationState.addListener(this); } @@ -42,7 +57,7 @@ namespace AK::WwiseTransfer applyTemplateFeatureEnabled = response.result >= v2022_1_0_0; undoGroupFeatureEnabled = response.result >= v2021_1_10_0; waqlEnabled = response.result >= v2021_1_0_0; - originalsFolderLookupEnabled = response.result >= v2022_1_0_0; + additionalProjectInfoLookupEnabled = response.result >= v2022_1_0_0; }; waapiClient.getVersionAsync(onGetVersionAsync); diff --git a/src/shared/Persistance/FeatureSupport.h b/src/shared/Persistance/FeatureSupport.h @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #pragma once #include "Core/WaapiClient.h" @@ -37,6 +52,6 @@ namespace AK::WwiseTransfer juce::CachedValue<bool> applyTemplateFeatureEnabled; juce::CachedValue<bool> undoGroupFeatureEnabled; juce::CachedValue<bool> waqlEnabled; - juce::CachedValue<bool> originalsFolderLookupEnabled; + juce::CachedValue<bool> additionalProjectInfoLookupEnabled; }; } // namespace AK::WwiseTransfer diff --git a/src/shared/Persistance/PersistanceSupport.cpp b/src/shared/Persistance/PersistanceSupport.cpp @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #include "PersistanceSupport.h" #include "Model/IDs.h" diff --git a/src/shared/Persistance/PersistanceSupport.h b/src/shared/Persistance/PersistanceSupport.h @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #pragma once #include "Core/DawContext.h" diff --git a/src/shared/Persistance/WwiseProjectSupport.cpp b/src/shared/Persistance/WwiseProjectSupport.cpp @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #include "WwiseProjectSupport.h" #include "Helpers/ImportHelper.h" @@ -13,11 +28,12 @@ namespace AK::WwiseTransfer , projectId(applicationState, IDs::projectId, nullptr) , originalsFolder(applicationState, IDs::originalsFolder, nullptr) , languageSubfolder(applicationState, IDs::languageSubfolder, nullptr) + , referenceLanguage(applicationState, IDs::referenceLanguage, nullptr) , hierarchyMapping(applicationState.getChildWithName(IDs::hierarchyMapping)) , languages(applicationState.getChildWithName(IDs::languages)) { auto featureSupport = applicationState.getChildWithName(IDs::featureSupport); - originalsFolderLookupEnabled.referTo(featureSupport, IDs::originalsFolderLookupEnabled, nullptr); + additionalProjectInfoLookupEnabled.referTo(featureSupport, IDs::additionalProjectInfoLookupEnabled, nullptr); applicationState.addListener(this); } @@ -33,35 +49,33 @@ namespace AK::WwiseTransfer if(treeType == IDs::application) { - if(property == IDs::originalsFolderLookupEnabled) + if(property == IDs::additionalProjectInfoLookupEnabled) { - originalsFolderLookupEnabled.forceUpdateOfCachedValue(); - if(originalsFolderLookupEnabled.get()) - { - loadOriginalsFolder(); - } + additionalProjectInfoLookupEnabled.forceUpdateOfCachedValue(); + + if(additionalProjectInfoLookupEnabled.get()) + loadAdditionalProjectInfo(); else - { - originalsFolder = ""; - } + resetAdditionalProjectInfo(); } else if(property == IDs::projectId) { + projectId.forceUpdateOfCachedValue(); + // Project id is set to empty by the waapi client when it receives the project loaded event. // This means that a project was loaded in wwise and that we should refresh the project info - projectId.forceUpdateOfCachedValue(); if(projectId.get().isEmpty()) - { loadProjectInfo(); - } + // If the project id changed, and is not empty, this means that the basic project info was loaded successfully. + // Proceed to load additional data else { + // Available in all supported versions of wwise loadProjectLanguages(); - if(originalsFolderLookupEnabled.get()) - { - loadOriginalsFolder(); - } + // Extra information only available in wwise 2022+ + if(additionalProjectInfoLookupEnabled.get()) + loadAdditionalProjectInfo(); } } else if(property == IDs::waapiConnected) @@ -69,21 +83,18 @@ namespace AK::WwiseTransfer waapiConnected.forceUpdateOfCachedValue(); if(waapiConnected.get()) - { loadProjectInfo(); - } - else - { - projectPath = ""; - projectId = ""; - originalsFolder = ""; - } } } - else if(treeType == IDs::hierarchyMapping || - treeType == IDs::hierarchyMappingNode) + else if(treeType == IDs::hierarchyMappingNode) { - updateLanguageSubpath(); + // Update hierarchy mapping node language depending on type + if(property == IDs::objectType) + updateLangugeForHierarchyMappingNodes(); + + // Will update the language subpath if the last item in the hierarchy mapping is a SoundVoice and it's value has changed + else if(property == IDs::objectLanguage) + updateLanguageSubpath(); } } @@ -91,9 +102,13 @@ namespace AK::WwiseTransfer { juce::ignoreUnused(childWhichHasBeenAdded); - if(parentTree.getType() == IDs::hierarchyMapping) + // Ensures that a newly added sound voice node gets updated with the propper language + if(parentTree.getType() == IDs::hierarchyMapping || + // If the languages in wwise change, or a new project is loaded with different languages, + // we want to make sure sound voice nodes in the hierarchy mapping are updated. + parentTree.getType() == IDs::languages) { - updateLanguageSubpath(); + updateLangugeForHierarchyMappingNodes(); } } @@ -101,6 +116,7 @@ namespace AK::WwiseTransfer { juce::ignoreUnused(childWhichHasBeenRemoved, indexFromWhichChildWasRemoved); + // Language subpath can change depending on what hierarchy mapping nodes are present if(parentTree.getType() == IDs::hierarchyMapping) { updateLanguageSubpath(); @@ -111,6 +127,7 @@ namespace AK::WwiseTransfer { juce::ignoreUnused(oldIndex, newIndex); + // Language subpath may change depending on the order of the hierarchy mapping nodes if(parentTreeWhoseChildrenHaveMoved.getType() == IDs::hierarchyMapping) { updateLanguageSubpath(); @@ -128,6 +145,23 @@ namespace AK::WwiseTransfer waapiClient.getProjectInfoAsync(onGetProjectInfoAsync); } + void WwiseProjectSupport::loadAdditionalProjectInfo() + { + auto onGetAdditionalProjectInfoAsync = [this](const auto& response) + { + originalsFolder = response.result.originalsFolder; + referenceLanguage = response.result.referenceLanguage; + }; + + waapiClient.getAdditionalProjectInfoAsync(onGetAdditionalProjectInfoAsync); + } + + void WwiseProjectSupport::resetAdditionalProjectInfo() + { + originalsFolder = ""; + referenceLanguage = ""; + } + void WwiseProjectSupport::loadProjectLanguages() { auto onGetProjectLanguages = [this](const auto& response) @@ -141,16 +175,6 @@ namespace AK::WwiseTransfer waapiClient.getProjectLanguagesAsync(onGetProjectLanguages); } - void WwiseProjectSupport::loadOriginalsFolder() - { - auto onGetOriginalsFolderAsync = [this](const auto& response) - { - originalsFolder = response.result; - }; - - waapiClient.getOriginalsFolderAsync(onGetOriginalsFolderAsync); - } - void WwiseProjectSupport::updateLanguageSubpath() { juce::String subfolder("SFX"); @@ -169,4 +193,39 @@ namespace AK::WwiseTransfer languageSubfolder = subfolder; } + + void WwiseProjectSupport::updateLangugeForHierarchyMappingNodes() + { + referenceLanguage.forceUpdateOfCachedValue(); + + auto languageList = WwiseHelper::valueTreeToLanguages(languages); + + for(int i = 0; i < hierarchyMapping.getNumChildren(); ++i) + { + auto hierarchyMappingNode = hierarchyMapping.getChild(i); + const Wwise::ObjectType objectType = juce::VariantConverter<Wwise::ObjectType>::fromVar(hierarchyMappingNode[IDs::objectType]); + + if(objectType == Wwise::ObjectType::SoundVoice) + { + juce::String objectLanguage = hierarchyMappingNode[IDs::objectLanguage]; + + auto it = std::find_if(languageList.cbegin(), languageList.cend(), [&objectLanguage](const auto& referenceLanguage) + { + return objectLanguage == referenceLanguage; + }); + + if(it == languageList.cend()) + { + if(referenceLanguage.get().isNotEmpty()) + hierarchyMappingNode.setProperty(IDs::objectLanguage, referenceLanguage.get(), nullptr); + else if(!languageList.empty()) + hierarchyMappingNode.setProperty(IDs::objectLanguage, languageList[0], nullptr); + } + } + else + { + hierarchyMappingNode.setProperty(IDs::objectLanguage, juce::String(), nullptr); + } + } + } } // namespace AK::WwiseTransfer diff --git a/src/shared/Persistance/WwiseProjectSupport.h b/src/shared/Persistance/WwiseProjectSupport.h @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #pragma once #include "Core/WaapiClient.h" @@ -23,9 +38,10 @@ namespace AK::WwiseTransfer juce::CachedValue<bool> waapiConnected; juce::CachedValue<juce::String> projectPath; juce::CachedValue<juce::String> projectId; - juce::CachedValue<bool> originalsFolderLookupEnabled; + juce::CachedValue<bool> additionalProjectInfoLookupEnabled; juce::CachedValue<juce::String> originalsFolder; juce::CachedValue<juce::String> languageSubfolder; + juce::CachedValue<juce::String> referenceLanguage; void valueTreePropertyChanged(juce::ValueTree& treeWhosePropertyHasChanged, const juce::Identifier& property) override; void valueTreeChildAdded(juce::ValueTree& parentTree, juce::ValueTree& childWhichHasBeenAdded) override; @@ -33,8 +49,13 @@ namespace AK::WwiseTransfer void valueTreeChildOrderChanged(juce::ValueTree& parentTreeWhoseChildrenHaveMoved, int oldIndex, int newIndex) override; void loadProjectInfo(); + + void loadAdditionalProjectInfo(); + void resetAdditionalProjectInfo(); + void loadProjectLanguages(); - void loadOriginalsFolder(); + void updateLanguageSubpath(); + void updateLangugeForHierarchyMappingNodes(); }; } // namespace AK::WwiseTransfer diff --git a/src/shared/Theme/CustomLookAndFeel.cpp b/src/shared/Theme/CustomLookAndFeel.cpp @@ -1,6 +1,24 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +The script in this file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #include "CustomLookAndFeel.h" #include "BinaryData.h" +#include "UI/HierarchyMappingTable.h" +#include "UI/ImportPreviewComponent.h" +#include "UI/ValidatableTextEditor.h" namespace AK::WwiseTransfer { @@ -19,8 +37,8 @@ namespace AK::WwiseTransfer , previewItemNoChangeColor{0xff7d7d7d} , previewItemNewColor{0xff29afff} , previewItemReplacedColor{0xffda8e40} - , regularTypeFace{juce::Typeface::createSystemTypefaceFor(BinaryData::open_sans_ttf, BinaryData::open_sans_ttfSize)} - , boldTypeFace{juce::Typeface::createSystemTypefaceFor(BinaryData::open_sans_bold_ttf, BinaryData::open_sans_bold_ttfSize)} + , errorColor(0xffff3333) + , regularTypeFace{juce::Typeface::createSystemTypefaceFor(BinaryData::noto_universal_ttf, BinaryData::noto_universal_ttfSize)} { setColourScheme({ windowBackgroundColor, @@ -46,6 +64,10 @@ namespace AK::WwiseTransfer setColour(juce::TableHeaderComponent::outlineColourId, thickOutlineColor); setColour(juce::HyperlinkButton::textColourId, textColor); setColour(juce::TooltipWindow::backgroundColourId, widgetBackgroundColor); + + setColour(ValidatableTextEditor::errorOutlineColor, errorColor); + setColour(HierarchyMappingTable::errorOutlineColor, errorColor); + setColour(ValueTreeItem::errorOutlineColor, errorColor); } std::unique_ptr<juce::Drawable> CustomLookAndFeel::getIconForObjectType(Wwise::ObjectType objectType) @@ -56,7 +78,7 @@ namespace AK::WwiseTransfer { case ObjectType::ActorMixer: { - return juce::Drawable::createFromImageData(BinaryData::ObjectIcons_PhysicalFolder_nor_svg, BinaryData::ObjectIcons_PhysicalFolder_nor_svgSize); + return juce::Drawable::createFromImageData(BinaryData::ObjectIcons_ActorMixer_nor_svg, BinaryData::ObjectIcons_ActorMixer_nor_svgSize); } case ObjectType::AudioFileSource: { @@ -147,7 +169,7 @@ namespace AK::WwiseTransfer auto textColour = header.findColour(juce::TableHeaderComponent::textColourId) .withAlpha(columnDisabled ? 0.5f : 1.0f); g.setColour(textColour); - g.setFont(getTableHeaderFont().withHeight((float)height * 0.6f)); + g.setFont(getTableHeaderFont()); g.drawFittedText(columnName, area, juce::Justification::centredLeft, 1); } @@ -225,9 +247,16 @@ namespace AK::WwiseTransfer void CustomLookAndFeel::fillTextEditorBackground(juce::Graphics& g, int width, int height, juce::TextEditor& textEditor) { - auto backgroundColor = textEditor.isReadOnly() ? windowBackgroundColor : textEditor.findColour(juce::TextEditor::backgroundColourId); + if(dynamic_cast<juce::AlertWindow*>(textEditor.getParentComponent()) == nullptr) + { + auto backgroundColor = textEditor.isReadOnly() ? windowBackgroundColor : textEditor.findColour(juce::TextEditor::backgroundColourId); - g.fillAll(backgroundColor); + g.fillAll(backgroundColor); + } + else + { + LookAndFeel_V2::fillTextEditorBackground(g, width, height, textEditor); + } } void CustomLookAndFeel::drawTooltip(juce::Graphics& g, const juce::String& text, int width, int height) @@ -245,7 +274,7 @@ namespace AK::WwiseTransfer juce::AttributedString s; s.setJustification(juce::Justification::centred); - s.append(text, juce::Font(tooltipFontSize, juce::Font::bold), findColour(juce::TooltipWindow::textColourId)); + s.append(text, juce::Font(tooltipFontSize), findColour(juce::TooltipWindow::textColourId)); juce::TextLayout tl; tl.createLayoutWithBalancedLineLengths(s, (float)maxToolTipWidth); @@ -283,9 +312,6 @@ namespace AK::WwiseTransfer juce::Typeface::Ptr CustomLookAndFeel::getTypefaceForFont(const juce::Font& font) { - if(font.isBold()) - return boldTypeFace; - return regularTypeFace; } @@ -311,7 +337,7 @@ namespace AK::WwiseTransfer juce::Font CustomLookAndFeel::getTableHeaderFont() { - return juce::Font(CustomLookAndFeelConstants::smallFontSize, juce::Font::bold); + return juce::Font(CustomLookAndFeelConstants::extraSmallFontSize); } juce::Font CustomLookAndFeel::getAlertWindowFont() @@ -326,6 +352,11 @@ namespace AK::WwiseTransfer juce::Font CustomLookAndFeel::getAlertWindowTitleFont() { - return juce::Font(CustomLookAndFeelConstants::largeFontSize, juce::Font::bold); + return juce::Font(CustomLookAndFeelConstants::largeFontSize); + } + + juce::Font CustomLookAndFeel::getComboBoxFont(juce::ComboBox&) + { + return juce::Font(CustomLookAndFeelConstants::smallFontSize); } } // namespace AK::WwiseTransfer diff --git a/src/shared/Theme/CustomLookAndFeel.h b/src/shared/Theme/CustomLookAndFeel.h @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #pragma once #include "Model/Import.h" @@ -10,6 +25,7 @@ namespace AK::WwiseTransfer { namespace CustomLookAndFeelConstants { + constexpr float extraSmallFontSize = 15.0f; constexpr float smallFontSize = 16.0f; constexpr float regularFontSize = 18.0f; constexpr float largeFontSize = 20.0f; @@ -48,11 +64,11 @@ namespace AK::WwiseTransfer juce::Font getAlertWindowMessageFont() override; juce::Font getAlertWindowFont() override; juce::Font getAlertWindowTitleFont() override; + juce::Font getComboBoxFont(juce::ComboBox&) override; juce::Font getTableHeaderFont(); private: juce::Typeface::Ptr regularTypeFace; - juce::Typeface::Ptr boldTypeFace; juce::Colour windowBackgroundColor; juce::Colour widgetBackgroundColor; @@ -68,5 +84,6 @@ namespace AK::WwiseTransfer juce::Colour previewItemNoChangeColor; juce::Colour previewItemNewColor; juce::Colour previewItemReplacedColor; + juce::Colour errorColor; }; } // namespace AK::WwiseTransfer diff --git a/src/shared/Theme/Fonts/noto_universal.ttf b/src/shared/Theme/Fonts/noto_universal.ttf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:89dea97df90b5fa98dc97b12a9fb2ad072a5bc345fba4b70de7ad1f1bb8e49bd +size 14804740 diff --git a/src/shared/Theme/Fonts/open_sans.ttf b/src/shared/Theme/Fonts/open_sans.ttf Binary files differ. diff --git a/src/shared/Theme/Fonts/open_sans_bold.ttf b/src/shared/Theme/Fonts/open_sans_bold.ttf Binary files differ. diff --git a/src/shared/Theme/Icons/ObjectIcons_ActorMixer_nor.svg b/src/shared/Theme/Icons/ObjectIcons_ActorMixer_nor.svg @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg width="100%" height="100%" viewBox="0 0 15 15" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;"> + <g transform="matrix(1,0,0,1,-20,-125)"> + <g transform="matrix(6.12323e-17,1,-1,6.12323e-17,35,125)"> + <g id="ObjectIcons_ActorMixer_nor"> + <g id="Icons"> + <g transform="matrix(6.12323e-17,-1,1,6.12323e-17,-25,55)"> + <g id="Base-Block" serif:id="Base Block"> + <path d="M55,27.1C55,25.941 54.059,25 52.9,25L42.1,25C40.941,25 40,25.941 40,27.1L40,37.9C40,39.059 40.941,40 42.1,40L52.9,40C54.059,40 55,39.059 55,37.9L55,27.1Z" style="fill-opacity:0;"/> + </g> + </g> + <path d="M3.92,15L3.08,15C2.484,15 2,14.516 2,13.92L2,8.931C1.42,8.745 1,8.201 1,7.56L1,6.44C1,5.799 1.42,5.255 2,5.069L2,1.08C2,0.485 2.483,0.001 3.08,0L3.92,0C4.517,0.001 5,0.485 5,1.08L5,5.069C5.579,5.255 5.999,5.797 6,6.44L6,1.08C6,0.485 6.483,0.001 7.08,0L7.92,0C8.517,0.001 9,0.485 9,1.08L9,8.069C9.58,8.255 10,8.799 10,9.44L10,10.56C10,11.201 9.58,11.745 9,11.931L9,13.92C9,14.515 8.517,14.999 7.92,15L7.08,15C6.484,15 6,14.516 6,13.92L6,11.931C5.421,11.745 5.001,11.203 5,10.56L5,13.92C5,14.514 4.519,14.997 3.92,15ZM11.92,15L11.08,15C10.484,15 10,14.516 10,13.92L10,6.931C9.42,6.745 9,6.201 9,5.56L9,4.44C9,3.799 9.42,3.255 10,3.069L10,1.08C10,0.485 10.483,0.001 11.08,0L11.92,0C12.517,0.001 13,0.485 13,1.08L13,3.069C13.58,3.255 14,3.799 14,4.44L14,5.56C14,6.201 13.58,6.745 13,6.931L13,13.92C13,14.515 12.517,14.999 11.92,15ZM12,4L12,1L11,1L11,4L10,4L10,6L11,6L11,14L12,14L12,6L13,6L13,4L12,4ZM4,6L4,1L3,1L3,6L2,6L2,8L3,8L3,14L4,14L4,8L5,8L5,6L4,6ZM8,9L8,1L7,1L7,9L6,9L6,11L7,11L7,14L8,14L8,11L9,11L9,9L8,9ZM5.109,8.891L5,8.931L5,9.44C5,9.245 5.039,9.06 5.109,8.891ZM6,7.56C6,7.755 5.961,7.94 5.891,8.109L6,8.069L6,7.56Z" style="fill:rgb(34,34,34);"/> + <g transform="matrix(-1,-1.8963e-33,-1.54074e-33,0.153846,23,0.846154)"> + <rect x="11" y="1" width="1" height="13" style="fill:rgb(145,145,145);"/> + </g> + <g transform="matrix(-1,0,-3.43704e-33,0.538462,23,6.46154)"> + <rect x="11" y="1" width="1" height="13" style="fill:rgb(145,145,145);"/> + </g> + <g transform="matrix(-1,-0,-0,1,7,-1)"> + <rect x="2" y="7" width="3" height="2" style="fill:rgb(226,226,226);"/> + </g> + <g transform="matrix(-1,-0,-0,1,15,5)"> + <rect x="6" y="4" width="3" height="2" style="fill:rgb(226,226,226);"/> + </g> + <g transform="matrix(-1.02054e-17,0.166667,1,6.12323e-17,4,2.33333)"> + <rect x="4" y="7" width="6" height="1" style="fill:rgb(67,67,67);"/> + </g> + <g transform="matrix(-1.02054e-17,0.166667,1,6.12323e-17,4,5.33333)"> + <rect x="4" y="7" width="6" height="1" style="fill:rgb(67,67,67);"/> + </g> + <g transform="matrix(-1,0,-3.43704e-33,0.538462,19,0.461538)"> + <rect x="11" y="1" width="1" height="13" style="fill:rgb(145,145,145);"/> + </g> + <g transform="matrix(-1,-3.08149e-33,-6.16298e-33,0.153846,19,11.8462)"> + <rect x="11" y="1" width="1" height="13" style="fill:rgb(145,145,145);"/> + </g> + <g transform="matrix(-1.02054e-17,0.166667,1,6.12323e-17,-1.03029e-13,7.33333)"> + <rect x="4" y="7" width="6" height="1" style="fill:rgb(67,67,67);"/> + </g> + <g transform="matrix(-1.02054e-17,0.166667,1,6.12323e-17,-1.03029e-13,10.3333)"> + <rect x="4" y="7" width="6" height="1" style="fill:rgb(67,67,67);"/> + </g> + <g transform="matrix(-1,2.46519e-32,-3.43704e-33,0.307692,15,0.692308)"> + <rect x="11" y="1" width="1" height="13" style="fill:rgb(145,145,145);"/> + </g> + <g transform="matrix(-1,0,-6.16298e-33,0.384615,15,8.61538)"> + <rect x="11" y="1" width="1" height="13" style="fill:rgb(145,145,145);"/> + </g> + <g transform="matrix(-1.02054e-17,0.166667,1,6.12323e-17,-4,4.33333)"> + <rect x="4" y="7" width="6" height="1" style="fill:rgb(67,67,67);"/> + </g> + <g transform="matrix(-1.02054e-17,0.166667,1,6.12323e-17,-4,7.33333)"> + <rect x="4" y="7" width="6" height="1" style="fill:rgb(67,67,67);"/> + </g> + <g transform="matrix(-1,-0,-0,1,23,-5)"> + <rect x="10" y="9" width="3" height="2" style="fill:rgb(226,226,226);"/> + </g> + </g> + </g> + </g> + </g> +</svg> diff --git a/src/shared/UI/AboutComponent.cpp b/src/shared/UI/AboutComponent.cpp @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #include "AboutComponent.h" #include "AK/AkWwiseSDKVersion.h" diff --git a/src/shared/UI/AboutComponent.h b/src/shared/UI/AboutComponent.h @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #pragma once #include "Theme/CustomLookAndFeel.h" diff --git a/src/shared/UI/CustomDrawableButton.cpp b/src/shared/UI/CustomDrawableButton.cpp @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #include "CustomDrawableButton.h" namespace AK::WwiseTransfer diff --git a/src/shared/UI/CustomDrawableButton.h b/src/shared/UI/CustomDrawableButton.h @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #pragma once #include <juce_gui_basics/juce_gui_basics.h> diff --git a/src/shared/UI/HierarchyMappingControls.cpp b/src/shared/UI/HierarchyMappingControls.cpp @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #include "HierarchyMappingControls.h" #include "BinaryData.h" diff --git a/src/shared/UI/HierarchyMappingControls.h b/src/shared/UI/HierarchyMappingControls.h @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #pragma once #include "CustomDrawableButton.h" diff --git a/src/shared/UI/HierarchyMappingTable.cpp b/src/shared/UI/HierarchyMappingTable.cpp @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #include "HierarchyMappingTable.h" #include "Helpers/ImportHelper.h" @@ -195,7 +210,8 @@ namespace AK::WwiseTransfer if(cellEnabled && !validCell) { - g.setColour(juce::Colour(juce::Colours::red).withAlpha(alpha)); + auto errorOutlineColor = juce::LookAndFeel::getDefaultLookAndFeel().findColour(HierarchyMappingTable::errorOutlineColor); + g.setColour(errorOutlineColor.withAlpha(alpha)); g.drawRect(1, 1, width - 1, height - 1); } } diff --git a/src/shared/UI/HierarchyMappingTable.h b/src/shared/UI/HierarchyMappingTable.h @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #pragma once #include "Model/Import.h" @@ -14,6 +29,11 @@ namespace AK::WwiseTransfer HierarchyMappingTable(juce::ValueTree appState); ~HierarchyMappingTable() override; + enum ColourIds + { + errorOutlineColor = 0x00000001, + }; + private: struct HierarchyMappingTableModel : public juce::TableListBoxModel diff --git a/src/shared/UI/ImportComponent.cpp b/src/shared/UI/ImportComponent.cpp @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #include "ImportComponent.h" #include "Model/IDs.h" diff --git a/src/shared/UI/ImportComponent.h b/src/shared/UI/ImportComponent.h @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #pragma once #include "Core/WaapiClient.h" diff --git a/src/shared/UI/ImportConflictsComponent.cpp b/src/shared/UI/ImportConflictsComponent.cpp @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #include "ImportConflictsComponent.h" #include "Helpers/ImportHelper.h" diff --git a/src/shared/UI/ImportConflictsComponent.h b/src/shared/UI/ImportConflictsComponent.h @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #pragma once #include "Model/Import.h" diff --git a/src/shared/UI/ImportControlsComponent.cpp b/src/shared/UI/ImportControlsComponent.cpp @@ -1,7 +1,24 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #include "ImportControlsComponent.h" +#include "Helpers/FileHelper.h" #include "Helpers/ImportHelper.h" #include "Model/IDs.h" +#include "Theme/CustomLookAndFeel.h" #include <set> @@ -18,6 +35,10 @@ namespace AK::WwiseTransfer constexpr int showSilentIncrementWarningToggleWidth = 300; constexpr int showSilentIncrementWarningToggleHeight = 60; constexpr int showSilentIncrementWarningToggleMarginLeft = 78; + + constexpr int errorMessageWidth = 260; + constexpr int errorMessageHeight = 200; + constexpr int errorMessageMarginLeft = 75; }; // namespace ImportControlsComponentConstants ImportControlsComponent::ImportControlsComponent(juce::ValueTree appState, WaapiClient& waapiClient, DawContext& dawContext, ApplicationProperties& applicationProperties, const juce::String& applicationName) @@ -31,6 +52,7 @@ namespace AK::WwiseTransfer , projectPath(applicationState, IDs::projectPath, nullptr) , containerNameExistsOption(applicationState, IDs::containerNameExists, nullptr) , applyTemplateOption(applicationState, IDs::applyTemplate, nullptr) + , transferInProgress(applicationState, IDs::transferInProgress, nullptr) , hierarchyMapping(applicationState.getChildWithName(IDs::hierarchyMapping)) , previewItems(applicationState.getChildWithName(IDs::previewItems)) , waapiClient(waapiClient) @@ -61,6 +83,10 @@ namespace AK::WwiseTransfer showSilentIncrementWarningToggle.setButtonText("Don't show message again"); showSilentIncrementWarningToggle.setSize(showSilentIncrementWarningToggleWidth, showSilentIncrementWarningToggleHeight); + + errorMessageContainer.setMultiLine(true); + errorMessageContainer.setReadOnly(true); + errorMessageContainer.setSize(errorMessageWidth, errorMessageHeight); } ImportControlsComponent::~ImportControlsComponent() @@ -73,229 +99,153 @@ namespace AK::WwiseTransfer importButton.setBounds(getLocalBounds()); } - namespace - { - bool RenderDirContentModified(const std::set<juce::File>& directorySet, const juce::Time& lastWriteTime) - { - for(const auto& directory : directorySet) - { - for(const auto& file : directory.findChildFiles(juce::File::TypesOfFileToFind::findFiles, false)) - { - if(file.getLastModificationTime() > lastWriteTime) - { - return true; - } - } - } - return false; - } - } // namespace - void ImportControlsComponent::transferToWwise() { - if(!importButton.isEnabled()) - return; - using namespace ImportControlsComponentConstants; - // Disable the import button while rendering - importButton.setEnabled(false); + if(transferInProgress.get()) + return; + + transferInProgress = true; const auto hierarchyMappingPath = ImportHelper::hierarchyMappingToPath(ImportHelper::valueTreeToHierarchyMappingNodeList(applicationState.getChildWithName(IDs::hierarchyMapping))); const Import::Options opts(importDestination, originalsSubFolder, hierarchyMappingPath); const auto previewItems = dawContext.getItemsForPreview(opts); + + // Confirm that files where rendered std::set<juce::File> directorySet; for(const auto item : previewItems) { directorySet.insert(juce::File(item.audioFilePath).getParentDirectory()); } + auto lastModificationTime = juce::Time::getCurrentTime(); juce::Logger::writeToLog("Sending render request to DAW"); + dawContext.renderItems(); - if(!RenderDirContentModified(directorySet, lastModificationTime)) + if(FileHelper::countModifiedFilesInDirectoriesSince(directorySet, lastModificationTime) != previewItems.size()) { - const juce::String message("One or more files failed to render."); - juce::Logger::writeToLog(message); - juce::AlertWindow::showMessageBoxAsync(juce::MessageBoxIconType::InfoIcon, "Transfer to Wwise Aborted", message); - importButton.setEnabled(true); + onRenderFailedDetected(); return; } const auto importItems = dawContext.getItemsForImport(opts); + bool showIncompletePathWarning = false; bool showRenameWarning = false; - bool showRenderFailed = false; + if(importItems.size() > 0) { for(const auto& importItem : importItems) { if(importItem.renderFilePath.isEmpty()) { - showRenderFailed = true; - break; + onRenderFailedDetected(); + return; } if(juce::File(importItem.audioFilePath) != juce::File(importItem.renderFilePath)) - { showRenameWarning = true; - break; - } + + if(!WwiseHelper::isPathComplete(importItem.path)) + showIncompletePathWarning = true; } } else { - juce::Logger::writeToLog("No items to import."); - importButton.setEnabled(true); - return; - } - - if(showRenderFailed) - { - const juce::String message("One or more files failed to render."); - juce::Logger::writeToLog(message); - juce::AlertWindow::showMessageBoxAsync(juce::MessageBoxIconType::InfoIcon, "Transfer to Wwise Aborted", message); - importButton.setEnabled(true); + juce::Logger::writeToLog("No items to import..."); + transferInProgress = false; return; } - const auto hierarchyMappingNodeList = ImportHelper::valueTreeToHierarchyMappingNodeList(hierarchyMapping); - const Import::Task::Options importTaskOptions{ - importItems, - containerNameExistsOption, - applyTemplateOption, - importDestination, - hierarchyMappingNodeList, - originalsFolder, - languageSubfolder, - selectObjectsOnImportCommand, - applyTemplateFeatureEnabled, - undoGroupFeatureEnabled, - waqlEnabled}; + if(showRenameWarning && applicationProperties.getShowSilentIncrementWarning()) + onFileRenamedDetected(showIncompletePathWarning, importItems); + else if(showIncompletePathWarning) + onPathIncompleteDetected(importItems); + else + onImport(importItems); + } - auto onImportComplete = [this, importTaskOptions = importTaskOptions](const Import::Summary& importSummary) - { - showImportSummary(importSummary, importTaskOptions); - importButton.setEnabled(true); - }; + void ImportControlsComponent::showImportSummaryModal(const Import::Summary& summary, const Import::Task::Options& importTaskOptions) + { + auto hasErrors = !summary.errors.empty(); - importTask.reset(new ImportTask(waapiClient, importTaskOptions, onImportComplete)); + juce::String title(!hasErrors ? "Wwise Import Successful" : "Wwise Imported with Errors"); - if(!showRenameWarning || !applicationProperties.getShowSilentIncrementWarning()) - { - juce::Logger::writeToLog("Importing files..."); - importTask->launchThread(); - return; - } + juce::String message; + message << summary.getNumObjectsCreated() << " object(s) created."; + message << juce::NewLine() << summary.getNumObjectTemplatesApplied() << " object template(s) applied."; + message << juce::NewLine() << summary.getNumAudiofilesTransfered() << " audio files(s) imported."; - const juce::String message("Several file names where silently incremented to avoid overwriting during the render process."); - juce::Logger::writeToLog(message); + auto messageBoxOptions = juce::MessageBoxOptions() + .withTitle(title) + .withMessage(message) + .withButton("View Details") + .withButton("Close"); - auto onDialogBtnClicked = [this, importItems = importItems](int result) + auto onDialogBtnClicked = [this, summary = summary, importTaskOptions = importTaskOptions](int result) { - applicationProperties.setShowSilentIncrementWarning(!showSilentIncrementWarningToggle.getToggleState()); - if(result == MessageBoxOption::Continue) { - juce::Logger::writeToLog("Importing files..."); - importTask->launchThread(); - return; + auto importSummaryFile = createImportSummaryFile(summary, importTaskOptions); + importSummaryFile.launchInDefaultBrowser(); } - - juce::Logger::writeToLog("Import aborted."); - importTask.reset(); - importButton.setEnabled(true); }; - auto messageBoxOptions = juce::MessageBoxOptions() - .withTitle("Action Required") - .withMessage(message) - .withButton("Continue") - .withButton("Cancel"); - juce::AlertWindow::showAsync(messageBoxOptions, onDialogBtnClicked); auto modalManager = juce::ModalComponentManager::getInstance(); auto alertWindow = dynamic_cast<juce::AlertWindow*>(modalManager->getModalComponent(0)); - alertWindow->addCustomComponent(&showSilentIncrementWarningToggle); - - // Reset and reposition the toggle button - showSilentIncrementWarningToggle.setToggleState(false, true); - auto bounds = showSilentIncrementWarningToggle.getBounds(); - bounds.setX(showSilentIncrementWarningToggleMarginLeft); - showSilentIncrementWarningToggle.setBounds(bounds); - } - - void ImportControlsComponent::showImportSummary(const Import::Summary& summary, const Import::Task::Options& importTaskOptions) - { - juce::String message; - message << summary.getNumObjectsCreated() << " object(s) created."; - message << juce::NewLine() << summary.getNumObjectTemplatesApplied() << " object template(s) applied."; - message << juce::NewLine() << importTaskOptions.importItems.size() << " audio files(s) imported."; - - if(summary.errorMessage.isNotEmpty()) - message << juce::NewLine() << summary.errorMessage; + if(hasErrors) + { + juce::String errorMessage; - auto messageBoxOptions = juce::MessageBoxOptions() - .withTitle("Wwise Import Summary") - .withMessage(message) - .withButton("View Details") - .withButton("Close"); + for(const auto& error : summary.errors) + { + errorMessage << "Error: `" + error.uri + "` for procedure `" + error.procedureUri + "`" << juce::NewLine() << juce::NewLine(); + errorMessage << "Message: " + error.message << juce::NewLine() << juce::NewLine(); + } - auto onDialogBtnClicked = [this, summary = summary, importTaskOptions = importTaskOptions](int result) + alertWindow->addCustomComponent(&errorMessageContainer); + auto currentBounds = errorMessageContainer.getBounds(); + errorMessageContainer.setBounds(currentBounds.withX(ImportControlsComponentConstants::errorMessageMarginLeft)); + errorMessageContainer.setText(errorMessage); + errorMessageContainer.setColour(juce::TextEditor::backgroundColourId, findColour(juce::AlertWindow::backgroundColourId)); + errorMessageContainer.setFont(CustomLookAndFeelConstants::smallFontSize); + } + else { - if(result == MessageBoxOption::Continue) + for(int i = 0; i < alertWindow->getNumChildComponents(); ++i) { - viewImportSummaryDetails(summary, importTaskOptions); + auto* component = alertWindow->getChildComponent(i); + if(component->getName() == "Error Details") + component->setEnabled(false); } - }; - - juce::AlertWindow::showAsync(messageBoxOptions, onDialogBtnClicked); + } } - void ImportControlsComponent::viewImportSummaryDetails(const Import::Summary& summary, const Import::Task::Options& importTaskOptions) + juce::URL ImportControlsComponent::createImportSummaryFile(const Import::Summary& summary, const Import::Task::Options& importTaskOptions) { auto currentTime = juce::Time::getCurrentTime(); + auto hasErrors = !summary.errors.empty(); auto importSummaryFile = juce::File::getSpecialLocation(juce::File::tempDirectory) .getChildFile(applicationName + "_WwiseImportSummary_" + currentTime.formatted("%Y-%m-%d_%H-%M-%S")) .withFileExtension(".html"); - importSummaryFile.create(); - - importSummaryFile.appendText("<style>table td, th { border:1px solid black; padding:10px; }"); - importSummaryFile.appendText("table { border-collapse:collapse; }"); - importSummaryFile.appendText("table th { text-align: left; }</style>"); - importSummaryFile.appendText("<pre>" + applicationName + ": Wwise Import Summary " + currentTime.formatted("%Y-%m-%d %H:%M:%S") + "\n\n"); - importSummaryFile.appendText("Import Destination: " + importTaskOptions.importDestination + "\n"); - importSummaryFile.appendText("Container Name Exists: " + ImportHelper::containerNameExistsOptionToReadableString(importTaskOptions.containerNameExistsOption) + "\n"); - importSummaryFile.appendText("Apply Template: " + ImportHelper::applyTemplateOptionToReadableString(importTaskOptions.applyTemplateOption) + "\n\n"); - - importSummaryFile.appendText("Objects created: " + juce::String(summary.getNumObjectsCreated()) + "\n"); - importSummaryFile.appendText("Object Templates Applied: " + juce::String(summary.getNumObjectTemplatesApplied()) + "\n"); - importSummaryFile.appendText("Audio Files Imported: " + juce::String(importTaskOptions.importItems.size()) + "\n\n"); - - importSummaryFile.appendText("<table><tr><th>Object Path</th><th>Type</th><th>Object Status</th><th>Originals Wav</th><th>Wav Status</th><th>Property Template Applied</th></tr>"); - - for(const auto& [objectPath, object] : summary.objects) - { - importSummaryFile.appendText("<tr><td>" + objectPath + "</td><td>" + WwiseHelper::objectTypeToReadableString(object.type) + "</td>" + - "<td>" + ImportHelper::objectStatusToReadableString(object.objectStatus) + "</td><td>" + object.originalWavFilePath + "</td>" + - "<td>" + ImportHelper::wavStatusToReadableString(object.wavStatus) + "</td><td>" + object.propertyTemplatePath + "</td></tr>"); - } - - importSummaryFile.appendText("</table></pre>"); + importSummaryFile.appendText(ImportHelper::createImportSummary(applicationName, currentTime, summary, importTaskOptions)); - juce::URL importSummaryFileUrl(importSummaryFile.getFullPathName()); - importSummaryFileUrl.launchInDefaultBrowser(); + return juce::URL(importSummaryFile.getFullPathName()); } void ImportControlsComponent::refreshComponent() { - auto importButtonEnabled = originalsSubfolderValid.get() && importDestinationValid.get() && projectPath.get().isNotEmpty() && previewItems.getNumChildren() > 0; + auto importButtonEnabled = !transferInProgress.get() && originalsSubfolderValid.get() && importDestinationValid.get() && + projectPath.get().isNotEmpty() && previewItems.getNumChildren() > 0; auto hieararchyMappingNodes = ImportHelper::valueTreeToHierarchyMappingNodeList(hierarchyMapping); @@ -325,7 +275,7 @@ namespace AK::WwiseTransfer void ImportControlsComponent::valueTreePropertyChanged(juce::ValueTree& treeWhosePropertyHasChanged, const juce::Identifier& property) { - if(treeWhosePropertyHasChanged == applicationState && (property == IDs::originalsSubfolderValid || property == IDs::importDestinationValid || property == IDs::projectPath) || + if(treeWhosePropertyHasChanged == applicationState && (property == IDs::originalsSubfolderValid || property == IDs::importDestinationValid || property == IDs::projectPath || property == IDs::transferInProgress) || treeWhosePropertyHasChanged.getType() == IDs::hierarchyMappingNode) { triggerAsyncUpdate(); @@ -360,4 +310,116 @@ namespace AK::WwiseTransfer { refreshComponent(); } + + void ImportControlsComponent::onRenderFailedDetected() + { + const juce::String message("One or more files failed to render."); + juce::Logger::writeToLog(message); + + juce::AlertWindow::showMessageBoxAsync(juce::MessageBoxIconType::InfoIcon, "Transfer to Wwise Aborted", message); + + transferInProgress = false; + importTask.reset(); + } + + void ImportControlsComponent::onImportCancelled() + { + juce::Logger::writeToLog("Import was cancelled by user..."); + + transferInProgress = false; + importTask.reset(); + } + + void ImportControlsComponent::onFileRenamedDetected(bool isPathIncomplete, const std::vector<Import::Item>& importItems) + { + auto onDialogBtnClicked = [this, isPathIncomplete, importItems](int result) + { + applicationProperties.setShowSilentIncrementWarning(!showSilentIncrementWarningToggle.getToggleState()); + + if(result == MessageBoxOption::Continue) + { + if(isPathIncomplete) + onPathIncompleteDetected(importItems); + else + onImport(importItems); + } + else + onImportCancelled(); + }; + + const juce::String message("One or more file names where silently incremented to avoid overwriting during the render process."); + juce::Logger::writeToLog(message); + + auto messageBoxOptions = juce::MessageBoxOptions() + .withTitle("Action Required") + .withMessage(message) + .withButton("Continue") + .withButton("Cancel"); + + juce::AlertWindow::showAsync(messageBoxOptions, onDialogBtnClicked); + + auto modalManager = juce::ModalComponentManager::getInstance(); + auto alertWindow = dynamic_cast<juce::AlertWindow*>(modalManager->getModalComponent(0)); + alertWindow->addCustomComponent(&showSilentIncrementWarningToggle); + + // Reset and reposition the toggle button + showSilentIncrementWarningToggle.setToggleState(false, true); + auto bounds = showSilentIncrementWarningToggle.getBounds(); + bounds.setX(ImportControlsComponentConstants::showSilentIncrementWarningToggleMarginLeft); + showSilentIncrementWarningToggle.setBounds(bounds); + } + + void ImportControlsComponent::onPathIncompleteDetected(const std::vector<Import::Item>& importItems) + { + auto onDialogBtnClicked = [this, importItems](int result) + { + if(result == MessageBoxOption::Continue) + onImport(importItems); + else + onImportCancelled(); + }; + + const juce::String message("One or more object paths are incomplete and will not be transfered."); + juce::Logger::writeToLog(message); + + auto messageBoxOptions = juce::MessageBoxOptions() + .withTitle("Action Required") + .withMessage(message) + .withButton("Continue") + .withButton("Cancel"); + + juce::AlertWindow::showAsync(messageBoxOptions, onDialogBtnClicked); + } + + void ImportControlsComponent::onImport(const std::vector<Import::Item>& importItems) + { + const auto hierarchyMappingNodeList = ImportHelper::valueTreeToHierarchyMappingNodeList(hierarchyMapping); + + const Import::Task::Options importTaskOptions{ + importItems, + containerNameExistsOption, + applyTemplateOption, + importDestination, + hierarchyMappingNodeList, + originalsFolder, + languageSubfolder, + selectObjectsOnImportCommand, + applyTemplateFeatureEnabled, + undoGroupFeatureEnabled, + waqlEnabled}; + + auto onImportComplete = [this, importTaskOptions = importTaskOptions](const Import::Summary& importSummary) + { + showImportSummaryModal(importSummary, importTaskOptions); + + transferInProgress = false; + importTask.reset(); // Needs to be called last since this lambda gets called inside of importTask + }; + + juce::Logger::writeToLog("Importing files..."); + + importTask.reset(new ImportTask(waapiClient, importTaskOptions, onImportComplete)); + importTask->launchThread(); + } + } // namespace AK::WwiseTransfer diff --git a/src/shared/UI/ImportControlsComponent.h b/src/shared/UI/ImportControlsComponent.h @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #pragma once #include "Core/DawContext.h" @@ -34,6 +49,7 @@ namespace AK::WwiseTransfer juce::CachedValue<juce::String> languageSubfolder; juce::CachedValue<Import::ContainerNameExistsOption> containerNameExistsOption; juce::CachedValue<Import::ApplyTemplateOption> applyTemplateOption; + juce::CachedValue<bool> transferInProgress; juce::ValueTree hierarchyMapping; juce::ValueTree previewItems; @@ -50,10 +66,12 @@ namespace AK::WwiseTransfer juce::ToggleButton showSilentIncrementWarningToggle; + juce::TextEditor errorMessageContainer; + const juce::String applicationName; - void showImportSummary(const Import::Summary& summary, const Import::Task::Options& importTaskOptions); - void viewImportSummaryDetails(const Import::Summary& summary, const Import::Task::Options& importTaskOptions); + void showImportSummaryModal(const Import::Summary& summary, const Import::Task::Options& importTaskOptions); + juce::URL createImportSummaryFile(const Import::Summary& summary, const Import::Task::Options& importTaskOptions); void refreshComponent(); @@ -64,6 +82,12 @@ namespace AK::WwiseTransfer void handleAsyncUpdate() override; + void onRenderFailedDetected(); + void onImportCancelled(); + void onFileRenamedDetected(bool isPathIncomplete, const std::vector<Import::Item>& importItems); + void onPathIncompleteDetected(const std::vector<Import::Item>& importItems); + void onImport(const std::vector<Import::Item>& importItems); + JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(ImportControlsComponent) }; } // namespace AK::WwiseTransfer diff --git a/src/shared/UI/ImportDestinationComponent.cpp b/src/shared/UI/ImportDestinationComponent.cpp @@ -1,4 +1,19 @@ -#include "ImportDestinationComponent.h" +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + +#include "ImportDestinationComponent.h" #include "BinaryData.h" #include "Persistance/ApplicationState.h" @@ -11,7 +26,7 @@ namespace AK::WwiseTransfer constexpr int margin = 10; constexpr int spacing = 4; constexpr int editorBoxHeight = 26; - constexpr int labelWidth = 120; + constexpr int labelWidth = 122; constexpr int syncButtonWidth = 36; constexpr int iconSize = 16; } // namespace ImportDestinationComponentConstants diff --git a/src/shared/UI/ImportDestinationComponent.h b/src/shared/UI/ImportDestinationComponent.h @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #pragma once #include "Core/WaapiClient.h" diff --git a/src/shared/UI/ImportPreviewComponent.cpp b/src/shared/UI/ImportPreviewComponent.cpp @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #include "ImportPreviewComponent.h" #include "Helpers/ImportHelper.h" @@ -43,6 +58,9 @@ namespace AK::WwiseTransfer treeView.setDefaultOpenness(true); treeView.setRootItem(&rootItem); treeView.setRootItemVisible(false); + treeView.setMultiSelectEnabled(true); + treeView.setWantsKeyboardFocus(true); + treeView.addKeyListener(this); for(const auto& tableHeader : tableHeaders) { @@ -69,6 +87,7 @@ namespace AK::WwiseTransfer ImportPreviewComponent::~ImportPreviewComponent() { applicationState.removeListener(this); + treeView.removeKeyListener(this); } void ImportPreviewComponent::resized() @@ -140,10 +159,47 @@ namespace AK::WwiseTransfer header.setStretchToFitActive(true); } + void ImportPreviewComponent::copySelectedItemsToClipBoard() + { + juce::String header("Name\tObject Status\tOriginals Wav\tWav Status\r\n"); + + juce::String body; + for(int i = 0; i < treeView.getNumSelectedItems(); ++i) + { + auto selectedItem = dynamic_cast<ValueTreeItem*>(treeView.getSelectedItem(i)); + + if(selectedItem) + { + auto valueTree = selectedItem->getValueTree(); + + auto previewItem = ImportHelper::valueTreeToPreviewItemNode(valueTree); + + body << valueTree.getType() << "\t" << ImportHelper::objectStatusToReadableString(previewItem.objectStatus) << "\t" + << previewItem.audioFilePath << "\t" << ImportHelper::wavStatusToReadableString(previewItem.wavStatus) << "\r\n"; + } + } + + if(body.isNotEmpty()) + juce::SystemClipboard::copyTextToClipboard(header << body); + } + + bool ImportPreviewComponent::keyPressed(const juce::KeyPress& key, juce::Component* originatingComponent) + { + if(key == juce::KeyPress('c', juce::ModifierKeys::ctrlModifier, 0)) + { + copySelectedItemsToClipBoard(); + return true; + } + + return false; + } + ValueTreeItem::ValueTreeItem(juce::TableHeaderComponent& header, juce::ValueTree t) : header(header) , tree(t) { + setDrawsInLeftMargin(true); + tree.addListener(this); header.addListener(this); } @@ -232,6 +288,9 @@ namespace AK::WwiseTransfer void ValueTreeItem::paintItem(juce::Graphics& g, int width, int height) { + if(isSelected()) + g.fillAll(juce::LookAndFeel::getDefaultLookAndFeel().findColour(juce::TextEditor::highlightColourId)); + using namespace ImportPreviewComponentConstants; auto previewItem = ImportHelper::valueTreeToPreviewItemNode(tree); @@ -246,7 +305,7 @@ namespace AK::WwiseTransfer jassert(cellText.size() == header.getNumColumns(true)); auto* customLookAndFeel = dynamic_cast<CustomLookAndFeel*>(&getOwnerView()->getLookAndFeel()); - g.setColour(customLookAndFeel->getTextColourForObjectStatus(previewItem.objectStatus)); + auto textColor = customLookAndFeel->getTextColourForObjectStatus(previewItem.objectStatus); // First column is special since it has indentation + icon auto indent = getItemPosition(true).getX(); @@ -264,24 +323,33 @@ namespace AK::WwiseTransfer if(textWidth > 0) { - g.drawText(cellText[0], + auto objectNameColor = previewItem.unresolvedWildcard ? getOwnerView()->getLookAndFeel().findColour(ValueTreeItem::errorOutlineColor) : textColor; + auto objectName = previewItem.unresolvedWildcard ? "<unresolved_wildcard>" : cellText[0]; + + g.setColour(objectNameColor); + g.drawText(objectName, iconSize, 0, textWidth, height, juce::Justification::centredLeft, true); } } - auto xPosition = trueColumnWidth; - - // The rest of the cells are just text, so no special text coordinates to calculate - for(int i = 1; i < cellText.size(); ++i) + if(!previewItem.unresolvedWildcard) { - auto columnWidth = header.getColumnWidth(i + 1); + auto xPosition = trueColumnWidth; + + g.setColour(textColor); - g.drawText(cellText[i], - xPosition, 0, columnWidth, height, - juce::Justification::centredLeft, true); + // The rest of the cells are just text, so no special text coordinates to calculate + for(int i = 1; i < cellText.size(); ++i) + { + auto columnWidth = header.getColumnWidth(i + 1); + + g.drawText(cellText[i], + xPosition, 0, columnWidth, height, + juce::Justification::centredLeft, true); - xPosition += columnWidth; + xPosition += columnWidth; + } } } @@ -323,13 +391,54 @@ namespace AK::WwiseTransfer case TreeValueItemColumn::OriginalsWav: return previewItem.audioFilePath; case TreeValueItemColumn::WavStatus: - // TODO: Return the wav status as string eventually - return juce::String(); + return ImportHelper::wavStatusToReadableString(previewItem.wavStatus); default: return juce::String(); } } + void ValueTreeItem::itemClicked(const juce::MouseEvent& event) + { + if(event.mods == juce::ModifierKeys::rightButtonModifier) + { + auto onCopy = [this] + { + auto treeView = getOwnerView(); + + if(treeView) + { + auto parent = treeView->getParentComponent(); + + if(parent) + { + auto importPreviewComponent = dynamic_cast<ImportPreviewComponent*>(parent); + + if(importPreviewComponent) + { + importPreviewComponent->copySelectedItemsToClipBoard(); + return; + } + } + } + + juce::AlertWindow::showMessageBoxAsync(juce::MessageBoxIconType::InfoIcon, "Copy Error", "Unable to add selected items to clipboard"); + }; + + juce::PopupMenu contextMenu; + contextMenu.addItem("Copy to Clipboard", onCopy); + + auto treeView = getOwnerView(); + + if(treeView) + contextMenu.showMenuAsync(juce::PopupMenu::Options().withParentComponent(treeView)); + } + } + + juce::ValueTree ValueTreeItem::getValueTree() + { + return tree; + } + ValueTreeItem::Comparator::Comparator(const juce::TableHeaderComponent& header) : sortColumnId(header.getSortColumnId() == 0 ? 1 : header.getSortColumnId()) , sortDirectionForward(header.getSortColumnId() == 0 ? true : header.isSortedForwards()) diff --git a/src/shared/UI/ImportPreviewComponent.h b/src/shared/UI/ImportPreviewComponent.h @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #pragma once #include "BinaryData.h" @@ -34,6 +49,13 @@ namespace AK::WwiseTransfer void itemOpennessChanged(bool isNowOpen) override; juce::String getUniqueName() const override; juce::String getComparisonTextForColumn(int column); + void itemClicked(const juce::MouseEvent&) override; + juce::ValueTree getValueTree(); + + enum ColourIds + { + errorOutlineColor = 0x00000002, + }; private: juce::TableHeaderComponent& header; @@ -58,6 +80,7 @@ namespace AK::WwiseTransfer : public juce::Component , public juce::ValueTree::Listener , public juce::AsyncUpdater + , public juce::KeyListener { public: ImportPreviewComponent(juce::ValueTree appState); @@ -65,6 +88,9 @@ namespace AK::WwiseTransfer void resized() override; + void copySelectedItemsToClipBoard(); + bool keyPressed(const juce::KeyPress& key, juce::Component* originatingComponent) override; + private: juce::ValueTree applicationState; juce::ValueTree previewItems; diff --git a/src/shared/UI/LoadingComponent.cpp b/src/shared/UI/LoadingComponent.cpp @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #include "LoadingComponent.h" namespace AK::WwiseTransfer diff --git a/src/shared/UI/LoadingComponent.h b/src/shared/UI/LoadingComponent.h @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #pragma once #include <juce_gui_basics/juce_gui_basics.h> diff --git a/src/shared/UI/MainComponent.cpp b/src/shared/UI/MainComponent.cpp @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #include "MainComponent.h" #include "Persistance/ApplicationState.h" diff --git a/src/shared/UI/MainComponent.h b/src/shared/UI/MainComponent.h @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #pragma once #include "Core/DawContext.h" diff --git a/src/shared/UI/MainWindow.cpp b/src/shared/UI/MainWindow.cpp @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #include "MainWindow.h" #include <limits> diff --git a/src/shared/UI/MainWindow.h b/src/shared/UI/MainWindow.h @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #pragma once #include "Core/DawContext.h" diff --git a/src/shared/UI/OriginalsSubfolderComponent.cpp b/src/shared/UI/OriginalsSubfolderComponent.cpp @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #include "OriginalsSubfolderComponent.h" #include "BinaryData.h" @@ -10,7 +25,7 @@ namespace AK::WwiseTransfer constexpr int margin = 10; constexpr int spacing = 4; constexpr int editorBoxHeight = 26; - constexpr int labelWidth = 120; + constexpr int labelWidth = 122; constexpr int wildcardsButtonWidth = 80; constexpr int smallButtonWidth = 26; } // namespace WwiseOriginalsComponentConstants diff --git a/src/shared/UI/OriginalsSubfolderComponent.h b/src/shared/UI/OriginalsSubfolderComponent.h @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #pragma once #include "AboutComponent.h" diff --git a/src/shared/UI/OutputLogComponent.cpp b/src/shared/UI/OutputLogComponent.cpp @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #include "OutputLogComponent.h" namespace AK::WwiseTransfer diff --git a/src/shared/UI/OutputLogComponent.h b/src/shared/UI/OutputLogComponent.h @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #pragma once #include "Core/Logger.h" diff --git a/src/shared/UI/PresetMenuComponent.cpp b/src/shared/UI/PresetMenuComponent.cpp @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #include "PresetMenuComponent.h" #include "BinaryData.h" diff --git a/src/shared/UI/PresetMenuComponent.h b/src/shared/UI/PresetMenuComponent.h @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #pragma once #include "CustomDrawableButton.h" diff --git a/src/shared/UI/SelectedRowPropertiesComponent.cpp b/src/shared/UI/SelectedRowPropertiesComponent.cpp @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #include "SelectedRowPropertiesComponent.h" #include "BinaryData.h" @@ -121,6 +136,7 @@ namespace AK::WwiseTransfer objectType.referTo(hierarchyMappingNode, IDs::objectType, nullptr); objectLanguage.referTo(hierarchyMappingNode, IDs::objectLanguage, nullptr); + propertyTemplatePath.referTo(hierarchyMappingNode, IDs::propertyTemplatePath, nullptr); propertyTemplatePathEnabled.referTo(hierarchyMappingNode, IDs::propertyTemplatePathEnabled, nullptr); propertyTemplatePathValid.referTo(hierarchyMappingNode, IDs::propertyTemplatePathValid, nullptr); @@ -137,6 +153,7 @@ namespace AK::WwiseTransfer propertyTemplateToggleButton.getToggleStateValue().referTo(propertyTemplatePathEnabled.getPropertyAsValue()); updatePropertyTemplateSection(); + objectLanguageComboBox.setVisible(objectType == Wwise::ObjectType::SoundVoice); objectLanguageComboBox.clear(); @@ -147,9 +164,6 @@ namespace AK::WwiseTransfer if(languageList[i] == objectLanguage) objectLanguageComboBox.setSelectedId(i + 1); } - - if(objectLanguage.get().isNotEmpty() && objectLanguageComboBox.getSelectedId() == 0) - objectLanguageComboBox.setText(objectLanguage.get()); } void SelectedRowPropertiesComponent::updatePropertyTemplatePath() diff --git a/src/shared/UI/SelectedRowPropertiesComponent.h b/src/shared/UI/SelectedRowPropertiesComponent.h @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #pragma once #include "Core/WaapiClient.h" diff --git a/src/shared/UI/SimpleListBox.cpp b/src/shared/UI/SimpleListBox.cpp @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #include "SimpleListBox.h" namespace AK::WwiseTransfer diff --git a/src/shared/UI/SimpleListBox.h b/src/shared/UI/SimpleListBox.h @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #pragma once #include <juce_gui_basics/juce_gui_basics.h> diff --git a/src/shared/UI/Splitter.cpp b/src/shared/UI/Splitter.cpp @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #include "Splitter.h" namespace AK::WwiseTransfer diff --git a/src/shared/UI/Splitter.h b/src/shared/UI/Splitter.h @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #pragma once #include <juce_gui_basics/juce_gui_basics.h> diff --git a/src/shared/UI/TruncatableTextEditor.cpp b/src/shared/UI/TruncatableTextEditor.cpp @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #include "TruncatableTextEditor.h" namespace AK::WwiseTransfer diff --git a/src/shared/UI/TruncatableTextEditor.h b/src/shared/UI/TruncatableTextEditor.h @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #pragma once #include <juce_gui_basics/juce_gui_basics.h> diff --git a/src/shared/UI/ValidatableTextEditor.cpp b/src/shared/UI/ValidatableTextEditor.cpp @@ -1,5 +1,22 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #include "ValidatableTextEditor.h" +#include "Theme/CustomLookAndFeel.h" + namespace AK::WwiseTransfer { ValidatableTextEditor::ValidatableTextEditor(const juce::String& componentName) @@ -57,12 +74,10 @@ namespace AK::WwiseTransfer void ValidatableTextEditor::refreshComponent(bool isValid) { - auto outlineColour = juce::LookAndFeel::getDefaultLookAndFeel().findColour(juce::TextEditor::outlineColourId); + auto outlineColour = getLookAndFeel().findColour(juce::TextEditor::outlineColourId); if(!isValid) - { - outlineColour = juce::Colours::crimson; - } + outlineColour = getLookAndFeel().findColour(ValidatableTextEditor::errorOutlineColor); setColour(juce::TextEditor::outlineColourId, outlineColour); } diff --git a/src/shared/UI/ValidatableTextEditor.h b/src/shared/UI/ValidatableTextEditor.h @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #pragma once #include <juce_gui_basics/juce_gui_basics.h> @@ -20,6 +35,11 @@ namespace AK::WwiseTransfer juce::Value& getValidationValue(); juce::Value& getErrorMessageValue(); + enum ColourIds + { + errorOutlineColor = 0x00000000, + }; + private: void refreshComponent(bool isValid); juce::Value validationValue; diff --git a/src/shared/UI/WildcardSelector.cpp b/src/shared/UI/WildcardSelector.cpp @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #include "WildcardSelector.h" #include <unordered_map> diff --git a/src/shared/UI/WildcardSelector.h b/src/shared/UI/WildcardSelector.h @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #pragma once #include <juce_gui_basics/juce_gui_basics.h> diff --git a/src/standalone/Standalone.cpp b/src/standalone/Standalone.cpp @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #include "Standalone.h" #include "StandaloneWindow.h" diff --git a/src/standalone/Standalone.h b/src/standalone/Standalone.h @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #pragma once #include "StubContext.h" diff --git a/src/standalone/StandaloneWindow.cpp b/src/standalone/StandaloneWindow.cpp @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #include "StandaloneWindow.h" #include <limits> diff --git a/src/standalone/StandaloneWindow.h b/src/standalone/StandaloneWindow.h @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #pragma once #include "StubContext.h" diff --git a/src/standalone/StubContext.cpp b/src/standalone/StubContext.cpp diff --git a/src/standalone/StubContext.h b/src/standalone/StubContext.h @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #pragma once #include "Core/DawContext.h" diff --git a/src/test/FileHelperTests.cpp b/src/test/FileHelperTests.cpp @@ -0,0 +1,83 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + +#include "Helpers/FileHelper.h" + +#include <catch2/catch_test_macros.hpp> + +namespace AK::WwiseTransfer::Test +{ + TEST_CASE("countModifiedFilesInDirectoriesSince") + { + SECTION("One directory, multiple files created at same time") + { + auto tmpDir = juce::File::getSpecialLocation(juce::File::SpecialLocationType::tempDirectory) + .getChildFile("temp_" + juce::String::toHexString(juce::Random::getSystemRandom().nextInt())); + + tmpDir.createDirectory(); + + auto time = juce::Time::getCurrentTime(); + + juce::Time::waitForMillisecondCounter(juce::Time::getMillisecondCounter() + 100); + + tmpDir.getChildFile("tempFile1.txt").create(); + tmpDir.getChildFile("tempFile2.txt").create(); + + std::set<juce::File> directorySet = { + tmpDir}; + + REQUIRE(FileHelper::countModifiedFilesInDirectoriesSince(directorySet, time) == 2); + + juce::Time::waitForMillisecondCounter(juce::Time::getMillisecondCounter() + 100); + + time = juce::Time::getCurrentTime(); + + REQUIRE(FileHelper::countModifiedFilesInDirectoriesSince(directorySet, time) == 0); + } + + SECTION("Multiple directories, multiple files created at different times") + { + auto tmpDir1 = juce::File::getSpecialLocation(juce::File::SpecialLocationType::tempDirectory) + .getChildFile("temp_" + juce::String::toHexString(juce::Random::getSystemRandom().nextInt())); + + auto tmpDir2 = juce::File::getSpecialLocation(juce::File::SpecialLocationType::tempDirectory) + .getChildFile("temp_" + juce::String::toHexString(juce::Random::getSystemRandom().nextInt())); + + tmpDir1.createDirectory(); + tmpDir2.createDirectory(); + + auto time = juce::Time::getCurrentTime(); + + juce::Time::waitForMillisecondCounter(juce::Time::getMillisecondCounter() + 100); + + tmpDir1.getChildFile("tempFile1.txt").create(); + tmpDir2.getChildFile("tempFile2.txt").create(); + + std::set<juce::File> directorySet = { + tmpDir1, + tmpDir2}; + + REQUIRE(FileHelper::countModifiedFilesInDirectoriesSince(directorySet, time) == 2); + + time = juce::Time::getCurrentTime(); + + juce::Time::waitForMillisecondCounter(juce::Time::getMillisecondCounter() + 100); + + tmpDir1.getChildFile("tempFile3.txt").create(); + + REQUIRE(FileHelper::countModifiedFilesInDirectoriesSince(directorySet, time) == 1); + } + } +} // namespace AK::WwiseTransfer::Test diff --git a/src/test/ImportHelperTest.cpp b/src/test/ImportHelperTest.cpp @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #include "ImportHelperTest.h" namespace AK::WwiseTransfer::Test diff --git a/src/test/ImportHelperTest.h b/src/test/ImportHelperTest.h @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #include "Helpers/ImportHelper.h" #include "Model/IDs.h" #include "Model/Import.h" diff --git a/src/test/Mock.cpp b/src/test/Mock.cpp @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #include <catch2/catch_all.hpp> #include <catch2/catch_test_macros.hpp> #include <catch2/trompeloeil.hpp> diff --git a/src/test/PersistanceHelperTest.cpp b/src/test/PersistanceHelperTest.cpp @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #include "PersistanceHelperTest.h" diff --git a/src/test/PersistanceHelperTest.h b/src/test/PersistanceHelperTest.h @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #include "Helpers/PersistanceHelper.h" #include "Model/Import.h" #include "Model/IDs.h" @@ -74,8 +89,6 @@ namespace AK::WwiseTransfer::Test { REQUIRE(presetData.getTagName() == values.identifier.toString()); REQUIRE(presetData.getStringAttribute(IDs::objectName.toString()) == values.objectName); - REQUIRE(presetData.getStringAttribute(IDs::objectNameValid.toString()) == juce::String(static_cast<int>(values.objectNameValid))); - REQUIRE(presetData.getStringAttribute(IDs::objectNameErrorMessage.toString()) == values.objectNameErrorMsg); REQUIRE(presetData.getStringAttribute(IDs::objectType.toString()) == juce::String(static_cast<int>(values.objectType))); REQUIRE(presetData.getStringAttribute(IDs::propertyTemplatePath.toString()) == values.propertyTemplatePath); REQUIRE(presetData.getStringAttribute(IDs::propertyTemplatePathEnabled.toString()) == juce::String(static_cast<int>(values.propertyTemplatePathEnabled))); @@ -84,6 +97,8 @@ namespace AK::WwiseTransfer::Test inline void testHierarchyMappingPresetRemovedProperties(const juce::XmlElement& presetData) { + REQUIRE(presetData.getStringAttribute(IDs::objectNameValid.toString()).isEmpty()); + REQUIRE(presetData.getStringAttribute(IDs::objectNameErrorMessage.toString()).isEmpty()); REQUIRE(presetData.getStringAttribute(IDs::objectTypeValid.toString()).isEmpty()); REQUIRE(presetData.getStringAttribute(IDs::objectTypeErrorMessage.toString()).isEmpty()); REQUIRE(presetData.getStringAttribute(IDs::propertyTemplatePathValid.toString()).isEmpty()); diff --git a/src/test/ReaperContextTest.cpp b/src/test/ReaperContextTest.cpp @@ -1,4 +1,19 @@ -#include "ReaperContext.h" +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + +#include "ReaperContext.h" #include "Helpers/StringHelper.h" diff --git a/src/test/Test.cpp b/src/test/Test.cpp @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #include "Helpers/WaapiHelper.h" #include "Helpers/WwiseHelper.h" @@ -66,61 +81,6 @@ namespace AK::WwiseTransfer } #pragma endregion WaapiHelperTests -#pragma region WwiseHelperTests - TEST_CASE_METHOD(WwiseHelperTests, "WwiseHelper::pathToPathParts") - { - std::vector<juce::String> paths{ - "\\Actor-Mixer Hierarchy\\Default Work Unit\\object", - "Actor-Mixer Hierarchy\\Default Work Unit\\object\\"}; - - for(auto& path : paths) - { - auto parts = WwiseHelper::pathToPathParts(path); - - REQUIRE(parts.size() == (size_t)3); - REQUIRE(parts[0] == juce::String("Actor-Mixer Hierarchy")); - REQUIRE(parts[1] == juce::String("Default Work Unit")); - REQUIRE(parts[2] == juce::String("object")); - } - } - - TEST_CASE_METHOD(WwiseHelperTests, "WwiseHelper::pathToObjectName") - { - std::vector<std::pair<juce::String, juce::String>> getObjectNameTestCases{ - {"\\Actor-Mixer Hierarchy\\Default Work Unit\\object", "object"}, - {"\\Actor-Mixer Hierarchy\\Default Work Unit\\<SoundSFX>object", "object"}, - }; - - for(auto& testCase : getObjectNameTestCases) - { - REQUIRE(WwiseHelper::pathToObjectName(testCase.first) == testCase.second); - } - } - - TEST_CASE_METHOD(WwiseHelperTests, "WwiseHelper::pathToAncestorPaths") - { - juce::String path = "\\Actor-Mixer Hierarchy\\Default Work Unit\\object"; - - auto ancestors = WwiseHelper::pathToAncestorPaths(path); - - REQUIRE(ancestors.size() == (size_t)2); - REQUIRE(ancestors[0] == juce::String("\\Actor-Mixer Hierarchy")); - REQUIRE(ancestors[1] == juce::String("\\Actor-Mixer Hierarchy\\Default Work Unit")); - } - - TEST_CASE_METHOD(WwiseHelperTests, "WwiseHelper::getCommonAncestor") - { - juce::String path1 = "\\Actor-Mixer Hierarchy\\Default Work Unit\\Container"; - juce::String path2 = "\\Actor-Mixer Hierarchy\\Default Work Unit\\Container\\Object"; - juce::String path3 = "\\Actor-Mixer Hierarchy\\Default Work Unit\\Container2\\Object2"; - juce::String path4 = "\\Default Work Unit"; - - REQUIRE(WwiseHelper::getCommonAncestor(path1, path2) == juce::String("\\Actor-Mixer Hierarchy\\Default Work Unit\\Container")); - REQUIRE(WwiseHelper::getCommonAncestor(path2, path3) == juce::String("\\Actor-Mixer Hierarchy\\Default Work Unit")); - REQUIRE(WwiseHelper::getCommonAncestor(path3, path4) == juce::String("")); - } -#pragma endregion WwiseHelperTests - #pragma region WwiseModelTests TEST_CASE_METHOD(WwiseModelTests, "Wwise::Version") { diff --git a/src/test/WwiseHelperTests.cpp b/src/test/WwiseHelperTests.cpp @@ -1,10 +1,25 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #include "WwiseHelperTests.h" namespace AK::WwiseTransfer::Test { TEST_CASE("objectTypeToReadableString") { - for (const auto& typeStringPair : objectTypeStringMap) + for(const auto& typeStringPair : objectTypeStringMap) { REQUIRE(WwiseHelper::objectTypeToReadableString(typeStringPair.first) == typeStringPair.second); } @@ -12,7 +27,7 @@ namespace AK::WwiseTransfer::Test TEST_CASE("stringToObjectType") { - for (const auto& typeStringPair : objectTypeStringMap) + for(const auto& typeStringPair : objectTypeStringMap) { REQUIRE(WwiseHelper::stringToObjectType(typeStringPair.second) == typeStringPair.first); } @@ -22,7 +37,7 @@ namespace AK::WwiseTransfer::Test { const auto testName = "testObject"; - for (const auto& objectType : objectTypes) + for(const auto& objectType : objectTypes) { auto expectedResult = "\\<" + WwiseHelper::objectTypeToReadableString(objectType) + ">" + testName; REQUIRE(WwiseHelper::buildObjectPathNode(objectType, testName) == expectedResult); @@ -34,7 +49,7 @@ namespace AK::WwiseTransfer::Test const auto testName = "testObject"; const auto expectedResult = "\\testObject"; - for (const auto& objectType : objectTypes) + for(const auto& objectType : objectTypes) { auto buildObjectPath = WwiseHelper::buildObjectPathNode(objectType, testName); REQUIRE(WwiseHelper::pathToPathWithoutObjectTypes(buildObjectPath) == expectedResult); @@ -47,15 +62,14 @@ namespace AK::WwiseTransfer::Test { auto testPath = "\\test\\path\\directory\\multiple"; - REQUIRE(WwiseHelper::pathToPathParts(testPath) == std::vector<juce::String> { "test", "path", "directory", "multiple" }); + REQUIRE(WwiseHelper::pathToPathParts(testPath) == std::vector<juce::String>{"test", "path", "directory", "multiple"}); } SECTION("Wwise Object Type Directory") { auto testPath = "\\<testObject>testName\\path\\directory\\multiple"; - REQUIRE(WwiseHelper::pathToPathParts(testPath) == std::vector<juce::String> { "<testObject>testName", "path", "directory", "multiple" }); + REQUIRE(WwiseHelper::pathToPathParts(testPath) == std::vector<juce::String>{"<testObject>testName", "path", "directory", "multiple"}); } - } TEST_CASE("pathToAncestorPaths") @@ -64,14 +78,14 @@ namespace AK::WwiseTransfer::Test { auto testPath = "\\test\\path\\directory\\multiple"; - REQUIRE(WwiseHelper::pathToAncestorPaths(testPath) == std::vector<juce::String> { "\\test", "\\test\\path", "\\test\\path\\directory" }); + REQUIRE(WwiseHelper::pathToAncestorPaths(testPath) == std::vector<juce::String>{"\\test", "\\test\\path", "\\test\\path\\directory"}); } SECTION("Wwise Object Type Directory") { auto testPath = "\\<testObject>testName\\path\\directory\\multiple"; - REQUIRE(WwiseHelper::pathToAncestorPaths(testPath) == std::vector<juce::String> { "\\<testObject>testName", "\\<testObject>testName\\path", "\\<testObject>testName\\path\\directory" }); + REQUIRE(WwiseHelper::pathToAncestorPaths(testPath) == std::vector<juce::String>{"\\<testObject>testName", "\\<testObject>testName\\path", "\\<testObject>testName\\path\\directory"}); } } @@ -98,7 +112,7 @@ namespace AK::WwiseTransfer::Test SECTION("Wwise::ObjectType") { - for (const auto& objectType : objectTypes) + for(const auto& objectType : objectTypes) { auto buildObjectPath = WwiseHelper::buildObjectPathNode(objectType, testName); @@ -123,13 +137,11 @@ namespace AK::WwiseTransfer::Test auto minor = 10; auto build = 123456; - auto version = Wwise::Version - { + auto version = Wwise::Version{ year, major, minor, - build - }; + build}; auto versionTree = WwiseHelper::versionToValueTree(version); @@ -204,14 +216,14 @@ namespace AK::WwiseTransfer::Test SECTION("Non-Empty") { - languages = { "English", "French", "Ukranian" }; + languages = {"English", "French", "Ukranian"}; auto languageTreeRoot = WwiseHelper::languagesToValueTree(languages); REQUIRE(languageTreeRoot.getNumChildren() == languages.size()); REQUIRE(languageTreeRoot.getType() == IDs::languages); - for (int index = 0; index < languages.size(); index++) + for(int index = 0; index < languages.size(); index++) { REQUIRE(languageTreeRoot.getChild(index).getProperty(IDs::languageName) == languages[index]); REQUIRE(languageTreeRoot.getChild(index).getType() == IDs::language); @@ -232,9 +244,9 @@ namespace AK::WwiseTransfer::Test SECTION("Non-Empty") { - auto languages = std::vector<juce::String>{ "English", "French", "Ukranian" }; + auto languages = std::vector<juce::String>{"English", "French", "Ukranian"}; - for (const auto& language : languages) + for(const auto& language : languages) { auto childValueTree = juce::ValueTree(IDs::language); childValueTree.setProperty(IDs::languageName, language, nullptr); @@ -271,4 +283,31 @@ namespace AK::WwiseTransfer::Test REQUIRE(WwiseHelper::getCommonAncestor(testPath1, testPath2) == ""); } } -} // namespace AK::WwiseTransfer:Test + + TEST_CASE("isPathComplete") + { + SECTION("Complete paths") + { + std::vector<juce::String> completePaths = { + "\\test\\complete\\path", + "\\test\\<Object Type>complete\\<Object Type>path", + }; + + for(const auto& path : completePaths) + REQUIRE(WwiseHelper::isPathComplete(path)); + } + + SECTION("Incomplete paths") + { + std::vector<juce::String> incompletePaths = { + "\\test\\\\path", + "\\test\\<Object Type>\\<Object Type>path", + "\\test\\<Object Type>incomplete\\<Object Type>", + "\\test\\<Object Type>incomplete\\", + }; + + for(const auto& path : incompletePaths) + REQUIRE(!WwiseHelper::isPathComplete(path)); + } + } +} // namespace AK::WwiseTransfer::Test diff --git a/src/test/WwiseHelperTests.h b/src/test/WwiseHelperTests.h @@ -1,3 +1,18 @@ +/*---------------------------------------------------------------------------------------- + +Copyright (c) 2023 AUDIOKINETIC Inc. + +This file is licensed to use under the license available at: +https://github.com/audiokinetic/ReaWwise/blob/main/License.txt (the "License"). +You may not use this file except in compliance with the License. + +Unless required by applicable law or agreed to in writing, software distributed +under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +CONDITIONS OF ANY KIND, either express or implied. See the License for the +specific language governing permissions and limitations under the License. + +----------------------------------------------------------------------------------------*/ + #include "Helpers/WwiseHelper.h" #include "Model/Import.h" @@ -21,7 +36,8 @@ namespace AK::WwiseTransfer::Test {Wwise::ObjectType::VirtualFolder, "Virtual Folder"}, {Wwise::ObjectType::WorkUnit, "Work Unit"}, {Wwise::ObjectType::Sound, "Sound"}, - {Wwise::ObjectType::Unknown, "Unknown"}}; + {Wwise::ObjectType::Unknown, "Unknown"}, + }; std::vector<Wwise::ObjectType> objectTypes{ Wwise::ObjectType::ActorMixer, @@ -36,5 +52,6 @@ namespace AK::WwiseTransfer::Test Wwise::ObjectType::VirtualFolder, Wwise::ObjectType::WorkUnit, Wwise::ObjectType::Sound, - Wwise::ObjectType::Unknown}; + Wwise::ObjectType::Unknown, + }; } // namespace AK::WwiseTransfer::Test
