FS: File description improvements

skyjake · Oct 15, 2017 · af73466 · af73466
1 parent 1c288c8
commit af73466
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/doomsday/sdk/libcore/src/filesys/file.cpp b/doomsday/sdk/libcore/src/filesys/file.cpp
@@ -159,7 +159,11 @@ String File::description(int verbosity) const
     // feed itself (would be redundant).
     if (originFeed() && (verbosity >= 2 || !is<DirectoryFeed>(originFeed())))
     {
-        desc += " from " + originFeed()->description();
+        String const feedDesc = originFeed()->description();
+        if (!desc.contains(feedDesc)) // A bit of a kludge; don't repeat the feed description.
+        {
+            desc += " from " + feedDesc;
+        }
     }
 
 #ifdef DENG2_DEBUG

diff --git a/doomsday/sdk/libcore/src/filesys/remotefeed.cpp b/doomsday/sdk/libcore/src/filesys/remotefeed.cpp
@@ -105,7 +105,7 @@ String RemoteFeed::repository() const
 
 String RemoteFeed::description() const
 {
-    return String("remote file repository \"%1\" (remote root \"%2\")")
+    return String("remote repository \"%1%2\"")
             .arg(d->repository)
             .arg(d->remotePath);
 }