v1.1.0: chart, state, proxy

artem · artem · commit 7bf83ee1e55b · 2020-04-05T17:27:32.000+08:00
diff --git a/GUI/Widget.py b/GUI/Widget.py
@@ -1,9 +1,10 @@
-from PySide2.QtCore import Slot, Qt
+from PySide2.QtCore import Slot, Qt, QDateTime, QSettings
 from PySide2.QtGui import QPainter, QColor
 from PySide2.QtCharts import QtCharts
 from PySide2.QtWidgets import (QWidget, QTableWidget, QHBoxLayout, QTableWidgetItem,
                                QHeaderView, QLineEdit, QVBoxLayout, QPushButton)
 from time import time                               
+from ast import literal_eval
 
 from helpers import CONSTANTS
 from helpers.Bridge import Bridge
@@ -15,13 +16,14 @@ def __init__(self):
 
         self.row = 0
         self.coins_sum = 0
-        self.define_table()
+        self.settings = QSettings('NoneCompany', 'freebot')
 
         VBoxLayout = QVBoxLayout() # Right
         HBoxLayout = QHBoxLayout() # Left
         
         self.create_form()
         self.set_placeholders()
+        self.define_table()
         
         FormLayout = QHBoxLayout()
         FormLayout.addWidget(self.form_login)
@@ -78,6 +80,27 @@ def define_table(self):
         self.table.setHorizontalHeaderLabels(CONSTANTS.TABLE_COLUMNS)
         self.table.horizontalHeader().setSectionResizeMode(QHeaderView.Stretch)
 
+        if self.settings.contains('key'):
+            self.form_key.setText( self.get_settings('key') )
+
+        if self.settings.contains('table'):
+            for row in literal_eval(self.get_settings('table')):
+                self.add_account(*row, False)
+
+    def set_settings(self, key, value):
+        if key == 'table':
+            if self.settings.contains('table'):
+                table = literal_eval(self.get_settings('table'))
+                table.append(value)
+                value = table
+            else:
+                value = [value]    
+
+        self.settings.setValue(key, str(value))
+
+    def get_settings(self, key):
+        return self.settings.value(key)    
+
     @Slot(int, list)
     def change_column_color(self, row, RGB):
         for col in range( len(CONSTANTS.TABLE_COLUMNS) ):
@@ -89,15 +112,16 @@ def change_column_text(self, row, text):
 
     @Slot()
     def clear_table(self):
+        self.settings.clear()
         self.table.setRowCount(0)
         self.row = 0
 
     @Slot()
-    def fillin_table(self):
+    def fillin_table(self, settings=False):
         if self.check_form_state():
             return
 
