pass item data to icon
This commit is contained in:
parent
49ef611bdb
commit
02b89c06dd
2 changed files with 10 additions and 2 deletions
|
@ -1614,8 +1614,15 @@ class Item(models.Model):
|
||||||
cmd += ['-l', timeline]
|
cmd += ['-l', timeline]
|
||||||
if frame:
|
if frame:
|
||||||
cmd += ['-f', frame]
|
cmd += ['-f', frame]
|
||||||
p = subprocess.Popen(cmd, close_fds=True)
|
if settings.ITEM_POSTER_DATA:
|
||||||
p.wait()
|
cmd += '-d', '-'
|
||||||
|
data = self.json()
|
||||||
|
data = utils.normalize_dict('NFC', data)
|
||||||
|
p = subprocess.Popen(cmd, stdin=subprocess.PIPE, close_fds=True)
|
||||||
|
p.communicate(json.dumps(data, default=to_json).encode('utf-8'))
|
||||||
|
else:
|
||||||
|
p = subprocess.Popen(cmd, close_fds=True)
|
||||||
|
p.wait()
|
||||||
# remove cached versions
|
# remove cached versions
|
||||||
icon = os.path.abspath(os.path.join(settings.MEDIA_ROOT, icon))
|
icon = os.path.abspath(os.path.join(settings.MEDIA_ROOT, icon))
|
||||||
for f in glob(icon.replace('.jpg', '*.jpg')):
|
for f in glob(icon.replace('.jpg', '*.jpg')):
|
||||||
|
|
|
@ -264,6 +264,7 @@ SCRIPT_ROOT = normpath(join(PROJECT_ROOT, '..', 'scripts'))
|
||||||
#change script to customize
|
#change script to customize
|
||||||
ITEM_POSTER = join(SCRIPT_ROOT, 'poster.py')
|
ITEM_POSTER = join(SCRIPT_ROOT, 'poster.py')
|
||||||
ITEM_ICON = join(SCRIPT_ROOT, 'item_icon.py')
|
ITEM_ICON = join(SCRIPT_ROOT, 'item_icon.py')
|
||||||
|
ITEM_ICON_DATA = False
|
||||||
LIST_ICON = join(SCRIPT_ROOT, 'list_icon.py')
|
LIST_ICON = join(SCRIPT_ROOT, 'list_icon.py')
|
||||||
COLLECTION_ICON = join(SCRIPT_ROOT, 'list_icon.py')
|
COLLECTION_ICON = join(SCRIPT_ROOT, 'list_icon.py')
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue