From 6d5fffa769a366f4e431d5385d3c319a0e48a06e Mon Sep 17 00:00:00 2001
From: topilski <atopilski@gmail.com>
Date: Fri, 20 Sep 2019 00:09:46 -0400
Subject: [PATCH] Exp date

---
 app/common                                | 2 +-
 app/templates/service/subscribers.html    | 3 +++
 scripts/import_subscribers_from_xtream.py | 4 ++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/common b/app/common
index a0377f7..9094550 160000
--- a/app/common
+++ b/app/common
@@ -1 +1 @@
-Subproject commit a0377f70b5c1531c7e324bc6cae0878fdd958df3
+Subproject commit 9094550d62a0968a1114e5ee56de63623f718828
diff --git a/app/templates/service/subscribers.html b/app/templates/service/subscribers.html
index cab90a5..c8ac25d 100644
--- a/app/templates/service/subscribers.html
+++ b/app/templates/service/subscribers.html
@@ -51,6 +51,9 @@ Activate service | {{ config['PUBLIC_CONFIG'].site.title }}
                         <td>
                             {{ subscriber.created_date }}
                         </td>
+                        <td>
+                            {{ subscriber.exp_date }}
+                        </td>
                         <td>
                             {{ ['NOT_ACTIVE', 'ACTIVE', 'TRIAL_FINISHED', 'BANNED'][subscriber.status] }}
                         </td>
diff --git a/scripts/import_subscribers_from_xtream.py b/scripts/import_subscribers_from_xtream.py
index 8d0042d..523f099 100755
--- a/scripts/import_subscribers_from_xtream.py
+++ b/scripts/import_subscribers_from_xtream.py
@@ -2,6 +2,7 @@
 import argparse
 import os
 import sys
+from datetime import datetime
 from mongoengine import connect
 import mysql.connector
 
@@ -54,6 +55,9 @@ if __name__ == '__main__':
         new_user = SubscriberUser.make_subscriber(email=sql_entry['username'], password=sql_entry['password'],
                                                   country='US')
         new_user.status = SubscriberUser.Status.ACTIVE
+        sdate = sql_entry['exp_date']
+        if sdate:
+            new_user.exp_date = datetime.fromtimestamp(sdate)
         dev = Device(name='Xtream', max_connections=sql_entry['max_connections'])
         new_user.add_device(dev)
         # save