From 94ef700e1c6115ba0deacfbb86c976087aff2dea Mon Sep 17 00:00:00 2001
From: Llloooggg <poddeo3@gmail.com>
Date: Wed, 29 Apr 2020 00:35:06 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=BB=D1=83=D1=87=D1=88=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=BA=D0=BE=D0=B4=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 __init__.py | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/__init__.py b/__init__.py
index 1c3e58a..901c13d 100755
--- a/__init__.py
+++ b/__init__.py
@@ -63,11 +63,8 @@ if __name__ == '__main__':
 
     subUrls = url_grab(url)
 
-    speed = input(datetime.now().strftime(
-        '[%X] ') + 'Введите скорость запросов(з/с) или оставьте пустым для максимальной: ')
-    requestCount = int(input(datetime.now().strftime(
-        '[%X] ') + 'Введите число запросов: '))
-    print()
+    speed = input(f'{datetime.now().strftime("[%X]")} Введите скорость запросов(з/с) или оставьте пустым для максимальной: ')
+    requestCount = int(input(f'{datetime.now().strftime("[%X]")} Введите число запросов: '))
 
     requestCountExecuted = 0
     requestCountSuccess = 0
@@ -75,7 +72,7 @@ if __name__ == '__main__':
     with progressbar.ProgressBar(max_value=requestCount) as bar:
         startTime = time.time()
         if speed:
-            speed = int(speed)
+            speed = float(speed)
             for i in range(requestCount):
                 delayStartTime = time.time()
                 curUrl = random.choice(subUrls)
@@ -83,8 +80,8 @@ if __name__ == '__main__':
                 thread.start()
                 thread.join()
                 bar.update(requestCountExecuted)
-                if time.time() - delayStartTime < 1 / speed:
-                    time.sleep(1 / speed - time.time() + delayStartTime)
+                while time.time() - delayStartTime < 1 / speed:
+                    pass
         else:
             for i in range(requestCount):
                 curUrl = random.choice(subUrls)
@@ -96,7 +93,8 @@ if __name__ == '__main__':
         while requestCountExecuted < requestCount:
             bar.update(requestCountExecuted)
 
-    print(datetime.now().strftime(
-        '[%X] ') + 'Успешных запросов: ' + str(requestCountSuccess))
-    print(datetime.now().strftime('[%X] ') + 'Средняя скорость: ' + str(
-        round(requestCountExecuted / (time.time() - startTime))) + ' з/с')
+    endTime = time.time() - startTime
+    print(endTime)
+
+    print(f'{datetime.now().strftime("[%X]")} Успешных запросов: {requestCountSuccess}')
+    print(f'{datetime.now().strftime("[%X]")} Средняя скорость: {round(requestCountExecuted / endTime, 2)} з/с')