Mirrors/gallery-dl
1
0
Fork 0
mirror of https://github.com/mikf/gallery-dl.git synced 2024-11-22 02:32:33 +01:00
Code Issues Releases Wiki Activity

[postprocessor:metadata] fix traversing more than 1 level deep

Browse Source 
for mode 'modify' and 'delete'
This commit is contained in:
Mike Fährmann 2023-04-25 14:17:25 +02:00
parent 5297ee0cd9
commit 7459e4abce
No known key found for this signature in database
GPG Key ID: 5680CA389D365A88
2 changed files with 43 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gallery_dl/postprocessor/metadata.py
View File

@ -124,10 +124,8 @@ class MetadataPP(PostProcessor):
for key, func in self.fields.items():
obj = kwdict
try:
while "[" in key:
name, _, key = key.partition("[")
obj = obj[name]
key = key.rstrip("]")
if "[" in key:
obj, key = _traverse(obj, key)
obj[key] = func(kwdict)
except Exception:
pass
@ -137,10 +135,8 @@ class MetadataPP(PostProcessor):
for key in self.fields:
obj = kwdict
try:
while "[" in key:
name, _, key = key.partition("[")
obj = obj[name]
key = key.rstrip("]")
if "[" in key:
obj, key = _traverse(obj, key)
del obj[key]
except Exception:
pass
@ -214,4 +210,15 @@ class MetadataPP(PostProcessor):
)
def _traverse(obj, key):
name, _, key = key.partition("[")
obj = obj[name]
while "[" in key:
name, _, key = key.partition("[")
obj = obj[name.rstrip("]")]
return obj, key.strip("]")
__postprocessor__ = MetadataPP

46
test/test_postprocessor.py
View File

@ -392,47 +392,57 @@ class MetadataTest(BasePostprocessorTest):
self._create({
"mode": "modify",
"fields": {
"foo" : "{filename}-{foo!s}",
"foo2" : "\fE bar['bax'] + 122",
"bar[baz]": "{_now}",
"bar[ba2]": "test",
"foo" : "{filename}-{foo!s}",
"foo2" : "\fE bar['bax'] + 122",
"bar[baz]" : "{_now}",
"bar[ba2]" : "\fE {}",
"bar[ba2][a]": "test",
},
}, kwdict)
pdict = self.pathfmt.kwdict
pdict = self.pathfmt.kwdict
self.assertIsNot(kwdict, pdict)
self.assertEqual(pdict["foo"], kwdict["foo"])
self.assertEqual(pdict["bar"], kwdict["bar"])
self._trigger()
self.assertEqual(pdict["foo"] , "file-0")
self.assertEqual(pdict["foo2"] , 123)
self.assertEqual(pdict["bar"]["ba2"], "test")
self.assertEqual(pdict["foo"] , "file-0")
self.assertEqual(pdict["foo2"], 123)
self.assertEqual(pdict["bar"]["ba2"]["a"], "test")
self.assertIsInstance(pdict["bar"]["baz"], datetime)
def test_metadata_delete(self):
kwdict = {"foo": 0, "bar": {"bax": 1, "bay": 2, "baz": 3}}
self._create({"mode": "delete", "fields": ["foo", "bar[baz]"]}, kwdict)
pdict = self.pathfmt.kwdict
kwdict = {
"foo": 0,
"bar": {
"bax": 1,
"bay": 2,
"baz": {"a": 3, "b": 4},
},
}
self._create({
"mode": "delete",
"fields": ["foo", "bar[bax]", "bar[baz][a]"],
}, kwdict)
pdict = self.pathfmt.kwdict
self.assertIsNot(kwdict, pdict)
self.assertEqual(pdict["foo"], kwdict["foo"])
self.assertEqual(pdict["bar"], kwdict["bar"])
del kwdict["foo"]
del kwdict["bar"]["baz"]
self._trigger()
self.assertNotIn("foo", pdict)
self.assertNotIn("baz", pdict["bar"])
self.assertEqual(kwdict["bar"], pdict["bar"])
self.assertNotIn("bax", pdict["bar"])
self.assertNotIn("a", pdict["bar"]["baz"])
# no errors for deleted/undefined fields
self._trigger()
self.assertNotIn("foo", pdict)
self.assertNotIn("baz", pdict["bar"])
self.assertEqual(kwdict["bar"], pdict["bar"])
self.assertNotIn("bax", pdict["bar"])
self.assertNotIn("a", pdict["bar"]["baz"])
def test_metadata_option_skip(self):
self._create({"skip": True})