-        self.add_account(self.form_login.text(),
+        self.add_account(self.form_login.text(), 
                          self.form_password.text(),
                          self.form_proxy.text())
         
@@ -109,15 +133,17 @@ def fillin_table(self):
     def update_chart(self, data, init=False):
         self.coins_sum += data[1]
 
+        MStime_now = float(QDateTime.currentDateTime().toMSecsSinceEpoch())
+
         if init:
-            self.series.append(time(), self.coins_sum)
+            self.series.append(MStime_now, self.coins_sum)
             for i in range(6):
                 if i and not i % 2:
-                    self.series.append(time() + ((i / 100) + 0.000001), self.coins_sum)
+                    self.series.append(MStime_now + (i * 1), self.coins_sum)
                 else:
-                    self.series.append(time() + ((i / 100) + 0.000001), 0.00000001)
+                    self.series.append(MStime_now + (i * 1), 0.00000001)
         else:    
-            self.series.append(data[0], self.coins_sum)
+            self.series.append(MStime_now, self.coins_sum)
 
         chart = QtCharts.QChart()
         chart.addSeries(self.series)
@@ -133,7 +159,8 @@ def update_chart(self, data, init=False):
         self.series.attachAxis(axisX)
 
         axisY = QtCharts.QValueAxis()
-        axisY.setLabelFormat('%i')
+        axisY.setTickCount(5)
+        axisY.setLabelFormat('%.8f')
         axisY.setTitleText('coins')
         chart.addAxis(axisY, Qt.AlignLeft)
         self.series.attachAxis(axisY)
@@ -143,9 +170,12 @@ def update_chart(self, data, init=False):
     @Slot()
     def init_threads(self):
         self.start_button.setEnabled(False)
+        self.set_settings('key', self.form_key.text())
+
         self.threads = [Bridge(self, row,
                                self.table.item(row, 0).text(),
                                self.table.item(row, 1).text(),
+                               self.table.item(row, 2).text(),
                                self.form_key.text()) 
                         for row in range(self.table.rowCount())]
         
@@ -154,12 +184,16 @@ def check_form_state(self):
         or not self.form_password.text() \
         or not self.form_proxy.text()
 
-    def add_account(self, login, password, proxy):
+    def add_account(self, login, password, proxy, record=True):
         self.table.insertRow(self.row)
 
         self.table.setItem(self.row, 0, QTableWidgetItem(login))
         self.table.setItem(self.row, 1, QTableWidgetItem(password))
         self.table.setItem(self.row, 2, QTableWidgetItem(proxy))
         self.table.setItem(self.row, 3, QTableWidgetItem('?'))
 
+        if record:
+            self.set_settings('key', self.form_key.text())
+            self.set_settings('table', [login, password, proxy])
+
         self.row += 1
diff --git a/freebitcoin/API.py b/freebitcoin/API.py
@@ -9,32 +9,28 @@
 
 
 class API:
-    def __init__(self, login, password, key):
+    def __init__(self, login, password, proxy, api_key):
         self.session = requests.Session()
         self.session.headers.update({
             'user-agent': CONSTANTS.USER_AGENT
         })
 
-        self.key = key
+        self.captcha_key = api_key
+
+        self.update_proxy(proxy)
         self.parse_token()
         self.auth(login, password)
         
     def parse_token(self):
         with self.session as s:
-            r = s.get('https://freebitco.in/?op=signup_page')
-            r.raise_for_status()
-
-            self.csrf_token = r.cookies.get('csrf_token')
+            self.csrf_token = s.get('https://freebitco.in/?op=signup_page').cookies.get('csrf_token')
 
     def parse_hash(self, token):
         with self.session as s:
-            r = s.get(f'https://freebitco.in/cgi-bin/fp_check.pl?s={token}&csrf_token={self.csrf_token}', headers={
+            return s.get(f'https://freebitco.in/cgi-bin/fp_check.pl?s={token}&csrf_token={self.csrf_token}', headers={
                 'x-csrf-token': self.csrf_token,
                 'X-Requested-With': 'XMLHttpRequest'
-            })
-            r.raise_for_status()
-
-            return r.text
+            }).text
 
     def auth(self, login, password):
         with self.session as s:
@@ -48,7 +44,6 @@ def auth(self, login, password):
                 'btc_address': login,
                 'password': password
             })
-            r.raise_for_status()
 
             try:
                 for cookie in [requests.cookies.create_cookie(name, value, domain='freebitco.in', path='/') 
@@ -64,7 +59,6 @@ def auth(self, login, password):
     def create_data(self) -> dict:
         with self.session as s:
             r = s.get('https://freebitco.in')
-            r.raise_for_status()
 
             soup = BeautifulSoup(r.text, 'html.parser')
 
@@ -85,18 +79,15 @@ def create_data(self) -> dict:
 
             data[token_key1] = token_val1 
             data[token_key2] = token_val2
-            data['g_recaptcha_response'] = RucaptchaAPI.solve_captcha(self.key) 
+            data['g_recaptcha_response'] = RucaptchaAPI.solve_captcha(self.captcha_key) 
 
             return data
 
     def parse_coins(self):
         with self.session as s:
             r = s.get('https://freebitco.in/?op=home')
-            r.raise_for_status()
 
-            soup = BeautifulSoup(r.text, 'html.parser')
-            
-            return soup.find(id='balance_small').text        
+            return BeautifulSoup(r.text, 'html.parser').find(id='balance_small').text        
 
     def collect_coins(self, data) -> tuple:
         with self.session as s:
@@ -105,6 +96,16 @@ def collect_coins(self, data) -> tuple:
                 'x-csrf-token': self.csrf_token,
                 'x-requested-with': 'XMLHttpRequest'
             }, data=data)
