simplify the implementation a bit

dvc/cache/base.py

@@ -302,22 +302,15 @@ def create_tasks(executor, amount):
                     yield rel_path_infos.pop(task), task.result()
 
     def _transfer_directory(
-        self, from_tree, from_info, out_info, jobs, no_progress_bar=False
+        self, from_tree, from_info, jobs, no_progress_bar=False
     ):
-        if out_info:
-            initials = out_info.parts[-1:]
-        else:
-            initials = ()
-
-        strip_first = bool(initials)
         dir_info = DirInfo()
+
         with Tqdm(total=1, unit="Files", disable=no_progress_bar) as pbar:
             for entry_info, entry_hash in self._transfer_directory_contents(
                 from_tree, from_info, jobs, pbar
             ):
-                dir_info.trie[
-                    initials + entry_info.parts[strip_first:]
-                ] = entry_hash
+                dir_info.trie[entry_info.parts] = entry_hash
 
         local_cache = self.repo.cache.local
         (
@@ -330,21 +323,13 @@ def _transfer_directory(
         self.tree.upload(to_info, self.tree.hash_to_path_info(hash_info.value))
         return hash_info
 
-    def transfer(
-        self,
-        from_tree,
-        from_info,
-        out_info=None,
-        jobs=None,
-        no_progress_bar=False,
-    ):
+    def transfer(self, from_tree, from_info, jobs=None, no_progress_bar=False):
         jobs = jobs or min((from_tree.jobs, self.tree.jobs))
 
         if from_tree.isdir(from_info):
             return self._transfer_directory(
                 from_tree,
                 from_info,
-                out_info=out_info,
                 jobs=jobs,
                 no_progress_bar=no_progress_bar,
             )

dvc/repo/add.py

@@ -153,12 +153,9 @@ def _process_stages(
 
     if to_remote or to_cache:
         # Already verified in the add()
-        assert len(stages) == 1
-        assert len(sub_targets) == 1
-        [stage], [target] = stages, sub_targets
-
-        assert len(stage.outs) == 1
-        [out] = stage.outs
+        (stage,) = stages
+        (target,) = sub_targets
+        (out,) = stage.outs
 
         if to_remote:
             out.hash_info = repo.cloud.transfer(
@@ -171,13 +168,10 @@ def _process_stages(
             from dvc.tree import get_cloud_tree
 
             from_tree = get_cloud_tree(repo, url=target)
-            out.hash_info = repo.cache.local.transfer(
-                from_tree,
-                from_tree.path_info,
-                out_info=out.path_info,
-                jobs=kwargs.get("jobs"),
+            out.hash_info = out.cache.transfer(
+                from_tree, from_tree.path_info, jobs=kwargs.get("jobs"),
             )
-            repo.cache.local.checkout(out.path_info, out.hash_info)
+            out.checkout()
 
         Dvcfile(repo, stage.path).dump(stage)
         return link_failures

tests/func/test_add.py

@@ -1027,18 +1027,18 @@ def test_add_to_remote_invalid_combinations(dvc, invalid_opt, kwargs):
 def test_add_to_cache_dir(tmp_dir, dvc, local_cloud):
     local_cloud.gen({"data": {"foo": "foo", "bar": "bar"}})
 
-    [stage] = dvc.add(local_cloud.url, out="data")
+    [stage] = dvc.add(local_cloud.url + "/data", out="data")
     assert len(stage.deps) == 0
     assert len(stage.outs) == 1
 
     data = tmp_dir / "data"
-    assert data.read_text() == {"data": {"foo": "foo", "bar": "bar"}}
+    assert data.read_text() == {"foo": "foo", "bar": "bar"}
     assert (tmp_dir / "data.dvc").exists()
 
     shutil.rmtree(data)
     status = dvc.checkout(str(data))
     assert status["added"] == ["data" + os.sep]
-    assert data.read_text() == {"data": {"foo": "foo", "bar": "bar"}}
+    assert data.read_text() == {"foo": "foo", "bar": "bar"}
 
 
 def test_add_to_cache_file(tmp_dir, dvc, local_cloud):
@@ -1061,18 +1061,18 @@ def test_add_to_cache_file(tmp_dir, dvc, local_cloud):
 def test_add_to_cache_different_name(tmp_dir, dvc, local_cloud):
     local_cloud.gen({"data": {"foo": "foo", "bar": "bar"}})
 
-    dvc.add(local_cloud.url, out="not_data")
+    dvc.add(local_cloud.url + "/data", out="not_data")
 
     not_data = tmp_dir / "not_data"
-    assert not_data.read_text() == {"not_data": {"foo": "foo", "bar": "bar"}}
+    assert not_data.read_text() == {"foo": "foo", "bar": "bar"}
     assert (tmp_dir / "not_data.dvc").exists()
 
     assert not (tmp_dir / "data").exists()
     assert not (tmp_dir / "data.dvc").exists()
 
     shutil.rmtree(not_data)
     dvc.checkout(str(not_data))
-    assert not_data.read_text() == {"not_data": {"foo": "foo", "bar": "bar"}}
+    assert not_data.read_text() == {"foo": "foo", "bar": "bar"}
     assert not (tmp_dir / "data").exists()
 
 
@@ -1081,12 +1081,12 @@ def test_add_to_cache_not_exists(tmp_dir, dvc, local_cloud):
 
     dest_dir = tmp_dir / "dir" / "that" / "does" / "not" / "exist"
     with pytest.raises(StagePathNotFoundError):
-        dvc.add(local_cloud.url, out=str(dest_dir))
+        dvc.add(local_cloud.url + "/data", out=str(dest_dir))
 
     dest_dir.parent.mkdir(parents=True)
-    dvc.add(local_cloud.url, out=str(dest_dir))
+    dvc.add(local_cloud.url + "/data", out=str(dest_dir))
 
-    assert dest_dir.read_text() == {"exist": {"foo": "foo", "bar": "bar"}}
+    assert dest_dir.read_text() == {"foo": "foo", "bar": "bar"}
     assert dest_dir.with_suffix(".dvc").exists()