fixes #333

Author: jph00

fastcore/xtras.py

@@ -151,11 +151,10 @@ def loads_multi(s:str):
 def untar_dir(fname, dest):
     "untar `file` into `dest`"
     with tempfile.TemporaryDirectory(dir='.') as d:
-        d = Path(d)
-        with open(fname, 'rb') as f:
-            with tarfile.open(mode='r:gz', fileobj=f) as t:
-                t.extractall(d)
-        next(d.iterdir()).rename(dest)
+        shutil.unpack_archive(fname, d)
+        ls = Path(d).ls()
+        if len(ls) == 1: shutil.move(str(ls[0]), dest)
+        else: shutil.move(str(d), dest/remove_suffix(Path(fname).stem, '.tar'))
 
 # Cell
 def repo_details(url):

nbs/03_xtras.ipynb

@@ -618,7 +618,7 @@
     {
      "data": {
       "text/plain": [
-       "['c', 'h', 'f', 'a', 'g', 'd', 'b', 'e']"
+       "['d', 'e', 'h', 'g', 'b', 'a', 'c', 'f']"
       ]
      },
      "execution_count": null,
@@ -1010,11 +1010,60 @@
     "def untar_dir(fname, dest):\n",
     "    \"untar `file` into `dest`\"\n",
     "    with tempfile.TemporaryDirectory(dir='.') as d:\n",
-    "        d = Path(d)\n",
-    "        with open(fname, 'rb') as f:\n",
-    "            with tarfile.open(mode='r:gz', fileobj=f) as t:\n",
-    "                t.extractall(d)\n",
-    "        next(d.iterdir()).rename(dest)"
+    "        shutil.unpack_archive(fname, d)\n",
+    "        ls = Path(d).ls()\n",
+    "        if len(ls) == 1: shutil.move(str(ls[0]), dest)\n",
+    "        else: shutil.move(str(d), dest/remove_suffix(Path(fname).stem, '.tar'))"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "If the contents of `fname` contain just one file or directory, it is placed directly in `dest`:"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "def test_untar(foldername, **kwargs):\n",
+    "    with tempfile.TemporaryDirectory() as d:\n",
+    "        nm = os.path.join(d, 'a')\n",
+    "        shutil.make_archive(nm, 'gztar', **kwargs)\n",
+    "        with tempfile.TemporaryDirectory() as d2:\n",
+    "            d2 = Path(d2)\n",
+    "            untar_dir(nm+'.tar.gz', d2)\n",
+    "            test_eq(d2.ls(), [d2/foldername])"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# using `base_dir` in `make_archive` results in `images` directory included in file names\n",
+    "test_untar('images', base_dir='images')"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "If the contents of `fname` contain multiple files and directories, a new folder in `dest` is created with the same name as `fname` (but without extension):"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# using `root_dir` in `make_archive` results in `images` directory *not* included in file names\n",
+    "test_untar('a', root_dir='images')"
    ]
   },
   {