fixed: convert html entities in HTTPDirectory - fixes wrongly formatt…

…ed titles and/or missing items
xbmc · Dec 2, 2011 · d660bcd · d660bcd
1 parent 2494ce8
commit d660bcd
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/xbmc/filesystem/HTTPDirectory.cpp b/xbmc/filesystem/HTTPDirectory.cpp
@@ -29,6 +29,7 @@
 #include "utils/CharsetConverter.h"
 #include "utils/log.h"
 #include "utils/URIUtils.h"
+#include "utils/HTMLUtil.h"
 #include "climits"
 
 using namespace XFILE;
@@ -76,19 +77,27 @@ bool CHTTPDirectory::GetDirectory(const CStdString& strPath, CFileItemList &item
 
       if (strNameTemp == strLinkTemp)
       {
+        CStdStringW wName, wLink, wConverted;
+
         g_charsetConverter.unknownToUTF8(strName);
+        g_charsetConverter.utf8ToW(strName, wName, false);
+        HTML::CHTMLUtil::ConvertHTMLToW(wName, wConverted);
+        g_charsetConverter.wToUTF8(wConverted, strName);
         URIUtils::RemoveSlashAtEnd(strName);
 
+        g_charsetConverter.unknownToUTF8(strLink);
+        g_charsetConverter.utf8ToW(strLink, wLink, false);
+        HTML::CHTMLUtil::ConvertHTMLToW(wLink, wConverted);
+        g_charsetConverter.wToUTF8(wConverted, strLink);
+
         CFileItemPtr pItem(new CFileItem(strName));
-        pItem->SetPath(strBasePath + strLink);
         pItem->SetProperty("IsHTTPDirectory", true);
+        url.SetFileName(strBasePath + strLink);
+        pItem->SetPath(url.Get());
 
         if(URIUtils::HasSlashAtEnd(pItem->GetPath()))
           pItem->m_bIsFolder = true;
 
-        url.SetFileName(pItem->GetPath());
-        pItem->SetPath(url.Get());
-
         if (!pItem->m_bIsFolder && g_advancedSettings.m_bHTTPDirectoryStatFilesize)
         {
           CFileCurl file;