mirror of
https://github.com/stashapp/CommunityScripts.git
synced 2026-02-04 20:04:27 -06:00
Adding gallery support and fixes to allow it to work with stash 0.24.
There is a new task to submit galleries and fetch metadata for untagged galleries plus a gallery update hook to update new updates.
This commit is contained in:
Tweeticoats
parent
924a5e3ea5
commit
593760e5d2
@ -17,40 +17,75 @@ def processScene(s):
|
||||
if len(s['stash_ids']) > 0:
|
||||
for sid in s['stash_ids']:
|
||||
# print('looking up markers for stash id: '+sid['stash_id'])
|
||||
res = requests.post('https://timestamp.trade/get-markers/' + sid['stash_id'], json=s)
|
||||
md = res.json()
|
||||
if 'marker' in md:
|
||||
log.info(
|
||||
'api returned something, for scene: ' + s['title'] + ' marker count: ' + str(len(md['marker'])))
|
||||
markers = []
|
||||
for m in md['marker']:
|
||||
# log.debug('-- ' + m['name'] + ", " + str(m['start'] / 1000))
|
||||
marker = {}
|
||||
marker["seconds"] = m['start'] / 1000
|
||||
marker["primary_tag"] = m["tag"]
|
||||
marker["tags"] = []
|
||||
marker["title"] = m['name']
|
||||
markers.append(marker)
|
||||
if len(markers) > 0:
|
||||
log.info('Saving markers')
|
||||
mp.import_scene_markers(stash, markers, s['id'], 15)
|
||||
res = request_s.post('https://timestamp.trade/get-markers/' + sid['stash_id'], json=s)
|
||||
if res.status_code==200:
|
||||
md = res.json()
|
||||
if 'marker' in md:
|
||||
log.info(
|
||||
'api returned something, for scene: ' + s['title'] + ' marker count: ' + str(len(md['marker'])))
|
||||
markers = []
|
||||
for m in md['marker']:
|
||||
# log.debug('-- ' + m['name'] + ", " + str(m['start'] / 1000))
|
||||
marker = {}
|
||||
marker["seconds"] = m['start'] / 1000
|
||||
marker["primary_tag"] = m["tag"]
|
||||
marker["tags"] = []
|
||||
marker["title"] = m['name']
|
||||
markers.append(marker)
|
||||
if len(markers) > 0:
|
||||
log.info('Saving markers')
|
||||
mp.import_scene_markers(stash, markers, s['id'], 15)
|
||||
if 'galleries' in md:
|
||||
log.info(md['galleries'])
|
||||
skip_sync_tag_id = stash.find_tag('[Timestamp: Skip Sync]', create=True).get("id")
|
||||
for g in md['galleries']:
|
||||
for f in g['files']:
|
||||
res=stash.find_galleries(f={"checksum": {"value": f['md5'],"modifier": "EQUALS"},"tags":{"depth":0,"excludes":[skip_sync_tag_id],"modifier":"INCLUDES_ALL","value":[]}})
|
||||
for gal in res:
|
||||
# log.debug('Gallery=%s' %(gal,))
|
||||
gallery={
|
||||
'id':gal['id'],
|
||||
'title':gal['title'],
|
||||
'urls':gal['urls'],
|
||||
'date':gal['date'],
|
||||
'rating100':gal['rating100'],
|
||||
'studio_id':gal['studio']['id'],
|
||||
'performer_ids':[x['id'] for x in gal['performers']],
|
||||
'tag_ids':[x['id'] for x in gal['tags']],
|
||||
'scene_ids':[x['id'] for x in gal['scenes']],
|
||||
'details':gal['details']
|
||||
}
|
||||
if len(gal['urls'])==0:
|
||||
log.debug('no urls on gallery, needs new metadata')
|
||||
gallery['urls'].extend([x['url'] for x in g['urls']])
|
||||
|
||||
if s['id'] not in gallery['scene_ids']:
|
||||
log.debug('attaching scene %s to gallery %s '% (s['id'],gallery['id'],))
|
||||
gallery['scene_ids'].append(s['id'])
|
||||
log.info('updating gallery: %s' % (gal['id'],))
|
||||
stash.update_gallery(gallery_data=gallery)
|
||||
log.debug(res)
|
||||
if 'movies' in md:
|
||||
log.info(md['movies'])
|
||||
|
||||
|
||||
|
||||
def processAll():
|
||||
log.info('Getting scene count')
|
||||
count=stash.find_scenes(f={"stash_id":{"value":"","modifier":"NOT_NULL"},"has_markers":"false"},filter={"per_page": 1},get_count=True)[0]
|
||||
|
||||
count=stash.find_scenes(f={"stash_id_endpoint": { "endpoint": "", "modifier": "NOT_NULL", "stash_id": ""},"has_markers":"false"},filter={"per_page": 1},get_count=True)[0]
|
||||
log.info(str(count)+' scenes to submit.')
|
||||
i=0
|
||||
for r in range(1,int(count/per_page)+1):
|
||||
log.info('fetching data: %s - %s %0.1f%%' % ((r - 1) * per_page,r * per_page,(i/count)*100,))
|
||||
scenes=stash.find_scenes(f={"stash_id":{"value":"","modifier":"NOT_NULL"},"has_markers":"false"},filter={"page":r,"per_page": per_page})
|
||||
scenes=stash.find_scenes(f={"stash_id_endpoint": { "endpoint": "", "modifier": "NOT_NULL", "stash_id": ""},"has_markers":"false"},filter={"page":r,"per_page": per_page})
|
||||
for s in scenes:
|
||||
processScene(s)
|
||||
i=i+1
|
||||
log.progress((i/count))
|
||||
time.sleep(2)
|
||||
time.sleep(1)
|
||||
|
||||
def submit():
|
||||
def submit(f={"has_markers": "true"}):
|
||||
scene_fgmt = """title
|
||||
details
|
||||
url
|
||||
@ -82,12 +117,62 @@ def submit():
|
||||
primary_tag{
|
||||
name
|
||||
}
|
||||
}"""
|
||||
count = stash.find_scenes(f={"has_markers": "true"}, filter={"per_page": 1}, get_count=True)[0]
|
||||
}
|
||||
galleries{
|
||||
title
|
||||
url
|
||||
date
|
||||
details
|
||||
tags{
|
||||
name
|
||||
}
|
||||
|
||||
studio{
|
||||
name
|
||||
stash_ids{
|
||||
endpoint
|
||||
stash_id
|
||||
}
|
||||
}
|
||||
performers{
|
||||
name
|
||||
stash_ids{
|
||||
endpoint
|
||||
stash_id
|
||||
}
|
||||
}
|
||||
|
||||
files{
|
||||
basename
|
||||
size
|
||||
fingerprints{
|
||||
type
|
||||
value
|
||||
}
|
||||
}
|
||||
}
|
||||
movies{
|
||||
movie{
|
||||
name
|
||||
url
|
||||
date
|
||||
director
|
||||
synopsis
|
||||
studio{
|
||||
name
|
||||
stash_ids{
|
||||
endpoint
|
||||
stash_id
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
"""
|
||||
count = stash.find_scenes(f=f, filter={"per_page": 1}, get_count=True,fragment=scene_fgmt)[0]
|
||||
i=0
|
||||
for r in range(1, math.ceil(count/per_page) + 1):
|
||||
log.info('submitting scenes: %s - %s %0.1f%%' % ((r - 1) * per_page,r * per_page,(i/count)*100,))
|
||||
scenes = stash.find_scenes(f={"has_markers": "true"}, filter={"page": r, "per_page": per_page},fragment=scene_fgmt)
|
||||
scenes = stash.find_scenes(f=f, filter={"page": r, "per_page": per_page},fragment=scene_fgmt)
|
||||
for s in scenes:
|
||||
log.debug("submitting scene: " + str(s))
|
||||
request_s.post('https://timestamp.trade/submit-stash', json=s)
|
||||
@ -97,16 +182,215 @@ def submit():
|
||||
|
||||
|
||||
|
||||
def submitGallery():
|
||||
scene_fgmt = """ title
|
||||
url
|
||||
date
|
||||
details
|
||||
tags{
|
||||
name
|
||||
}
|
||||
studio{
|
||||
name
|
||||
stash_ids{
|
||||
endpoint
|
||||
stash_id
|
||||
}
|
||||
}
|
||||
performers{
|
||||
name
|
||||
stash_ids{
|
||||
endpoint
|
||||
stash_id
|
||||
}
|
||||
}
|
||||
|
||||
files{
|
||||
basename
|
||||
size
|
||||
fingerprints{
|
||||
type
|
||||
value
|
||||
}
|
||||
}
|
||||
scenes{
|
||||
title
|
||||
details
|
||||
url
|
||||
date
|
||||
performers{
|
||||
name
|
||||
stash_ids{
|
||||
endpoint
|
||||
stash_id
|
||||
}
|
||||
}
|
||||
tags{
|
||||
name
|
||||
}
|
||||
studio{
|
||||
name
|
||||
stash_ids{
|
||||
endpoint
|
||||
stash_id
|
||||
}
|
||||
}
|
||||
stash_ids{
|
||||
endpoint
|
||||
stash_id
|
||||
}
|
||||
}"""
|
||||
|
||||
count=stash.find_galleries(f={"url": {"value": "","modifier": "NOT_NULL"}},filter={"per_page": 1},get_count=True, fragment=scene_fgmt)[0]
|
||||
log.debug(count)
|
||||
i = 0
|
||||
for r in range(1, math.ceil(count / per_page) + 1):
|
||||
log.info('submitting gallery: %s - %s %0.1f%%' % ((r - 1) * per_page, r * per_page, (i / count) * 100,))
|
||||
galleries = stash.find_galleries(f={"url": {"value": "", "modifier": "NOT_NULL"}}, filter={"page": r, "per_page": per_page,'sort': 'created_at', 'direction': 'DESC'}, fragment=scene_fgmt)
|
||||
for g in galleries:
|
||||
log.debug("submitting gallery: %s" %(g,))
|
||||
request_s.post('https://timestamp.trade/submit-stash-gallery', json=g)
|
||||
i = i + 1
|
||||
log.progress((i / count))
|
||||
time.sleep(2)
|
||||
|
||||
def processGalleries():
|
||||
skip_sync_tag_id = stash.find_tag('[Timestamp: Skip Sync]', create=True).get("id")
|
||||
|
||||
count=get_count = stash.find_galleries(f={"url": {"value": "", "modifier": "IS_NULL"},
|
||||
"tags": {"depth": 0, "excludes": [skip_sync_tag_id], "modifier": "INCLUDES_ALL",
|
||||
"value": []}},filter={"per_page": 1},get_count=True)[0]
|
||||
tag_cache={}
|
||||
|
||||
log.info('count %s '% (count,))
|
||||
i=0
|
||||
for r in range(1, math.ceil(count/per_page) + 1):
|
||||
log.info('processing gallery scenes: %s - %s %0.1f%%' % ((r - 1) * per_page,r * per_page,(i/count)*100,))
|
||||
galleries = stash.find_galleries(f={"url": {"value": "", "modifier": "IS_NULL"},
|
||||
"tags": {"depth": 0, "excludes": [skip_sync_tag_id], "modifier": "INCLUDES_ALL",
|
||||
"value": []}},
|
||||
filter={"page": r, "per_page": 20,'sort': 'created_at', 'direction': 'DESC'})
|
||||
for gal in galleries:
|
||||
processGallery(gal)
|
||||
def processGallery(gallery):
|
||||
# ignore galleries with a url
|
||||
if len(gallery['urls']) ==0:
|
||||
for f in gallery['files']:
|
||||
for fp in f['fingerprints']:
|
||||
if fp['type']=='md5':
|
||||
log.debug('looking up galleries by file hash: %s ' % (fp['value'],))
|
||||
res = request_s.post('https://timestamp.trade/gallery-md5/' + fp['value'])
|
||||
if res.status_code == 200:
|
||||
for g in res.json():
|
||||
log.debug('stash gallery=%s' % (gallery,))
|
||||
log.debug('tt gallery=%s' % (g,))
|
||||
|
||||
new_gallery={
|
||||
'id':gallery['id'],
|
||||
'title':g['title'],
|
||||
'urls':[x['url'] for x in g['urls']],
|
||||
'date':g['release_date'],
|
||||
'rating100':gallery['rating100'],
|
||||
'studio_id':None,
|
||||
'performer_ids':[],
|
||||
'tag_ids':[],
|
||||
'scene_ids':[],
|
||||
'details':g['description']
|
||||
}
|
||||
for p in g['performers']:
|
||||
performer_id=None
|
||||
# try looking up stashid
|
||||
for sid in p['stash_ids']:
|
||||
performers=stash.find_performers(f={"stash_id_endpoint": {"endpoint": sid['endpoint'],"stash_id": sid['stash_id'],"modifier": "EQUALS"}})
|
||||
if len(performers) >0:
|
||||
performer_id=performers[0]['id']
|
||||
log.debug('performer matched %s' % (performer_id,))
|
||||
break
|
||||
# look for the performer
|
||||
if not performer_id:
|
||||
performers=stash.find_performers(q=p['name'])
|
||||
for perf in performers:
|
||||
if p['name'].lower() ==perf['name'].lower():
|
||||
performer_id=perf['id']
|
||||
for pa in perf['alias_list']:
|
||||
if p['name'].lower()==pa.lower():
|
||||
performer_id=perf['id']
|
||||
log.debug('match alias')
|
||||
|
||||
# performer does not exist, create the performer
|
||||
if not performer_id:
|
||||
log.info('performer %s does not exist, creating' % (p['name'],))
|
||||
new_perf=stash.create_performer(performer_in={'name':p['name'],'stash_ids':p['stash_ids']})
|
||||
performer_id=new_perf['id']
|
||||
log.debug(new_perf)
|
||||
new_gallery['performer_ids'].append(performer_id)
|
||||
log.debug(performer_id)
|
||||
|
||||
for tag in g['tags']:
|
||||
new_gallery['tag_ids'].append(stash.find_tag(tag['name'], create=True).get("id"))
|
||||
for sid in g['studio']['stash_ids']:
|
||||
stud=stash.find_studios(f={"stash_id_endpoint": {"endpoint": sid['endpoint'],"stash_id": sid['stash_id'],"modifier": "EQUALS"}})
|
||||
if len(stud) >0:
|
||||
new_gallery['studio_id']=stud[0]['id']
|
||||
break
|
||||
if new_gallery['studio_id'] is None:
|
||||
stud=stash.find_studios(q=g['studio']['name'])
|
||||
for s in stud:
|
||||
if s['name'].lower() == g['studio']['name'].lower():
|
||||
new_gallery['studio_id'] = s['id']
|
||||
break
|
||||
for sa in s['aliases']:
|
||||
if sa['name'].lower() == g['studio']['name'].lower():
|
||||
new_gallery['studio_id'] = s['id']
|
||||
break
|
||||
|
||||
log.debug(new_gallery)
|
||||
|
||||
|
||||
stash.update_gallery(gallery_data=new_gallery)
|
||||
time.sleep(1)
|
||||
|
||||
else:
|
||||
log.debug('bad response from api')
|
||||
time.sleep(10)
|
||||
|
||||
|
||||
def getImages(gallery_id):
|
||||
images=[]
|
||||
res=stash.find_images(f={ "galleries": {"value": [gallery_id],"modifier": "INCLUDES_ALL"}})
|
||||
for r in res:
|
||||
print(r)
|
||||
img={'title':r['title'],"filename":r['visual_files'][0]['basename'],'size':r['visual_files'][0]['size'],'width':r['visual_files'][0]['width'],'height':r['visual_files'][0]['height'],'md5':r['visual_files'][0]['fingerprints'][0]['value']}
|
||||
images.append(img)
|
||||
print(img)
|
||||
print(images)
|
||||
|
||||
json_input = json.loads(sys.stdin.read())
|
||||
|
||||
FRAGMENT_SERVER = json_input["server_connection"]
|
||||
stash = StashInterface(FRAGMENT_SERVER)
|
||||
if 'mode' in json_input['args']:
|
||||
PLUGIN_ARGS = json_input['args']["mode"]
|
||||
if 'submit' in PLUGIN_ARGS:
|
||||
if 'submitScene' in PLUGIN_ARGS:
|
||||
submit()
|
||||
elif 'process' in PLUGIN_ARGS:
|
||||
elif 'submitGallery' in PLUGIN_ARGS:
|
||||
submitGallery()
|
||||
elif 'processGallery' in PLUGIN_ARGS:
|
||||
processGalleries()
|
||||
elif 'processScene' in PLUGIN_ARGS:
|
||||
processAll()
|
||||
elif '2tmp' in PLUGIN_ARGS:
|
||||
submit(f={"url": {"modifier": "INCLUDES","value": "sexlikereal.com"}})
|
||||
elif 'tmp' in PLUGIN_ARGS:
|
||||
tmp=getImages(gallery_id=5904)
|
||||
print(tmp)
|
||||
|
||||
elif 'hookContext' in json_input['args']:
|
||||
id=json_input['args']['hookContext']['id']
|
||||
scene=stash.find_scene(id)
|
||||
processScene(scene)
|
||||
if json_input['args']['hookContext']['type']=='Scene.Update.Post':
|
||||
scene=stash.find_scene(id)
|
||||
processScene(scene)
|
||||
if json_input['args']['hookContext']['type']=='Gallery.Update.Post':
|
||||
gallery=stash.find_gallery(id)
|
||||
processGallery(gallery)
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
name: Timestamp Trade
|
||||
description: Sync Markers with timestamp.trade, a new database for sharing markers.
|
||||
version: 0.1
|
||||
version: 0.4
|
||||
url: https://github.com/stashapp/CommunityScripts/
|
||||
exec:
|
||||
- python
|
||||
@ -11,12 +11,25 @@ hooks:
|
||||
description: Makes Markers checking against timestamp.trade
|
||||
triggeredBy:
|
||||
- Scene.Update.Post
|
||||
- name: Gallery lookup
|
||||
description: Look up gallery metadata from timestamp.trade
|
||||
triggeredBy:
|
||||
- Gallery.Create.Post
|
||||
|
||||
tasks:
|
||||
- name: 'Submit'
|
||||
description: Submit markers to timestamp.trade
|
||||
defaultArgs:
|
||||
mode: submit
|
||||
mode: submitScene
|
||||
- name: 'Sync'
|
||||
description: Get markers for all scenes with a stashid
|
||||
defaultArgs:
|
||||
mode: process
|
||||
mode: processScene
|
||||
- name: 'Submit Gallery'
|
||||
description: Submit gallery info to timestamp.trade
|
||||
defaultArgs:
|
||||
mode: submitGallery
|
||||
- name: 'Sync Gallery'
|
||||
description: get gallery info from timestamp.trade
|
||||
defaultArgs:
|
||||
mode: processGallery
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user