merge

ofscraper/classes/placeholder.py

@@ -186,18 +186,9 @@ def __init__(self, ele, ext) -> None:
         self._ext = ext
 
     async def init(self):
-<<<<<<< HEAD
         dir = await self.getmediadir()
         file = await self.createfilename()
         self._filepath = paths.truncate(pathlib.Path(dir, file))
-=======
-        self._filepath = paths.truncate(
-            pathlib.Path(
-                await self.getmediadir(),
-                await self.createfilename(),
-            )
-        )
->>>>>>> 4ea84272b579254367eb3be4278df9dc58c2be37
 
     def add_price_variables(self, username):
         modelObj = selector.get_model_fromParsed(username)

ofscraper/commands/check.py

@@ -104,7 +104,6 @@ def process_download_cart():
                         list(media_dict.values())[0],
                     )
                 )
-<<<<<<< HEAD
                 if settings.get_mediatypes() == ["Text"]:
                     textDownloader(post_dict.values(), username=username)
                 elif len(medialist) > 0 and len(settings.get_mediatypes()) > 1:
@@ -128,26 +127,6 @@ def process_download_cart():
                 else:
                     raise Exception("Issue getting download")
 
-=======
-                media = medialist[0]
-                model_id = media.post.model_id
-                username = media.post.username
-                args = read_args.retriveArgs()
-                args.username = set([username])
-                write_args.setArgs(args)
-                selector.all_subs_helper()
-                log.info(
-                    f"Downloading individual media ({media.filename}) to disk for {username}"
-                )
-                operations.table_init_create(model_id=model_id, username=username)
-                values = downloadnormal.process_dicts(
-                    username,
-                    model_id,
-                    [media],
-                )
-                if values == None or values[-1] == 1:
-                    raise Exception("Download is marked as skipped")
->>>>>>> 4ea84272b579254367eb3be4278df9dc58c2be37
                 log.info("Download Finished")
                 app.update_cell(key, "Download_Cart", "[downloaded]")
                 app.update_cell(key, "Downloaded", True)

ofscraper/commands/manual.py

@@ -59,7 +59,6 @@ def get_manual_usernames(media_dict):
 def get_media_from_urls(urls):
     user_name_dict = {}
     media_dict = {}
-<<<<<<< HEAD
     post_dict = {}
     for url in url_helper(urls):
         response = get_info(url)
@@ -99,48 +98,12 @@ def get_media_from_urls(urls):
             post_dict.update(get_post_item(model_id, value, "stories"))
             # special case
     return media_dict, post_dict
-=======
-    with sessionbuilder.sessionBuilder(backend="httpx") as c:
-        for url in url_helper(urls):
-            response = get_info(url)
-            model = response[0]
-            postid = response[1]
-            type = response[2]
-            if type == "post":
-                model_id = user_name_dict.get(model) or profile.get_id(model)
-                value = timeline.get_individual_post(postid, c=c)
-                media_dict.update(get_all_media(postid, model_id, value))
-            elif type == "msg":
-                model_id = model
-                value = messages_.get_individual_post(model_id, postid, c=c)
-                media_dict.update(get_all_media(postid, model_id, value))
-            elif type == "msg2":
-                model_id = user_name_dict.get(model) or profile.get_id(model)
-                value = messages_.get_individual_post(model_id, postid, c=c)
-                media_dict.update(get_all_media(postid, model_id, value))
-            elif type == "unknown":
-                value = unknown_type_helper(postid, c) or {}
-                model_id = value.get("author", {}).get("id")
-                media_dict.update(get_all_media(postid, model_id, value))
-            elif type == "highlights":
-                value = highlights_.get_individual_highlights(postid, c) or {}
-                model_id = value.get("userId")
-                media_dict.update(get_all_media(postid, model_id, value, "highlights"))
-                # special case
-            elif type == "stories":
-                value = highlights_.get_individual_stories(postid, c) or {}
-                model_id = value.get("userId")
-                media_dict.update(get_all_media(postid, model_id, value, "stories"))
-                # special case
-    return media_dict
->>>>>>> 4ea84272b579254367eb3be4278df9dc58c2be37
 
 
 def unknown_type_helper(postid):
     return timeline.get_individual_post(postid)
 
 
-<<<<<<< HEAD
 def get_post_item(model_id, value, inputtype=None):
     if value == None:
         return []
@@ -149,8 +112,6 @@ def get_post_item(model_id, value, inputtype=None):
     return {post.id: post}
 
 
-=======
->>>>>>> 4ea84272b579254367eb3be4278df9dc58c2be37
 def get_all_media(posts_id, model_id, value, inputtype=None):
     media_dict = {}
     value = value or {}
@@ -173,7 +134,6 @@ def get_all_media(posts_id, model_id, value, inputtype=None):
     return media_dict
 
 
-<<<<<<< HEAD
 @run
 async def paid_failback(post_id, model_id, username):
     logging.getLogger("shared").debug(
@@ -194,20 +154,6 @@ async def paid_failback(post_id, model_id, username):
                 output,
             )
         )
-=======
-def paid_failback(post_id, id, username):
-    logging.getLogger("shared").debug(
-        "Using failback search because query return 0 media"
-    )
-    data = of.process_paid_post(id, username)
-    return list(
-        filter(
-            lambda x: isinstance(x, media_.Media)
-            and (str(x.id) == post_id or str(x.postid) == post_id),
-            data,
-        )
-    )
->>>>>>> 4ea84272b579254367eb3be4278df9dc58c2be37
 
 
 def get_info(url):

ofscraper/db/operations.py

@@ -382,19 +382,11 @@ def media_insert_helper(media, filename, downloaded=None, hash=None, prevData=No
     size = None
     if filename and pathlib.Path(filename).exists():
         directory = str(pathlib.Path(filename).parent)
-<<<<<<< HEAD
         filename_path = str(pathlib.Path(filename).name)
         size = math.ceil(pathlib.Path(filename).stat().st_size)
     elif filename:
         directory = str(pathlib.Path(filename).parent)
         filename_path = str(pathlib.Path(filename).name)
-=======
-        filename_path = str(pathlib.Path(filename.name))
-        size = math.ceil(pathlib.Path(filename).stat().st_size)
-    elif filename:
-        directory = str(pathlib.Path(filename).parent)
-        filename_path = str(pathlib.Path(filename.name))
->>>>>>> 4ea84272b579254367eb3be4278df9dc58c2be37
     elif prevData:
         directory = prevData[3]
         filename_path = prevData[4]