TheHamkerCat 5 lat temu
rodzic
commit
5420b28380

+ 6 - 5
wbb/modules/download_upload.py

@@ -7,7 +7,7 @@ from pyrogram.types import Message
 
 
 from wbb import SUDOERS, USERBOT_PREFIX, app2
 from wbb import SUDOERS, USERBOT_PREFIX, app2
 from wbb.core.sections import section
 from wbb.core.sections import section
-from wbb.modules.userbot import add_task, eor, rm_task, tasks
+from wbb.modules.userbot import add_task, eor, rm_task
 from wbb.utils.downloader import download
 from wbb.utils.downloader import download
 from wbb.utils.functions import progress
 from wbb.utils.functions import progress
 
 
@@ -18,8 +18,8 @@ from wbb.utils.functions import progress
 )
 )
 async def download_func(_, message: Message):
 async def download_func(_, message: Message):
     reply = message.reply_to_message
     reply = message.reply_to_message
-    start = task_id = int(time())
-
+    start = time()
+    task_id = int(start)
     if reply:
     if reply:
         m = await eor(message, text="Downloading...")
         m = await eor(message, text="Downloading...")
 
 
@@ -86,8 +86,9 @@ async def upload_func(_, message: Message):
     url_or_path = message.text.split(None, 1)[1]
     url_or_path = message.text.split(None, 1)[1]
 
 
     m = await eor(message, text="Uploading..")
     m = await eor(message, text="Uploading..")
-    start = task_id = int(time())
-
+    start = time()
+    task_id = int(start)
+    
     async def upload_file(path):
     async def upload_file(path):
         task = await add_task(
         task = await add_task(
             message.reply_document,
             message.reply_document,

+ 1 - 1
wbb/utils/downloader.py

@@ -5,7 +5,7 @@ from time import time
 import aiofiles
 import aiofiles
 
 
 from wbb import aiohttpsession as session
 from wbb import aiohttpsession as session
-from wbb.modules.userbot import add_task, rm_task, tasks
+from wbb.modules.userbot import add_task, rm_task
 
 
 
 
 def ensure_status(status_code: int):
 def ensure_status(status_code: int):

+ 8 - 4
wbb/utils/functions.py

@@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 SOFTWARE.
 """
 """
-from asyncio import gather, get_running_loop
+from asyncio import gather
 from datetime import datetime, timedelta
 from datetime import datetime, timedelta
 from io import BytesIO
 from io import BytesIO
 from math import atan2, cos, floor, radians, sin, sqrt
 from math import atan2, cos, floor, radians, sin, sqrt
@@ -37,6 +37,7 @@ import aiohttp
 import speedtest
 import speedtest
 from PIL import Image, ImageDraw, ImageFilter, ImageFont
 from PIL import Image, ImageDraw, ImageFilter, ImageFont
 from pyrogram.types import Message
 from pyrogram.types import Message
+from pyrogram.errors import MessageNotModified
 
 
 from wbb import aiohttpsession as aiosession
 from wbb import aiohttpsession as aiosession
 from wbb.modules.userbot import eor
 from wbb.modules.userbot import eor
@@ -56,8 +57,7 @@ async def progress(
     speed = (current / 1000000) / elapsed  # In MB/s
     speed = (current / 1000000) / elapsed  # In MB/s
     eta = (100 / percentage * elapsed) / 60  # In Minutes
     eta = (100 / percentage * elapsed) / 60  # In Minutes
 
 
-    # Only edit at every 5 seconds
-    if round(elapsed % 5.00) != 0 and current != total:
+    if round(elapsed % 10.00) != 0 and current != total:
         return
         return
 
 
     round_pct = floor(percentage / 10)
     round_pct = floor(percentage / 10)
@@ -71,7 +71,11 @@ async def progress(
 **ETA:** {round(eta, 2)}m
 **ETA:** {round(eta, 2)}m
 **Task ID:** {task_id}
 **Task ID:** {task_id}
 """
 """
-    await eor(message, text=text)
+    try:
+        await eor(message, text=text)
+    except MessageNotModified:
+        print("MessageNotModified: progress func")
+        pass
 
 
 
 
 async def restart(m: Message):
 async def restart(m: Message):