From f394098e6e3e6f886d9d6b44b96671d575dae73b Mon Sep 17 00:00:00 2001
From: emb <>
Date: Mon, 6 Apr 2015 21:32:36 -0500
Subject: [PATCH] Fixing windows/linux paths. Metadb for hyperlists now
 generate.

---
 .../Collection/CollectionInfoBuilder.cpp       |  1 -
 RetroFE/Source/Database/MetadataDatabase.cpp   |  2 +-
 RetroFE/Source/Utility/Utils.cpp               | 18 ++++--------------
 RetroFE/Source/Utility/Utils.h                 |  1 -
 4 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/RetroFE/Source/Collection/CollectionInfoBuilder.cpp b/RetroFE/Source/Collection/CollectionInfoBuilder.cpp
index d3e152d..416a57f 100644
--- a/RetroFE/Source/Collection/CollectionInfoBuilder.cpp
+++ b/RetroFE/Source/Collection/CollectionInfoBuilder.cpp
@@ -275,7 +275,6 @@ bool CollectionInfoBuilder::ImportDirectory(CollectionInfo *info)
     {
         std::string file = dirp->d_name;
 
-        Utils::NormalizeBackSlashes(file);
         size_t position = file.find_last_of(".");
         std::string basename = (std::string::npos == position)? file : file.substr(0, position);
         
diff --git a/RetroFE/Source/Database/MetadataDatabase.cpp b/RetroFE/Source/Database/MetadataDatabase.cpp
index 8c35ebb..4c03ac3 100644
--- a/RetroFE/Source/Database/MetadataDatabase.cpp
+++ b/RetroFE/Source/Database/MetadataDatabase.cpp
@@ -110,7 +110,7 @@ bool MetadataDatabase::ImportDirectory()
 {
     DIR *dp;
     struct dirent *dirp;
-    std::string hyperListPath = Utils::CombinePath(Configuration::GetAbsolutePath() + "meta", "hyperlist");
+    std::string hyperListPath = Utils::CombinePath(Configuration::GetAbsolutePath(), "meta", "hyperlist");
     std::string mameListPath = Utils::CombinePath(Configuration::GetAbsolutePath(), "meta", "mamelist");
 
     dp = opendir(hyperListPath.c_str());
diff --git a/RetroFE/Source/Utility/Utils.cpp b/RetroFE/Source/Utility/Utils.cpp
index ca4417f..6fe7830 100644
--- a/RetroFE/Source/Utility/Utils.cpp
+++ b/RetroFE/Source/Utility/Utils.cpp
@@ -170,11 +170,6 @@ int Utils::ConvertInt(std::string content)
     return retVal;
 }
 
-void Utils::NormalizeBackSlashes(std::string& content)
-{
-    std::replace(content.begin(), content.end(), '\\', '/');
-}
-
 void Utils::ReplaceSlashesWithUnderscores(std::string &content)
 {
     std::replace(content.begin(), content.end(), '\\', '_');
@@ -185,10 +180,9 @@ void Utils::ReplaceSlashesWithUnderscores(std::string &content)
 std::string Utils::GetDirectory(std::string filePath)
 {
 
-    NormalizeBackSlashes(filePath);
     std::string directory = filePath;
 
-    const size_t last_slash_idx = filePath.rfind('/');
+    const size_t last_slash_idx = filePath.rfind(PathSeparator);
     if (std::string::npos != last_slash_idx)
     {
         directory = filePath.substr(0, last_slash_idx);
@@ -199,14 +193,11 @@ std::string Utils::GetDirectory(std::string filePath)
 
 std::string Utils::GetParentDirectory(std::string directory)
 {
-
-    NormalizeBackSlashes(directory);
-
-    size_t last_slash_idx = directory.find_last_of('/');
+    size_t last_slash_idx = directory.find_last_of(PathSeparator);
     if(directory.length() - 1 == last_slash_idx)
     {
         directory = directory.erase(last_slash_idx, directory.length()-1);
-        last_slash_idx = directory.find_last_of('/');
+        last_slash_idx = directory.find_last_of(PathSeparator);
     }
 
     if (std::string::npos != last_slash_idx)
@@ -221,10 +212,9 @@ std::string Utils::GetParentDirectory(std::string directory)
 std::string Utils::GetFileName(std::string filePath)
 {
 
-    NormalizeBackSlashes(filePath);
     std::string filename = filePath;
 
-    const size_t last_slash_idx = filePath.rfind('/');
+    const size_t last_slash_idx = filePath.rfind(PathSeparator);
     if (std::string::npos != last_slash_idx)
     {
         filename = filePath.erase(0, last_slash_idx+1);
diff --git a/RetroFE/Source/Utility/Utils.h b/RetroFE/Source/Utility/Utils.h
index 50bf476..e7a678f 100644
--- a/RetroFE/Source/Utility/Utils.h
+++ b/RetroFE/Source/Utility/Utils.h
@@ -26,7 +26,6 @@ public:
 
     static float ConvertFloat(std::string content);
     static int ConvertInt(std::string content);
-    static void NormalizeBackSlashes(std::string &content);
     static void ReplaceSlashesWithUnderscores(std::string &content);
     static std::string GetDirectory(std::string filePath);
     static std::string GetParentDirectory(std::string filePath);