From 823a9e94e5c611b72772c7133e7f23b94dbde69f Mon Sep 17 00:00:00 2001
From: EvilCult <EvilCult@users.noreply.github.com>
Date: Thu, 23 May 2019 17:32:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=BB=B6=E8=BF=9F=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db.py    |  2 +-
 main.py  | 23 ++++++++++++++++-------
 tools.py |  2 +-
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/db.py b/db.py
index d08c9c7..b7cf4b5 100755
--- a/db.py
+++ b/db.py
@@ -37,7 +37,7 @@ class DataBase :
     def create (self) :
         if self.connStat == False : return False
 
-        sql = 'create table ' + self.table + ' (id integer PRIMARY KEY autoincrement, title text, quality text, url text, enable integer, online integer, update text)'
+        sql = 'create table ' + self.table + ' (id integer PRIMARY KEY autoincrement, title text, quality text, url text, enable integer, online integer, delay integer, update text)'
         self.cur.execute(sql)
 
     def query (self, sql) :
diff --git a/main.py b/main.py
index 50b499e..06f133b 100644
--- a/main.py
+++ b/main.py
@@ -2,6 +2,7 @@
 # -*- coding: utf-8 -*-
 
 import tools
+import time
 import re
 
 class Iptv :
@@ -27,12 +28,17 @@ class Iptv :
 
 
             for item in sourceList :
-                playable = self.chkPlayable(item[1])
+                netstat = self.chkPlayable(item[1])
 
-                if playable == True :
+                if netstat > 0 :
                     info = self.fmtTitle(item[0])
-                    print('title: ' + str(info['id']) + ' ' + str(info['title']))
-                    print('url: ' + str(item[1]))
+
+                    data = {
+                        'title': str(info['id']) + str(info['title']),
+                        'url': str(item[1]),
+                        'delay': netstat
+                    }
+                    print(data)
                 else :
                     pass # MAYBE later :P
         else :
@@ -40,14 +46,17 @@ class Iptv :
 
     def chkPlayable (self, url) :
         try:
+            startTime = int(round(time.time() * 1000))
             res = self.T.getPage(url)
 
             if res['code'] == 200 :
-                return True
+                endTime = int(round(time.time() * 1000))
+                useTime = endTime - startTime
+                return int(useTime)
             else:
-                return False
+                return 0
         except:
-            return False
+            return 0
 
 
     def baseFilter (self) :
diff --git a/tools.py b/tools.py
index 830c043..4c94710 100644
--- a/tools.py
+++ b/tools.py
@@ -12,7 +12,7 @@ import gzip
 import random
 import socket
 
-socket.setdefaulttimeout(5.0)
+socket.setdefaulttimeout(10.0)
 
 class Tools :