From 48dc721f66bacdeab5d39da6f08f874425be42ca Mon Sep 17 00:00:00 2001
From: Nicolas Pope <nwpope@utu.fi>
Date: Thu, 16 Jul 2020 15:34:39 +0300
Subject: [PATCH] Use URI for source name if missing
---
components/streams/src/feed.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/streams/src/feed.cpp b/components/streams/src/feed.cpp
index 4044c9c3b..8ccae3a18 100644
--- a/components/streams/src/feed.cpp
+++ b/components/streams/src/feed.cpp
@@ -521,7 +521,7 @@ std::string Feed::getName(const std::string &puri) {
auto n = net_->findOne<std::string>("get_cfg", puri);
if (n) {
auto j = nlohmann::json::parse(*n);
- return (j.is_structured()) ? j.value("name", j.value("uri", "No Name")) : "No Name";
+ return (j.is_structured()) ? j.value("name", j.value("uri", uri.getPathSegment(-1))) : uri.getPathSegment(-1);
}
} catch (const ftl::exception &e) {
e.ignore();
@@ -540,7 +540,7 @@ std::string Feed::getName(const std::string &puri) {
return getConfig()["recent_files"][uri.getBaseURI()].value("name", "FTLFile");
}
- return "No Name";
+ return uri.getPathSegment(-1);
}
void Feed::add(uint32_t fsid, const std::string &uri, ftl::stream::Stream* stream) {
--
GitLab