jsonrpc: fix empty label for files indexed but not in the library

xbmc · Sep 16, 2012 · e520d1d · e520d1d
1 parent 885075a
commit e520d1d
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/xbmc/interfaces/json-rpc/FileOperations.cpp b/xbmc/interfaces/json-rpc/FileOperations.cpp
@@ -280,11 +280,24 @@ bool CFileOperations::FillFileItem(const CFileItemPtr &originalItem, CFileItem &
     else if (media.Equals("music"))
       status = CAudioLibrary::FillFileItem(strFilename, item);
 
-    if (!status)
+    if (status && item.GetLabel().empty())
+    {
+      CStdString label = originalItem->GetLabel();
+      if (label.empty())
+      {
+        bool isDir = CDirectory::Exists(strFilename);
+        label = CUtil::GetTitleFromPath(strFilename, isDir);
+        if (label.empty())
+          label = URIUtils::GetFileName(strFilename);
+      }
+
+      item.SetLabel(label);
+    }
+    else if (!status)
     {
-      bool isDir = CDirectory::Exists(strFilename);
       if (originalItem->GetLabel().empty())
       {
+        bool isDir = CDirectory::Exists(strFilename);
         CStdString label = CUtil::GetTitleFromPath(strFilename, isDir);
         if (label.empty())
           return false;