gdrive and alive small fix

userge/plugins/fun/alive.py

@@ -8,14 +8,20 @@
 
 
 from pyrogram.errors.exceptions import FileIdInvalid, FileReferenceEmpty
+from pyrogram.errors.exceptions.bad_request_400 import BadRequest
 from userge import userge, Message, Config, versions
 
 LOGO_STICKER_ID, LOGO_STICKER_REF = None, None
 
 
+class FileIdNotFound(FileIdInvalid, FileReferenceEmpty, BadRequest):
+    pass
+
+
 @userge.on_cmd("alive", about="__This command is just for fun XD__")
 async def alive(message: Message):
     await message.delete()
+
     try:
         if LOGO_STICKER_ID:
             await sendit(LOGO_STICKER_ID, message)
@@ -24,11 +30,7 @@ async def alive(message: Message):
             await refresh_id()
             await sendit(LOGO_STICKER_ID, message)
 
-    except FileIdInvalid:
-        await refresh_id()
-        await sendit(LOGO_STICKER_ID, message)
-
-    except FileReferenceEmpty:
+    except FileIdNotFound:
         await refresh_id()
         await sendit(LOGO_STICKER_ID, message)
 

userge/plugins/misc/gdrive.py

@@ -30,7 +30,9 @@
 AUTH_FLOW: object = None
 PARENT_ID = ""
 
-OAUTH_SCOPE = "https://www.googleapis.com/auth/drive"
+OAUTH_SCOPE = ["https://www.googleapis.com/auth/drive",
+               "https://www.googleapis.com/auth/drive.file",
+               "https://www.googleapis.com/auth/drive.metadata"]
 REDIRECT_URI = "urn:ietf:wg:oauth:2.0:oob"
 G_DRIVE_DIR_MIME_TYPE = "application/vnd.google-apps.folder"
 G_DRIVE_FILE_LINK = "📄 <a href='https://drive.google.com/open?id={}'>{}</a> __({})__"
@@ -361,7 +363,7 @@ def _upload(self, file_name: str) -> None:
 
         except HttpError as h_e:
             LOG.exception(h_e)
-            self.__output = h_e._get_reason()
+            self.__output = h_e
 
         except ProcessCanceled:
             self.__output = "`Process Canceled!`"
@@ -490,7 +492,7 @@ def _download(self, file_id: str) -> None:
 
         except HttpError as h_e:
             LOG.exception(h_e)
-            self.__output = h_e._get_reason()
+            self.__output = h_e
 
         except ProcessCanceled:
             self.__output = "`Process Canceled!`"
@@ -581,7 +583,7 @@ def _copy(self, file_id: str) -> None:
 
         except HttpError as h_e:
             LOG.exception(h_e)
-            self.__output = h_e._get_reason()
+            self.__output = h_e
 
         except ProcessCanceled:
             self.__output = "`Process Canceled!`"
@@ -911,7 +913,10 @@ async def upload(self) -> None:
             end_t = datetime.now()
             m_s = (end_t - start_t).seconds
 
-            if self._output is not None and not self._is_canceled:
+            if isinstance(self._output, HttpError):
+                out = f"**ERROR** : `{self._output._get_reason()}`"
+
+            elif self._output is not None and not self._is_canceled:
                 out = f"**Uploaded Successfully** __in {m_s} seconds__\n\n{self._output}"
 
             elif self._output is not None and self._is_canceled:
@@ -950,7 +955,10 @@ async def download(self) -> None:
             end_t = datetime.now()
             m_s = (end_t - start_t).seconds
 
-            if self._output is not None and not self._is_canceled:
+            if isinstance(self._output, HttpError):
+                out = f"**ERROR** : `{self._output._get_reason()}`"
+
+            elif self._output is not None and not self._is_canceled:
                 out = f"**Downloaded Successfully** __in {m_s} seconds__\n\n`{self._output}`"
 
             elif self._output is not None and self._is_canceled:
@@ -993,7 +1001,10 @@ async def copy(self) -> None:
             end_t = datetime.now()
             m_s = (end_t - start_t).seconds
 
-            if self._output is not None and not self._is_canceled:
+            if isinstance(self._output, HttpError):
+                out = f"**ERROR** : `{self._output._get_reason()}`"
+
+            elif self._output is not None and not self._is_canceled:
                 out = f"**Copied Successfully** __in {m_s} seconds__\n\n{self._output}"
 
             elif self._output is not None and self._is_canceled:

userge/utils/logger.py

@@ -27,4 +27,5 @@
 
 
 logging.getLogger("pyrogram").setLevel(logging.WARNING)
+logging.getLogger("pyrogram.client.parser.html").setLevel(logging.ERROR)
 logging.getLogger('googleapiclient.discovery').setLevel(logging.WARNING)

userge/versions.py

@@ -14,8 +14,8 @@
 
 __version_mjaor__ = 0
 __version_minor__ = 1
-__version_micro__ = 1
-__version_beta__ = 0
+__version_micro__ = 2
+__version_beta__ = 1
 
 
 __version__ = "{}.{}.{}".format(__version_mjaor__,