Skip to content
Snippets Groups Projects
Commit 8b9cc200 authored by Nicolas Pope's avatar Nicolas Pope
Browse files

Attempt to fix feed unit on windows

parent cc176899
No related branches found
No related tags found
No related merge requests found
Pipeline #29175 failed
...@@ -68,6 +68,7 @@ void URI::_parse(uri_t puri) { ...@@ -68,6 +68,7 @@ void URI::_parse(uri_t puri) {
m_host = "none"; m_host = "none";
m_port = -1; m_port = -1;
m_proto = SCHEME_NONE; m_proto = SCHEME_NONE;
m_base = suri;
m_path = ""; m_path = "";
m_frag = ""; m_frag = "";
} else { } else {
......
...@@ -788,11 +788,11 @@ uint32_t Feed::add(const ftl::URI &uri) { ...@@ -788,11 +788,11 @@ uint32_t Feed::add(const ftl::URI &uri) {
const auto scheme = uri.getScheme(); const auto scheme = uri.getScheme();
const std::string group = uri.getAttribute<std::string>("group"); const std::string group = uri.getAttribute<std::string>("group");
if ((scheme == ftl::URI::SCHEME_OTHER) || // assumes relative path if ((scheme == ftl::URI::SCHEME_OTHER) || (scheme == ftl::URI::SCHEME_NONE) || // assumes relative path
(scheme == ftl::URI::SCHEME_FILE)) { (scheme == ftl::URI::SCHEME_FILE)) {
auto eix = ((scheme == ftl::URI::SCHEME_OTHER) ? uri.getBaseURI() : uri.getPath()).find_last_of('.'); auto eix = ((scheme == ftl::URI::SCHEME_OTHER || scheme == ftl::URI::SCHEME_NONE) ? uri.getBaseURI() : uri.getPath()).find_last_of('.');
auto ext = ((scheme == ftl::URI::SCHEME_OTHER) ? uri.getBaseURI() : uri.getPath()).substr(eix+1); auto ext = ((scheme == ftl::URI::SCHEME_OTHER || scheme == ftl::URI::SCHEME_NONE) ? uri.getBaseURI() : uri.getPath()).substr(eix+1);
if (ext != "ftl") { if (ext != "ftl") {
throw FTL_Error("Bad filename (expects .ftl) : " << uri.getBaseURI()); throw FTL_Error("Bad filename (expects .ftl) : " << uri.getBaseURI());
...@@ -802,7 +802,7 @@ uint32_t Feed::add(const ftl::URI &uri) { ...@@ -802,7 +802,7 @@ uint32_t Feed::add(const ftl::URI &uri) {
auto* fstream = ftl::create<ftl::stream::File> auto* fstream = ftl::create<ftl::stream::File>
(this, std::string("ftlfile-") + std::to_string(file_counter_++)); (this, std::string("ftlfile-") + std::to_string(file_counter_++));
if (scheme == ftl::URI::SCHEME_OTHER) { if (scheme == ftl::URI::SCHEME_OTHER || scheme == ftl::URI::SCHEME_NONE) {
fstream->set("filename", uri.getBaseURI()); fstream->set("filename", uri.getBaseURI());
} }
else { else {
...@@ -952,7 +952,7 @@ uint32_t Feed::add(const ftl::URI &uri) { ...@@ -952,7 +952,7 @@ uint32_t Feed::add(const ftl::URI &uri) {
} }
} }
else{ else{
throw ftl::exception("bad uri"); throw FTL_Error("Bad feed uri: " << uri.getBaseURI());
} }
return -1; return -1;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment