Commit e0ee97ae authored by Alberto Miranda's avatar Alberto Miranda ♨️
Browse files

Rename m_namespace_name to m_name_in_namespace

parent 86e4783b
Loading
Loading
Loading
Loading
+8 −0
Original line number Diff line number Diff line
@@ -66,6 +66,14 @@ local_path_to_remote_path_transferor::transfer(
    (void) src;
    (void) dst;

    const auto& d_src = 
        reinterpret_cast<const data::local_path_resource&>(*src);
    const auto& d_dst = 
        reinterpret_cast<const data::remote_path_resource&>(*dst);

    LOGGER_DEBUG("[{}] transfer: {} -> {}", task_info->id(),
            d_src.canonical_path(), d_dst.to_string());

    LOGGER_WARN("Transfer not implemented");

    return std::make_error_code(static_cast<std::errc>(0));
+2 −2
Original line number Diff line number Diff line
@@ -47,14 +47,14 @@ using local_path_resource = resource_impl<resource_type::local_posix_path>;

local_path_resource::resource_impl(const std::shared_ptr<const storage::backend> parent, 
                                   const bfs::path& name) :
    m_namespace_name(name),
    m_name_in_namespace(name),
    m_canonical_path(parent->mount() / name),
    m_is_collection(bfs::is_directory(m_canonical_path)),
    m_parent(std::static_pointer_cast<const storage::posix_filesystem>(std::move(parent))) { }

std::string
local_path_resource::name() const {
    return m_namespace_name.string();
    return m_name_in_namespace.string();
}

resource_type
+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ struct resource_impl<resource_type::local_posix_path> : public resource {

    bfs::path canonical_path() const;

    const bfs::path m_namespace_name; // absolute pathname w.r.t. backend's mount point
    const bfs::path m_name_in_namespace; // absolute pathname w.r.t. backend's mount point
    const bfs::path m_canonical_path; // canonical pathname
    const bool m_is_collection;
    const std::shared_ptr<const storage::posix_filesystem> m_parent;
+4 −2
Original line number Diff line number Diff line
@@ -43,8 +43,10 @@ namespace detail {
// remote alias for convenience
using remote_path_resource = resource_impl<resource_type::remote_posix_path>;

remote_path_resource::resource_impl(const std::shared_ptr<const storage::backend> parent) :
    m_parent(std::static_pointer_cast<const storage::detail::remote_backend>(std::move(parent))) { }
remote_path_resource::resource_impl(
    const std::shared_ptr<const storage::backend> parent)
    : m_parent(std::static_pointer_cast<const storage::detail::remote_backend>(
          std::move(parent))) {}

std::string remote_path_resource::name() const {
    return "PENDING";
+2 −0
Original line number Diff line number Diff line
@@ -55,6 +55,8 @@ struct resource_impl<resource_type::remote_posix_path> : public resource {
    const std::shared_ptr<const storage::backend> parent() const override final;
    std::string to_string() const override final;


    const bfs::path m_name_in_namespace;
    const std::shared_ptr<const storage::detail::remote_backend> m_parent;
};

Loading