From 6773d593b893162e35cde8d0bd621ae1b72274fa Mon Sep 17 00:00:00 2001
From: artus <artus@landoftheunicorn.hd.free.fr>
Date: Sat, 17 Nov 2018 15:35:21 +0100
Subject: [PATCH] started testing

---
 photograb/test/.test_utils.py.swp | Bin 0 -> 16384 bytes
 photograb/test/__init__.py        |  11 +++
 photograb/test/test_backup.py     |  14 ++++
 photograb/test/test_utils.py      | 111 ++++++++++++++++++++++++++++++
 photograb/utils.py                |  15 ++--
 5 files changed, 143 insertions(+), 8 deletions(-)
 create mode 100644 photograb/test/.test_utils.py.swp
 create mode 100644 photograb/test/__init__.py
 create mode 100644 photograb/test/test_backup.py
 create mode 100644 photograb/test/test_utils.py

diff --git a/photograb/test/.test_utils.py.swp b/photograb/test/.test_utils.py.swp
new file mode 100644
index 0000000000000000000000000000000000000000..cc95eb97ac7e3bb9b84480100257e60dbabc7aea
GIT binary patch
literal 16384
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

literal 0
HcmV?d00001

diff --git a/photograb/test/__init__.py b/photograb/test/__init__.py
new file mode 100644
index 0000000..a81866e
--- /dev/null
+++ b/photograb/test/__init__.py
@@ -0,0 +1,11 @@
+import os
+
+
+def load_tests(loader, std_tests, pattern):
+    pkg_tests = loader.discover(
+            start_dir=os.path.dirname(__file__),
+            pattern="test_*.py"
+            )
+    std_tests.addTests(pkg_tests)
+    return std_tests
+
diff --git a/photograb/test/test_backup.py b/photograb/test/test_backup.py
new file mode 100644
index 0000000..26fd77f
--- /dev/null
+++ b/photograb/test/test_backup.py
@@ -0,0 +1,14 @@
+# -*- coding:utf-8 -*-
+
+import unittest
+
+
+class TestBackup(unittest.TestCase):
+
+    def test_add(self):
+        pass
+
+    def test_list(self):
+        pass
+
+
diff --git a/photograb/test/test_utils.py b/photograb/test/test_utils.py
new file mode 100644
index 0000000..8786203
--- /dev/null
+++ b/photograb/test/test_utils.py
@@ -0,0 +1,111 @@
+# -*- codinf:utf-8 -*-
+
+import os
+import unittest
+from pathlib import Path
+from ..utils import Content, get_content, copy_files, move_files
+
+
+class TestContent(unittest.TestCase):
+
+    _test_files = set(("test1", "test2", "test3"))
+
+    def _get_test_files_paths(self):
+        for f in self._test_files:
+            if f == "test1":
+                yield self.test_subdir / f
+            else:
+                yield self.test_folder / f
+
+    def setUp(self):
+        self.test_folder = Path("./sandbox/")
+        if not self.test_folder.exists():
+            os.mkdir(self.test_folder)
+        self.test_subdir = self.test_folder / "subdir"
+        if not self.test_subdir.exists():
+            os.mkdir(self.test_subdir)
+        for path in self._get_test_files_paths():
+            # Create an empty file
+            open(path, 'w').close()
+
+    def tearDown(self):
+        for path in self._get_test_files_paths():
+            os.remove(path)
+        self.test_subdir.rmdir()
+        self.test_folder.rmdir()
+
+    def test_content_difference(self):
+        first = Content(((1, 0), (2, 0), (3, 0), (4, 0)))
+        second = Content(((1, 0), (3, 0)))
+        result = first.difference(second)
+        self.assertEqual(result, Content(((2, 0), (4, 0))))
+
+    def test_get_content_without_exclude(self):
+        content = get_content(self.test_folder, exclude=None)
+        self.assertEqual(set(content.keys()), self._test_files)
+
+    def test_get_content_with_exclude(self):
+        content = get_content(self.test_folder, exclude="subdir")
+        self.assertEqual(set(content.keys()), set(("test2", "test3")))
+
+
+class TestCopyFile(unittest.TestCase):
+
+    def setUp(self):
+        if not os.path.exists("sandbox"):
+            os.mkdir("sandbox")
+        if not os.path.exists("sandbox/subdir"):
+            os.mkdir("sandbox/subdir")
+        for i in range(3):
+            open(f"sandbox/test_copy_file{i}", "w").close()
+
+    def tearDown(self):
+        for i in range(3):
+            for p in [f"sandbox/test_copy_file{i}",
+                      f"sandbox/subdir/test_copy_file{i}"]:
+                if os.path.exists(p):
+                    os.remove(p)
+        os.removedirs("sandbox/subdir")
+
+    def test_copy_files(self):
+        copy_files(
+            Content(
+                ((f"test_copy_file{i}", Path(f"sandbox/test_copy_file{i}"))
+                    for i in range(3))
+            ),
+            "sandbox/subdir"
+        )
+        for i in range(3):
+            self.assertTrue(os.path.exists(f"sandbox/subdir/test_copy_file{i}"))
+            self.assertTrue(os.path.exists(f"sandbox/test_copy_file{i}"))
+
+
+class TestMoveFiles(unittest.TestCase):
+
+    def setUp(self):
+        if not os.path.exists("sandbox"):
+            os.mkdir("sandbox")
+        if not os.path.exists("sandbox/subdir"):
+            os.mkdir("sandbox/subdir")
+        for i in range(3):
+            open(f"sandbox/test_move_file{i}", "w").close()
+
+    def tearDown(self):
+        for i in range(3):
+            for p in [f"sandbox/test_move_file{i}",
+                      f"sandbox/subdir/test_move_file{i}"]:
+                if os.path.exists(p):
+                    os.remove(p)
+        os.removedirs("sandbox/subdir")
+
+    def test_move_files(self):
+        move_files(
+                Content(
+                    ((f"test_move_file{i}", Path(f"sandbox/test_move_file{i}"))
+                        for i in range(3))
+                ),
+                "sandbox/subdir",
+        )
+        for i in range(3):
+            self.assertTrue(os.path.exists(f"sandbox/subdir/test_move_file{i}"))
+            self.assertFalse(os.path.exists(f"sandbox/test_move_file{i}"))
diff --git a/photograb/utils.py b/photograb/utils.py
index e898269..9c0dca3 100644
--- a/photograb/utils.py
+++ b/photograb/utils.py
@@ -2,15 +2,16 @@
 import itertools
 import os
 import time
