From 14ae7522d739c6d263cb3c625ee6b50c070012e8 Mon Sep 17 00:00:00 2001
From: topilski <atopilski@gmail.com>
Date: Fri, 20 Sep 2019 03:18:28 -0400
Subject: [PATCH] Sources UP

---
 CHANGELOG                                 |  1 +
 app/common                                |  2 +-
 scripts/import_subscribers_from_xtream.py | 19 +++++++++++--------
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index bd655cd..adf1331 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 1.6.1 /
 [Alexandr Topilski]
 - Stream quality
+- Import subscribers from Xtream script
 
 1.6.0 / September 4, 2019
 [Alexandr Topilski]
diff --git a/app/common b/app/common
index fee7d4e..df93e1e 160000
--- a/app/common
+++ b/app/common
@@ -1 +1 @@
-Subproject commit fee7d4ef73c1282591bbce3f8a303f2384fb2d9b
+Subproject commit df93e1e570b0624fc7b5030c616c2ab1cc8c0374
diff --git a/scripts/import_subscribers_from_xtream.py b/scripts/import_subscribers_from_xtream.py
index 513bfe5..1f4eb53 100755
--- a/scripts/import_subscribers_from_xtream.py
+++ b/scripts/import_subscribers_from_xtream.py
@@ -12,7 +12,7 @@ from app.common.subscriber.login.entry import SubscriberUser
 from app.common.subscriber.entry import Device
 from app.service.service import ServiceSettings
 
-PROJECT_NAME = 'create_provider'
+PROJECT_NAME = 'import_subscribers_from_xtream'
 
 if __name__ == '__main__':
     parser = argparse.ArgumentParser(prog=PROJECT_NAME, usage='%(prog)s [options]')
@@ -21,12 +21,14 @@ if __name__ == '__main__':
     parser.add_argument('--mysql_user', help='MySQL username', default='')
     parser.add_argument('--mysql_password', help='MySQL password', default='')
     parser.add_argument('--server_id', help='Server ID', default='')
+    parser.add_argument('--country', help='Subscribers country', default='US')
 
     argv = parser.parse_args()
     mysql_host = argv.mysql_host
     mysql_user = argv.mysql_user
     mysql_password = argv.mysql_password
     server_id = argv.server_id
+    country = argv.country
 
     mongo = connect(host=argv.mongo_uri)
     if not mongo:
@@ -36,24 +38,24 @@ if __name__ == '__main__':
     if not server:
         sys.exit(1)
 
-    mydb = mysql.connector.connect(
+    db = mysql.connector.connect(
         host=mysql_host,
         user=mysql_user,
         passwd=mysql_password,
         database='xtream_iptvpro'
     )
 
-    mycursor = mydb.cursor(dictionary=True)
+    cursor = db.cursor(dictionary=True)
 
     sql = 'SELECT username,password,created_at,exp_date FROM users'
 
-    mycursor.execute(sql)
+    cursor.execute(sql)
 
-    myresult = mycursor.fetchall()
+    sql_subscribers = cursor.fetchall()
 
-    for sql_entry in myresult:
+    for sql_entry in sql_subscribers:
         new_user = SubscriberUser.make_subscriber(email=sql_entry['username'], password=sql_entry['password'],
-                                                  country='US')
+                                                  country=country)
         new_user.status = SubscriberUser.Status.ACTIVE
         created_at = sql_entry['created_at']
         if created_at:
@@ -67,4 +69,5 @@ if __name__ == '__main__':
         new_user.add_server(server)
         server.add_subscriber(new_user)
 
-    mydb.close()
+    cursor.close()
+    db.close()