diff options
| -rw-r--r-- | lesana/collection.py | 3 | ||||
| -rw-r--r-- | tests/test_collection.py | 24 |
2 files changed, 26 insertions, 1 deletions
diff --git a/lesana/collection.py b/lesana/collection.py index 5b80d3b..d3715d1 100644 --- a/lesana/collection.py +++ b/lesana/collection.py @@ -26,7 +26,8 @@ class Entry(object): self.uid, ext = os.path.splitext(os.path.basename(self.fname)) else: self.uid = uuid.uuid4().hex - self.fname = self.uid + '.yaml' + if not self.fname: + self.fname = self.uid + '.yaml' def __str__(self): label = self.collection.settings.get('entry_label', None) diff --git a/tests/test_collection.py b/tests/test_collection.py index bcd45e7..891a439 100644 --- a/tests/test_collection.py +++ b/tests/test_collection.py @@ -164,6 +164,30 @@ class testEntries(unittest.TestCase): '{uid}: {name}'.format(uid=uid, name='Another item') ) + def test_entry_creation_uid_but_no_filename(self): + fname = '11189ee47ddf4796b718a483b379f976.yaml' + with open(os.path.join(self.basepath, fname)) as fp: + data = ruamel.yaml.safe_load(fp) + data['uid'] = '11189ee47ddf4796b718a483b379f976' + entry = lesana.Entry(self.collection, data=data) + self.assertEqual(entry.fname, fname) + + def test_entry_creation_no_uid_no_filename(self): + fname = '11189ee47ddf4796b718a483b379f976.yaml' + with open(os.path.join(self.basepath, fname)) as fp: + data = ruamel.yaml.safe_load(fp) + entry = lesana.Entry(self.collection, data=data) + self.assertIsNotNone(entry.uid) + self.assertIsNotNone(entry.fname) + + def test_entry_creation_filename_but_no_uid(self): + fname = '11189ee47ddf4796b718a483b379f976.yaml' + uid = '11189ee47ddf4796b718a483b379f976' + with open(os.path.join(self.basepath, fname)) as fp: + data = ruamel.yaml.safe_load(fp) + entry = lesana.Entry(self.collection, data=data, fname=fname) + self.assertEqual(entry.uid, uid) + class testComplexCollection(unittest.TestCase): @classmethod |