From 13e7d0bf1b9f35f1da1949644d920ef2d391f8d0 Mon Sep 17 00:00:00 2001
From: msramalho <19508417+msramalho@users.noreply.github.com>
Date: Wed, 8 Jun 2022 11:11:09 +0200
Subject: [PATCH] improving path operations

---
 archivers/base_archiver.py     | 8 ++++----
 archivers/telegram_archiver.py | 2 +-
 archivers/telethon_archiver.py | 5 +++--
 archivers/tiktok_archiver.py   | 2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/archivers/base_archiver.py b/archivers/base_archiver.py
index 248d869..d3145e5 100644
--- a/archivers/base_archiver.py
+++ b/archivers/base_archiver.py
@@ -64,7 +64,7 @@ class Archiver(ABC):
         page += f"</body></html>"
 
         page_key = self.get_key(urlparse(url).path.replace("/", "_") + ".html")
-        page_filename = Storage.TMP_FOLDER + page_key
+        page_filename = os.path.join(Storage.TMP_FOLDER, page_key)
         page_cdn = self.storage.get_cdn_url(page_key)
 
         with open(page_filename, "w") as f:
@@ -95,8 +95,8 @@ class Archiver(ABC):
             key = self.get_key(path.replace("/", "_"))
             if '.' not in path:
                 key += '.jpg'
-
-            filename = Storage.TMP_FOLDER + key
+                
+            filename = os.path.join(Storage.TMP_FOLDER, key)
 
             d = requests.get(media_url, headers=headers)
             with open(filename, 'wb') as f:
@@ -140,7 +140,7 @@ class Archiver(ABC):
         logger.debug(f"getting screenshot for {url=}")
         key = self.get_key(urlparse(url).path.replace(
             "/", "_") + datetime.datetime.utcnow().isoformat().replace(" ", "_") + ".png")
-        filename = Storage.TMP_FOLDER + key
+        filename = os.path.join(Storage.TMP_FOLDER, key)
 
         # Accept cookies popup dismiss for ytdlp video
         if 'facebook.com' in url:
diff --git a/archivers/telegram_archiver.py b/archivers/telegram_archiver.py
index 06a8624..22de30e 100644
--- a/archivers/telegram_archiver.py
+++ b/archivers/telegram_archiver.py
@@ -52,7 +52,7 @@ class TelegramArchiver(Archiver):
         video_id = video_url.split('/')[-1].split('?')[0]
         key = self.get_key(video_id)
 
-        filename = Storage.TMP_FOLDER + key
+        filename = os.path.join(Storage.TMP_FOLDER, key)
         cdn_url = self.storage.get_cdn_url(key)
 
         if check_if_exists and self.storage.exists(key):
diff --git a/archivers/telethon_archiver.py b/archivers/telethon_archiver.py
index 09cb47f..74a4ddd 100644
--- a/archivers/telethon_archiver.py
+++ b/archivers/telethon_archiver.py
@@ -79,7 +79,8 @@ class TelethonArchiver(Archiver):
                 message = post.message
                 for mp in media_posts:
                     if len(mp.message) > len(message): message = mp.message
-                    filename = self.client.download_media(mp.media, f'{Storage.TMP_FOLDER}{chat}_{group_id}/{mp.id}')
+                    filename_dest = os.path.join(Storage.TMP_FOLDER, f'{chat}_{group_id}', mp.id)
+                    filename = self.client.download_media(mp.media, filename_dest)
                     key = filename.split(Storage.TMP_FOLDER)[1]
                     self.storage.upload(filename, key)
                     hash = self.get_hash(filename)
@@ -92,7 +93,7 @@ class TelethonArchiver(Archiver):
                 return ArchiveResult(status=status, cdn_url=page_cdn, title=message, timestamp=post.date, hash=page_hash, screenshot=screenshot)
             elif len(media_posts) == 1:
                 key = self.get_key(f'{chat}_{post_id}')
-                filename = self.client.download_media(post.media, f'{Storage.TMP_FOLDER}{key}')
+                filename = self.client.download_media(post.media, os.path.join(Storage.TMP_FOLDER,key))
                 key = filename.split(Storage.TMP_FOLDER)[1].replace(" ", "")
                 self.storage.upload(filename, key)
                 hash = self.get_hash(filename)
diff --git a/archivers/tiktok_archiver.py b/archivers/tiktok_archiver.py
index c132886..0cc8221 100644
--- a/archivers/tiktok_archiver.py
+++ b/archivers/tiktok_archiver.py
@@ -18,7 +18,7 @@ class TiktokArchiver(Archiver):
         try:
             info = tiktok_downloader.info_post(url)
             key = self.get_key(f'{info.id}.mp4')
-            filename = Storage.TMP_FOLDER + key
+            filename = os.path.join(Storage.TMP_FOLDER, key)
             logger.info(f'found video {key=}')
 
             if check_if_exists and self.storage.exists(key):