Merge pull request #1785 from Montellese/custom_nodes_location

custom library node cleanup
xbmc · Nov 16, 2012 · b7c3ce0 · b7c3ce0
2 parents 5ff18cb + 5ad6f11
commit b7c3ce0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/xbmc/filesystem/LibraryDirectory.cpp b/xbmc/filesystem/LibraryDirectory.cpp
@@ -172,7 +172,7 @@ bool CLibraryDirectory::Exists(const char* strPath)
 CStdString CLibraryDirectory::GetNode(const CStdString &path)
 {
   CURL url(path);
-  CStdString libDir = URIUtils::AddFileToFolder(g_settings.GetDatabaseFolder(), url.GetHostName() + "/");
+  CStdString libDir = URIUtils::AddFileToFolder(g_settings.GetLibraryFolder(), url.GetHostName() + "/");
   if (!CDirectory::Exists(libDir))
     libDir = URIUtils::AddFileToFolder("special://xbmc/system/library/", url.GetHostName() + "/");
 

diff --git a/xbmc/settings/Settings.cpp b/xbmc/settings/Settings.cpp
@@ -1746,6 +1746,17 @@ CStdString CSettings::GetBookmarksThumbFolder() const
   return folder;
 }
 
+CStdString CSettings::GetLibraryFolder() const
+{
+  CStdString folder;
+  if (GetCurrentProfile().hasDatabases())
+    URIUtils::AddFileToFolder(GetProfileUserDataFolder(), "library", folder);
+  else
+    URIUtils::AddFileToFolder(GetUserDataFolder(), "library", folder);
+
+  return folder;
+}
+
 CStdString CSettings::GetSourcesFile() const
 {
   CStdString folder;
@@ -1844,6 +1855,7 @@ void CSettings::CreateProfileFolders()
   }
   CDirectory::Create("special://profile/addon_data");
   CDirectory::Create("special://profile/keymaps");
+  CDirectory::Create(GetLibraryFolder());
 }
 
 static CProfile emptyProfile;

diff --git a/xbmc/settings/Settings.h b/xbmc/settings/Settings.h
@@ -342,6 +342,7 @@ class CSettings
   CStdString GetThumbnailsFolder() const;
   CStdString GetVideoThumbFolder() const;
   CStdString GetBookmarksThumbFolder() const;
+  CStdString GetLibraryFolder() const;
   CStdString GetSourcesFile() const;
 
   CStdString GetSettingsFile() const;