fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code cleanup: moving poly/ into xenia/base/

Browse Source
This commit is contained in:
Ben Vanik
2015-05-02 03:42:51 -07:00
parent 99816056be
commit e3220f7ae6
223 changed files with 1758 additions and 1881 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/xenia/kernel/content_manager.cc
View File

@@ -11,7 +11,7 @@
#include <string>
#include "poly/fs.h"
#include "xenia/base/fs.h"
#include "xenia/kernel/xobject.h"
namespace xe {
@@ -70,7 +70,7 @@ std::wstring ContentManager::ResolvePackageRoot(uint32_t content_type) {
// Package root path:
// content_root/title_id/type_name/
auto package_root =
poly::join_paths(root_path_, poly::join_paths(title_id, type_name));
xe::join_paths(root_path_, xe::join_paths(title_id, type_name));
return package_root + L"\\";
}
@@ -79,8 +79,8 @@ std::wstring ContentManager::ResolvePackagePath(const XCONTENT_DATA& data) {
// content_root/title_id/type_name/data_file_name/
auto package_root = ResolvePackageRoot(data.content_type);
auto package_path =
poly::join_paths(package_root, poly::to_wstring(data.file_name));
package_path += poly::path_separator;
xe::join_paths(package_root, xe::to_wstring(data.file_name));
package_path += xe::path_separator;
return package_path;
}
@@ -91,9 +91,9 @@ std::vector<XCONTENT_DATA> ContentManager::ListContent(uint32_t device_id,
// Search path:
// content_root/title_id/type_name/*
auto package_root = ResolvePackageRoot(content_type);
auto file_infos = poly::fs::ListFiles(package_root);
auto file_infos = xe::fs::ListFiles(package_root);
for (const auto& file_info : file_infos) {
if (file_info.type != poly::fs::FileInfo::Type::kDirectory) {
if (file_info.type != xe::fs::FileInfo::Type::kDirectory) {
// Directories only.
continue;
}
@@ -101,7 +101,7 @@ std::vector<XCONTENT_DATA> ContentManager::ListContent(uint32_t device_id,
content_data.device_id = device_id;
content_data.content_type = content_type;
content_data.display_name = file_info.name;
content_data.file_name = poly::to_string(file_info.name);
content_data.file_name = xe::to_string(file_info.name);
result.emplace_back(std::move(content_data));
}
@@ -111,7 +111,7 @@ std::vector<XCONTENT_DATA> ContentManager::ListContent(uint32_t device_id,
std::unique_ptr<ContentPackage> ContentManager::ResolvePackage(
std::string root_name, const XCONTENT_DATA& data) {
auto package_path = ResolvePackagePath(data);
if (!poly::fs::PathExists(package_path)) {
if (!xe::fs::PathExists(package_path)) {
return nullptr;
}
@@ -124,7 +124,7 @@ std::unique_ptr<ContentPackage> ContentManager::ResolvePackage(
bool ContentManager::ContentExists(const XCONTENT_DATA& data) {
auto path = ResolvePackagePath(data);
return poly::fs::PathExists(path);
return xe::fs::PathExists(path);
}
X_RESULT ContentManager::CreateContent(std::string root_name,
@@ -137,12 +137,12 @@ X_RESULT ContentManager::CreateContent(std::string root_name,
}
auto package_path = ResolvePackagePath(data);
if (poly::fs::PathExists(package_path)) {
if (xe::fs::PathExists(package_path)) {
// Exists, must not!
return X_ERROR_ALREADY_EXISTS;
}
if (!poly::fs::CreateFolder(package_path)) {
if (!xe::fs::CreateFolder(package_path)) {
return X_ERROR_ACCESS_DENIED;
}
@@ -164,7 +164,7 @@ X_RESULT ContentManager::OpenContent(std::string root_name,
}
auto package_path = ResolvePackagePath(data);
if (!poly::fs::PathExists(package_path)) {
if (!xe::fs::PathExists(package_path)) {
// Does not exist, must be created.
return X_ERROR_FILE_NOT_FOUND;
}
@@ -197,8 +197,8 @@ X_RESULT ContentManager::GetContentThumbnail(const XCONTENT_DATA& data,
std::vector<uint8_t>* buffer) {
std::lock_guard<std::recursive_mutex> lock(content_mutex_);
auto package_path = ResolvePackagePath(data);
auto thumb_path = poly::join_paths(package_path, kThumbnailFileName);
if (poly::fs::PathExists(thumb_path)) {
auto thumb_path = xe::join_paths(package_path, kThumbnailFileName);
if (xe::fs::PathExists(thumb_path)) {
auto file = _wfopen(thumb_path.c_str(), L"rb");
fseek(file, 0, SEEK_END);
size_t file_len = ftell(file);
@@ -216,8 +216,8 @@ X_RESULT ContentManager::SetContentThumbnail(const XCONTENT_DATA& data,
std::vector<uint8_t> buffer) {
std::lock_guard<std::recursive_mutex> lock(content_mutex_);
auto package_path = ResolvePackagePath(data);
if (poly::fs::PathExists(package_path)) {
auto thumb_path = poly::join_paths(package_path, kThumbnailFileName);
if (xe::fs::PathExists(package_path)) {
auto thumb_path = xe::join_paths(package_path, kThumbnailFileName);
auto file = _wfopen(thumb_path.c_str(), L"wb");
fwrite(buffer.data(), 1, buffer.size(), file);
fclose(file);
@@ -231,8 +231,8 @@ X_RESULT ContentManager::DeleteContent(const XCONTENT_DATA& data) {
std::lock_guard<std::recursive_mutex> lock(content_mutex_);
auto package_path = ResolvePackagePath(data);
if (poly::fs::PathExists(package_path)) {
poly::fs::DeleteFolder(package_path);
if (xe::fs::PathExists(package_path)) {
xe::fs::DeleteFolder(package_path);
return X_ERROR_SUCCESS;
} else {
return X_ERROR_FILE_NOT_FOUND;