This commit is contained in:
Lartza
2020-03-10 22:22:20 +02:00
parent 44c7adae1f
commit b2ced96ba4
15 changed files with 166 additions and 121 deletions

View File

@ -17,15 +17,19 @@ import media.system
log = logging.getLogger("bot")
def url_item_builder(bot, **kwargs):
return URLItem(bot, kwargs['url'])
def url_item_loader(bot, _dict):
return URLItem(bot, "", _dict)
def url_item_id_generator(**kwargs):
return hashlib.md5(kwargs['url'].encode()).hexdigest()
item_builders['url'] = url_item_builder
item_loaders['url'] = url_item_loader
item_id_generators['url'] = url_item_id_generator
@ -97,7 +101,7 @@ class URLItem(BaseItem):
return False
else:
self.ready = "validated"
self.version += 1 # notify wrapper to save me
self.version += 1 # notify wrapper to save me
return True
# Run in a other thread
@ -181,7 +185,7 @@ class URLItem(BaseItem):
"bot: finished downloading url (%s) %s, saved to %s." % (self.title, self.url, self.path))
self.downloading = False
self._read_thumbnail_from_file(base_path + ".jpg")
self.version += 1 # notify wrapper to save me
self.version += 1 # notify wrapper to save me
return True
else:
for f in glob.glob(base_path + "*"):
@ -214,7 +218,6 @@ class URLItem(BaseItem):
return dict
def format_debug_string(self):
return "[url] {title} ({url})".format(
title=self.title,
@ -224,9 +227,9 @@ class URLItem(BaseItem):
def format_song_string(self, user):
if self.ready in ['validated', 'yes']:
return constants.strings("url_item",
title=self.title if self.title else "??",
url=self.url,
user=user)
title=self.title if self.title else "??",
url=self.url,
user=user)
return self.url
def format_current_playing(self, user):
@ -235,7 +238,7 @@ class URLItem(BaseItem):
if self.thumbnail:
thumbnail_html = '<img width="80" src="data:image/jpge;base64,' + \
self.thumbnail + '"/>'
display += "<br />" + thumbnail_html
display += "<br />" + thumbnail_html
return display