Fix bug with ':' in paths in batch mode

althonos · Dec 10, 2017 · 3106893 · 3106893
1 parent 4605f76
commit 3106893
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/instaLooter/batch.py b/instaLooter/batch.py
@@ -90,6 +90,6 @@ def getTargets(self, raw_string):
         if raw_string is not None:
             for line in raw_string.splitlines():
                 if line:
-                    target, directory = line.split(':')
+                    target, directory = line.split(':', 1)
                     targets[target.strip()] = directory.strip()
         return targets
diff --git a/tests/test_issues.py b/tests/test_issues.py
@@ -6,6 +6,7 @@
 import six
 import operator
 import unittest
+import textwrap
 import tempfile
 import shutil
 import glob
@@ -15,7 +16,7 @@
 import PIL.Image
 
 import instaLooter
-
+import instaLooter.batch
 
 
 class TestResolvedIssues(unittest.TestCase):
@@ -308,6 +309,27 @@ def test_issue_94(self):
             os.path.join(self.tmpdir, 'BY77tSfBnRm.jpg'), True)
         self.assertTrue(metadata['Exif']['UserComment'])
 
+    def test_issue_125(self):
+        """
+        Thanks to @applepanda for reporting this bug.
+
+        Make sure colons in path do not cause issue in batch mode.
+        """
+        configfile = six.StringIO(textwrap.dedent(
+            """
+            [Family]
+            users =
+            	instagram: D:\\Instagram\\Profiles\\instagram
+            	therock: D:\\Instagram\\Profiles\\therock
+            """
+        ))
+        runner = instaLooter.batch.BatchRunner(configfile)
+        self.assertEqual(
+            runner.getTargets(runner._get('Family', 'users')),
+            {'instagram': 'D:\\Instagram\\Profiles\\instagram',
+             'therock': 'D:\\Instagram\\Profiles\\therock'}
+        )
+
 
 
 class TestPullRequests(unittest.TestCase):