-            r.raise_for_status()
 
-            return (r.text.split(':')[2], r.text.split(':')[3])
+            result = r.text.split(':')
+
+            if len(result) < 4:
+                raise ValueError(f'{r.text}')
+            
+            return (result[2], result[3])
+
+    def update_proxy(self, proxy):
+        if not proxy == '-':
+            self.session.proxies.update({
+                proxy.split('://')[0]: proxy
+            })
diff --git a/freebitcoin/User.py b/freebitcoin/User.py
@@ -11,13 +11,14 @@ class User(QObject):
     signal_update_column_text = Signal(int, str)
     signal_update_chart = Signal(list)
 
-    def __init__(self, index, login, password, key):
+    def __init__(self, index, login, password, proxy, key):
         QObject.__init__(self)
 
         self.key = key
         self.index = index
         self.login = login
         self.password = password
+        self.proxy = proxy
 
     def alert_user(self, success):
         self.signal_update_column_color.emit(self.index, [20, 200, 20] if success else [200, 20, 20])       
@@ -30,7 +31,7 @@ def update_balance(self, balance):
 
     def run(self):
         try:
-            self.api = API(self.login, self.password, self.key)
+            self.api = API(self.login, self.password, self.proxy, self.key)
             self.update_balance( self.api.parse_coins() )
             self.alert_user(True)
             
diff --git a/helpers/Bridge.py b/helpers/Bridge.py
@@ -4,14 +4,17 @@
 
 
 class Bridge(QObject):
-    def __init__(self, widget, index, login, password, key):
+    def __init__(self, widget, index, login, password, proxy, key):
         QObject.__init__(self)
 
         self.thread = QThread()
-        self.user = User(index, login, password, key)
+        self.user = User(index, login, password, proxy, key)
         self.user.moveToThread(self.thread)
+        self.init_signal_connections(widget)
+        self.thread.started.connect(self.user.run)
+        self.thread.start()
+
+    def init_signal_connections(self, widget):
         self.user.signal_update_column_color.connect(widget.change_column_color)
         self.user.signal_update_column_text.connect(widget.change_column_text)
-        self.user.signal_update_chart.connect(widget.update_chart)
-        self.thread.started.connect(self.user.run)
-        self.thread.start()
+        self.user.signal_update_chart.connect(widget.update_chart)
diff --git a/helpers/CONSTANTS.py b/helpers/CONSTANTS.py
@@ -1,4 +1,4 @@
-APP_VERSION = '1.0.1'
+APP_VERSION = '1.1.0'
 APP_NAME = 'freebot'
 
 TABLE_COLUMNS = ['Login', 'Password', 'Proxy', 'Balance']
diff --git a/helpers/RucaptchaAPI.py b/helpers/RucaptchaAPI.py
@@ -15,13 +15,9 @@ def solve_captcha(cls, key, interval=10):
             'googlekey': CONSTANTS.CAPTHCA_KEY,
             'pageurl': CONSTANTS.CAPTCHA_DOMAIN
         })
-        r.raise_for_status()
         
-        id = r.json()['request']
-
-        while True:
-            sleep(interval)
-            answer = cls.get_answer(key, id)
+        while sleep(interval) or True:
+            answer = cls.get_answer(key, r.json()['request'])
             if int(answer['status']) == 1:
                 return answer['request']
 
@@ -30,6 +26,5 @@ def get_answer(key, id):
         r = rq.get('https://rucaptcha.com/res.php', params={
             'json': '1', 'key': key, 'action': 'get', 'id': id
         })
-        r.raise_for_status()
 
         return r.json()

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-APP_VERSION = '1.0.1'`
	`1`	`+APP_VERSION = '1.1.0'`
`2`	`2`	`APP_NAME = 'freebot'`
`3`	`3`
`4`	`4`	`TABLE_COLUMNS = ['Login', 'Password', 'Proxy', 'Balance']`