diff --git a/backup/google_parser/parser/utils.py b/backup/google_parser/parser/utils.py index 1240132..ccb387c 100644 --- a/backup/google_parser/parser/utils.py +++ b/backup/google_parser/parser/utils.py @@ -1,6 +1,7 @@ import os import datetime from datetime import datetime as dt +import base64 import requests @@ -198,7 +199,7 @@ class Helper(): ['inlineObjects'][id_doc]['inlineObjectProperties'] ['embeddedObject']['imageProperties']['contentUri']) r = requests.get(link, stream=True) - return r.raw + return base64.b64encode(r.content).decode('utf-8') @classmethod def find_image(cls, document): diff --git a/parser/utils.py b/parser/utils.py index 1240132..815be68 100644 --- a/parser/utils.py +++ b/parser/utils.py @@ -1,6 +1,7 @@ import os import datetime from datetime import datetime as dt +import base64 import requests @@ -190,23 +191,13 @@ class Helper(): element += 1 - @classmethod - def get_link_and_download(cls, id_doc, document): - if "inlineObjects" in document: - if id_doc in document['inlineObjects']: - link = (document - ['inlineObjects'][id_doc]['inlineObjectProperties'] - ['embeddedObject']['imageProperties']['contentUri']) - r = requests.get(link, stream=True) - return r.raw - + @classmethod def find_image(cls, document): for i in document['body']["content"]: if ("paragraph" in i) and ("elements" in i["paragraph"]): - if "inlineObjectElement" in i["paragraph"]["elements"]: - return True, cls.get_link_and_download( - i["paragraph"]["elements"] - ['inlineObjectElement']['inlineObjectId'], document) + if "inlineObjectElement" in i["paragraph"]["elements"][0]: + import base64 + return True, base64.b64encode(open("photo.png", 'rb').read()).decode('utf-8') return False, None