Additional fixes

Signed-off-by: Michael Carroll <[email protected]>

src/ClientConfig.cc

@@ -83,7 +83,7 @@ class gz::fuel_tools::ServerConfigPrivate
           }
 
   /// \brief URL to reach server
-  public: common::URI url{"https://fuel.gazebosim.org"};
+  public: common::URI url{"https://fuel.gazebosim.org", true};
 
   /// \brief A key to auth with the server
   public: std::string key = "";

src/FuelClient.cc

@@ -713,7 +713,9 @@ Result FuelClient::DownloadModel(const ModelIdentifier &_id,
   // Save
   // Note that the save function doesn't return the path
   if (zipData.empty() || !this->dataPtr->cache->SaveModel(newId, zipData, true))
+  {
     return Result(ResultType::FETCH_ERROR);
+  }
 
   return this->ModelDependencies(_id, _dependencies);
 }
@@ -1236,7 +1238,11 @@ bool FuelClient::ParseModelFileUrl(const common::URI &_modelFileUrl,
   }
 
   // Get remaining server information from config
-  _id.Server().SetUrl(common::URI(scheme + "://" + server));
+  common::URI serverUri;
+  serverUri.SetScheme(scheme);
+  serverUri.SetAuthority(gz::common::URIAuthority("//" + server));
+
+  _id.Server().SetUrl(serverUri);
   _id.Server().SetVersion(apiVersion);
   for (const auto &s : this->dataPtr->config.Servers())
   {
@@ -1305,7 +1311,11 @@ bool FuelClient::ParseWorldFileUrl(const common::URI &_worldFileUrl,
   }
 
   // Get remaining server information from config
-  _id.Server().SetUrl(common::URI(scheme + "://" + server));
+  common::URI serverUri;
+  serverUri.SetScheme(scheme);
+  serverUri.SetAuthority(gz::common::URIAuthority("//" + server));
+
+  _id.Server().SetUrl(serverUri);
   _id.Server().SetVersion(apiVersion);
   for (const auto &s : this->dataPtr->config.Servers())
   {
@@ -1372,7 +1382,11 @@ bool FuelClient::ParseCollectionUrl(const common::URI &_url,
   }
 
   // Get remaining server information from config
-  _id.Server().SetUrl(common::URI(scheme + "://" + server));
+  common::URI serverUri;
+  serverUri.SetScheme(scheme);
+  serverUri.SetAuthority(gz::common::URIAuthority("//" + server));
+
+  _id.Server().SetUrl(serverUri);
   _id.Server().SetVersion(apiVersion);
   for (const auto &s : this->dataPtr->config.Servers())
   {

src/FuelClient_TEST.cc

@@ -131,6 +131,11 @@ class FuelClientTest: public ::testing::Test
     ASSERT_FALSE(common::exists("test_cache"));
     ASSERT_TRUE(common::createDirectories("test_cache"));
     ASSERT_TRUE(common::isDirectory("test_cache"));
+
+    ASSERT_FALSE(common::exists("test_cache/fuel.gazebosim.org"));
+    ASSERT_TRUE(common::createDirectories("test_cache/fuel.gazebosim.org"));
+    ASSERT_TRUE(common::isDirectory("test_cache/fuel.gazebosim.org"));
+
   }
 
   public: std::shared_ptr<gz::common::TempDirectory> tempDir;
@@ -1167,7 +1172,7 @@ TEST_F(FuelClientTest, CachedWorld)
 
   // Cached world (no version)
   {
-    common::URI url{"http://localhost:8007/1.0/banana/worlds/My World"};
+    common::URI url{"http://localhost:8007/1.0/banana/worlds/My World", true};
     std::string path;
     auto result = client.CachedWorld(url, path);
     EXPECT_TRUE(result);
@@ -1178,7 +1183,7 @@ TEST_F(FuelClientTest, CachedWorld)
 
   // Cached world (tip)
   {
-    common::URI url{"http://localhost:8007/1.0/banana/worlds/My World/tip"};
+    common::URI url{"http://localhost:8007/1.0/banana/worlds/My World/tip", true};
     std::string path;
     auto result = client.CachedWorld(url, path);
     EXPECT_TRUE(result);
@@ -1189,7 +1194,7 @@ TEST_F(FuelClientTest, CachedWorld)
 
   // Cached world (version number)
   {
-    common::URI url{"http://localhost:8007/1.0/banana/worlds/My World/2"};
+    common::URI url{"http://localhost:8007/1.0/banana/worlds/My World/2", true};
     std::string path;
     auto result = client.CachedWorld(url, path);
     EXPECT_TRUE(result);
@@ -1201,7 +1206,7 @@ TEST_F(FuelClientTest, CachedWorld)
   // Cached world file (tip)
   {
     common::URI url{"http://localhost:8007/1.0/banana/worlds/My World/tip/"
-                    "files/strawberry.world"};
+                    "files/strawberry.world", true};
     std::string path;
     auto result = client.CachedWorldFile(url, path);
     EXPECT_TRUE(result);

src/LocalCache.cc

@@ -392,8 +392,9 @@ bool LocalCache::SaveModel(
 
   std::string cacheLocation = this->dataPtr->config->CacheLocation();
 
-  std::string modelRootDir = common::joinPaths(cacheLocation,
-      uriToPath(_id.Server().Url()), _id.Owner(), "models", _id.Name());
+  std::string modelRootDir =
+    common::joinPaths(cacheLocation, _id.UniqueName());
+
   std::string modelVersionedDir =
     common::joinPaths(modelRootDir, _id.VersionStr());
 
@@ -744,10 +745,13 @@ bool LocalCache::SaveWorld(
     return false;
   }
 
-  auto cacheLocation = this->dataPtr->config->CacheLocation();
+  std::string cacheLocation = this->dataPtr->config->CacheLocation();
+
+  std::string worldRootDir =
+    common::joinPaths(cacheLocation, _id.UniqueName());
 
-  auto worldRootDir = common::joinPaths(cacheLocation, _id.UniqueName());
-  auto worldVersionedDir = common::joinPaths(worldRootDir, _id.VersionStr());
+  std::string worldVersionedDir =
+    common::joinPaths(worldRootDir , _id.VersionStr());
 
   // Is it already in the cache?
   if (common::isDirectory(worldVersionedDir) && !_overwrite)

src/ModelIdentifier.cc

@@ -149,7 +149,7 @@ ModelIdentifier::~ModelIdentifier()
 //////////////////////////////////////////////////
 std::string ModelIdentifier::UniqueName() const
 {
-  return common::joinPaths(this->dataPtr->server.Url().Str(),
+  return common::joinPaths(uriToPath(this->dataPtr->server.Url()),
                            this->dataPtr->owner, "models",
                            this->dataPtr->name);
 }

src/WorldIdentifier.cc

@@ -80,7 +80,7 @@ WorldIdentifier::~WorldIdentifier()
 //////////////////////////////////////////////////
 std::string WorldIdentifier::UniqueName() const
 {
-  return common::joinPaths(this->dataPtr->server.Url().Str(),
+  return common::joinPaths(uriToPath(this->dataPtr->server.Url()),
                            this->dataPtr->owner,
                            "worlds",
                            this->dataPtr->name);