-# import shutil
+from pathlib import Path
+import shutil
 
 
 def copy_files(content, target_dir):
     print(f"Copy files to {target_dir} : ", end="")
     count = len(content)
     start_time = time.process_time()
-    # for name,path in content.items():
-    #    shutil.copy(path, target_dir)
+    for name, path in content.items():
+        shutil.copy2(str(path), target_dir)
     elapsed = time.process_time() - start_time
     print(f"{count} in {elapsed:.2f}s.")
 
@@ -19,8 +20,8 @@ def move_files(content, target_dir):
     print(f"Move files to {target_dir} : ", end="")
     count = len(content)
     start_time = time.process_time()
-    # for name, path in content.items():
-    #     shutil.mv(path, target_dir)
+    for name, path in content.items():
+        shutil.move(str(path), target_dir)
     elapsed = time.process_time() - start_time
     print(f"{count} in {elapsed:.2f}s.")
 
@@ -38,12 +39,10 @@ class Content(dict):
 
 
 def get_content(folder, exclude=None):
-    # TODO: exact location of files is lost, but will be used !
-    # Could return a dict{ filename: full_path }
     result = Content()
     for path, _, filenames in os.walk(folder):
         # Ignore excluded folders
-        if path.split("/")[-1] == exclude:
+        if exclude and Path(path).absolute().name == exclude:
             continue
 
         for name in filenames: