hikyuu 2.3.0__py3-none-win_amd64.whl → 2.5.0__py3-none-win_amd64.whl

hikyuu/fetcher/stock/zh_block_em.py

@@ -5,26 +5,77 @@
 #    Author: fasiondog
 
 import requests
+import math
 import akshare as ak
+import pandas as pd
 from hikyuu.util import *
 
 
+@hku_catch(ret=[], trace=True)
+def get_hybk_names():
+    """获取所有行业(板块代码,板块名称)列表"""
+    url = "https://19.push2.eastmoney.com/api/qt/clist/get"
+    params = {
+        "pn": "1",
+        "pz": "200",
+        "po": "1",
+        "np": "1",
+        "ut": "bd1d9ddb04089700cf9c27f6f7426281",
+        "fltt": "2",
+        "invt": "2",
+        "fid": "f3",
+        "fs": "m:90 t:2 f:!50",
+        "fields": "f12,f14",
+        "_": "1626075887768",
+    }
+    r = requests.get(url, params=params, timeout=15)
+    data_json = r.json()
+    ret = [(v['f12'], v['f14']) for v in data_json["data"]["diff"]]
+    return ret
+
+
+@hku_catch(ret=[], trace=True)
+def get_hybk_cons_code(blk_code):
+    "获取指定行业板块成分代码列表"
+    url = "http://30.push2.eastmoney.com/api/qt/clist/get"
+    params = {
+        "pn": "1",
+        "pz": "200",
+        "po": "1",
+        "np": "1",
+        "ut": "bd1d9ddb04089700cf9c27f6f7426281",
+        "fltt": "2",
+        "invt": "2",
+        "fid": "f3",
+        "fs": f"b:{blk_code} f:!50",
+        "fields": "f12",
+        "_": "1626081702127",
+    }
+    r = requests.get(url, params=params, timeout=15)
+    data_json = r.json()
+    ret = [v['f12'] for v in data_json["data"]["diff"]]
+    total_page = math.ceil(data_json["data"]["total"] / 200)
+    for page in range(2, total_page + 1):
+        params["pn"] = page
+        r = requests.get(url, params=params, timeout=15)
+        data_json = r.json()
+        if data_json["data"] is None:
+            continue
+        tmp = [v['f12'] for v in data_json["data"]['diff']]
+        ret.extend(tmp)
+    return ret
+
+
 @hku_catch(ret={}, trace=True)
 def get_all_hybk_info(code_market_dict, sep=""):
     """获取所有行业板块列表"""
-    blk_names = ak.stock_board_industry_name_em()['板块名称']
+    blk_list = get_hybk_names()
     ret = {}
-    for blk_name in blk_names:
-        # print(blk_name)
-        ret[blk_name] = []
-        stk_codes = ak.stock_board_industry_cons_em(blk_name)
-        stk_codes = stk_codes['代码'].to_list()
-        for stk_code in stk_codes:
-            try:
-                ret[blk_name].append(f"{code_market_dict[stk_code]}{sep}{stk_code}")
-            except:
-                # print(stk_code)
-                pass
+    for blk in blk_list:
+        stk_codes = get_hybk_cons_code(blk[0])
+        hku_info(f"获取行业板块{blk[1]}成分: {len(stk_codes)}")
+        ret[blk[1]] = [
+            f"{code_market_dict[stk_code]}{sep}{stk_code}" for stk_code in stk_codes if stk_code in code_market_dict]
     return ret
 
 
@@ -34,26 +85,21 @@ def get_all_gnbk_info(code_market_dict, sep=""):
     blk_names = ak.stock_board_concept_name_em()['板块名称']
     ret = {}
     for blk_name in blk_names:
-        # print(blk_name)
-        ret[blk_name] = []
         stk_codes = ak.stock_board_concept_cons_em(blk_name)
         stk_codes = stk_codes['代码'].to_list()
-        for stk_code in stk_codes:
-            try:
-                ret[blk_name].append(f"{code_market_dict[stk_code]}{sep}{stk_code}")
-            except:
-                # print(stk_code)
-                pass
+        hku_info(f"获取概念板块{blk_name}成分: {len(stk_codes)}")
+        ret[blk_name] = [
+            f"{code_market_dict[stk_code]}{sep}{stk_code}" for stk_code in stk_codes if stk_code in code_market_dict]
     return ret
 
 
-@hku_catch(ret={}, trace=True)
-def get_all_dybk_info(code_market_dict, sep=""):
-    """获取所有地域板块列表"""
+@hku_catch(ret=[], trace=True)
+def get_dybk_names():
+    """获取所有地域板块名称列表"""
     url = "http://13.push2.eastmoney.com/api/qt/clist/get"
     params = {
         "pn": "1",
-        "pz": "50000",
+        "pz": "200",
         "po": "1",
         "np": "1",
         "ut": "bd1d9ddb04089700cf9c27f6f7426281",
@@ -62,17 +108,32 @@ def get_all_dybk_info(code_market_dict, sep=""):
         "fid": "f3",
         "fs": "m:90+t:1+f:!50",
         "fields": "f12,f14",
-        # "fields": "f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f12,f13,f14,f15,f16,f17,f18,f20,f21,f23,f24,f25,f22,f11,f62,f128,"
-        #           "f136,f115,f152",
         "_": "1623833739532",
     }
-    r = requests.get(url, params=params)
+    r = requests.get(url, params=params, timeout=15)
     data_json = r.json()
-    data_json = data_json["data"]["diff"]
+    hku_check(data_json['data'] is not None, "获取地域板块名称列表失败!")
+    ret = [(v["f12"], v["f14"]) for v in data_json["data"]["diff"]]
+
+    total_page = math.ceil(data_json["data"]["total"] / 200)
+    for page in range(2, total_page + 1):
+        params["pn"] = page
+        r = requests.get(url, params=params, timeout=15)
+        data_json = r.json()
+        if data_json["data"] is not None:
+            ret.extend([(v["f12"], v["f14"]) for v in data_json["data"]["diff"]])
+    return ret
+
+
+@hku_catch(ret={}, trace=True)
+def get_all_dybk_info(code_market_dict, sep=""):
+    """获取所有地域板块列表"""
+    blk_list = get_dybk_names()
 
+    url = "http://13.push2.eastmoney.com/api/qt/clist/get"
     params = {
         "pn": "1",
-        "pz": "2000",
+        "pz": "200",
         "po": "1",
         "np": "1",
         "ut": "bd1d9ddb04089700cf9c27f6f7426281",
@@ -85,24 +146,30 @@ def get_all_dybk_info(code_market_dict, sep=""):
     }
 
     ret = {}
-    for v in data_json:
-        # print(v)
-        blk_code = v["f12"]
-        blk_name = v["f14"]
-        # print(blk_name)
-        ret[blk_name] = []
+    for v in blk_list:
+        blk_code, blk_name = v[0], v[1]
         params["fs"] = f"b:{blk_code} f:!50"
-        r = requests.get(url, params=params)
+        params["pn"] = 1
+        r = requests.get(url, params=params, timeout=15)
+        data = r.json()
+        if data["data"] is None:
+            continue
+
         stk_json = r.json()
         stk_json = stk_json["data"]["diff"]
+        ret[blk_name] = [
+            f"{code_market_dict[v["f12"]]}{sep}{v["f12"]}" for v in stk_json if v["f12"] in code_market_dict]
+
+        total_page = math.ceil(data["data"]["total"] / 200)
+        for page in range(2, total_page + 1):
+            params["pn"] = page
+            r = requests.get(url, params=params, timeout=15)
+            stk_json = r.json()
+            stk_json = stk_json["data"]["diff"]
+            ret[blk_name].extend(
+                [f"{code_market_dict[v["f12"]]}{sep}{v["f12"]}" for v in stk_json if v["f12"] in code_market_dict])
+        hku_info(f'获取地域板块{blk_name}成分: {len(ret[blk_name])}')
 
-        for item in stk_json:
-            stk_code = item["f12"]
-            try:
-                ret[blk_name].append(f"{code_market_dict[stk_code]}{sep}{stk_code}")
-            except:
-                # print(stk_code)
-                pass
     return ret
 
 
@@ -117,24 +184,24 @@ def get_all_zsbk_info(code_market_dict, sep=""):
     for i in range(total):
         blk_name = blk_names[i]
         blk_code = blk_codes[i]
-        hku_info("{} 获取指数板块 {} 详情", i, blk_name)
         # print(i, blk_name)
         # 沪深指数有重复，避免深指覆盖
         if blk_name in ret:
             continue
         try:
-            ret[blk_name] = []
             stk_codes = ak.index_stock_cons_csindex(symbol=blk_code)
             stk_codes = stk_codes['成分券代码'].to_list()
-            for stk_code in stk_codes:
-                try:
-                    ret[blk_name].append(f"{code_market_dict[stk_code]}{sep}{stk_code}")
-                except:
-                    # print(stk_code)
-                    pass
+            hku_info("{} 获取指数板块{}成分: {}", i, blk_name, len(stk_codes))
+            ret[blk_name] = [
+                f"{code_market_dict[stk_code]}{sep}{stk_code}" for stk_code in stk_codes if stk_code in code_market_dict]
         except KeyboardInterrupt:
             break
         except:
             # print("Failed!", blk_code, blk_name)
             pass
     return ret
+
+
+if __name__ == "__main__":
+    blks = get_hybk_cons_code('BK0475')
+    print(blks)

hikyuu/gui/data/EscapetimeThread.py

@@ -2,6 +2,7 @@
 # -*- coding: utf8 -*-
 # cp936
 
+import time
 from PyQt5.QtCore import QThread, pyqtSignal
 
 class EscapetimeThread(QThread):
@@ -11,11 +12,11 @@ class EscapetimeThread(QThread):
         super(self.__class__, self).__init__()
         self.working = True
         self.msg_name = 'ESCAPE_TIME'
-        self.escape_time = 0
+        self.init_time = time.time()
 
     def __del__(self):
         self.working = False
-        #print("EscapetimeThread", "__del__", self.escape_time/1000)
+        #print("EscapetimeThread", "__del__", time.time() - self.init_time)
         self.wait()
 
     def send_message(self, msg):
@@ -28,5 +29,4 @@ class EscapetimeThread(QThread):
     def run(self):
         while self.working:
             self.msleep(10)
-            self.escape_time += 10
-            self.send_message([self.escape_time/1000.,])
+            self.send_message([(time.time() - self.init_time),])

hikyuu/gui/data/ImportBlockInfoTask.py

@@ -39,17 +39,18 @@ class ImportBlockInfoTask:
             connect = mysql.connector.connect(**db_config)
             import_block = em_import_block_to_mysql
 
+        count = 0
         try:
             code_market_dict = {}
             for market in (MARKET.SH, MARKET.SZ, MARKET.BJ):
                 x = get_stk_code_name_list(market)
                 for v in x:
                     code_market_dict[v["code"]] = market
-            import_block(connect, code_market_dict, self.categorys)
+            count = import_block(connect, code_market_dict, self.categorys)
         except Exception as e:
             hku_error(str(e))
 
         connect.close()
 
-        self.queue.put([self.task_name, "BLOCKINFO", f"{self.categorys}板块信息下载完毕", None, None])
+        self.queue.put([self.task_name, "BLOCKINFO", f"{self.categorys}板块信息下载完毕: {count}", None, None])
         self.status = "finished"

hikyuu/gui/data/ImportHistoryFinanceTask.py

@@ -30,6 +30,7 @@ import mysql.connector
 from pytdx.hq import TdxHq_API
 from hikyuu.data.pytdx_finance_to_mysql import history_finance_import_mysql
 from hikyuu.data.pytdx_finance_to_sqlite import history_finance_import_sqlite
+from hikyuu.data.common_pytdx import search_best_tdx
 from hikyuu.util import *
 
 
@@ -47,6 +48,7 @@ class ImportHistoryFinanceTask:
 
     def connect(self):
         self.api = TdxHq_API()
+        # 不是所有服务器都提供下载
         hku_check(self.api.connect('120.76.152.87', 7709), "failed connect pytdx!")
 
     def get_list_info(self):

hikyuu/gui/data/MainWindow.py

@@ -165,7 +165,7 @@ class Ui_MainWindow(object):
         self.label_6.setObjectName("label_6")
         self.gridLayout_4.addWidget(self.label_6, 3, 0, 1, 1)
         self.min5_start_dateEdit = QtWidgets.QDateEdit(self.groupBox_7)
-        self.min5_start_dateEdit.setMinimumDateTime(QtCore.QDateTime(QtCore.QDate(1989, 12, 30), QtCore.QTime(16, 0, 0)))
+        self.min5_start_dateEdit.setMinimumDateTime(QtCore.QDateTime(QtCore.QDate(1989, 12, 30), QtCore.QTime(8, 0, 0)))
         self.min5_start_dateEdit.setCalendarPopup(True)
         self.min5_start_dateEdit.setObjectName("min5_start_dateEdit")
         self.gridLayout_4.addWidget(self.min5_start_dateEdit, 1, 1, 1, 1)
@@ -187,7 +187,7 @@ class Ui_MainWindow(object):
         self.trans_start_dateEdit.setObjectName("trans_start_dateEdit")
         self.gridLayout_4.addWidget(self.trans_start_dateEdit, 3, 1, 1, 1)
         self.day_start_dateEdit = QtWidgets.QDateEdit(self.groupBox_7)
-        self.day_start_dateEdit.setMinimumDateTime(QtCore.QDateTime(QtCore.QDate(1989, 12, 30), QtCore.QTime(16, 0, 0)))
+        self.day_start_dateEdit.setMinimumDateTime(QtCore.QDateTime(QtCore.QDate(1989, 12, 30), QtCore.QTime(8, 0, 0)))
         self.day_start_dateEdit.setCalendarPopup(True)
         self.day_start_dateEdit.setObjectName("day_start_dateEdit")
         self.gridLayout_4.addWidget(self.day_start_dateEdit, 0, 1, 1, 1)
@@ -311,6 +311,11 @@ class Ui_MainWindow(object):
         self.tab_2.setObjectName("tab_2")
         self.verticalLayout_7 = QtWidgets.QVBoxLayout(self.tab_2)
         self.verticalLayout_7.setObjectName("verticalLayout_7")
+        spacerItem13 = QtWidgets.QSpacerItem(20, 9, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
+        self.verticalLayout_7.addItem(spacerItem13)
+        self.label_43 = QtWidgets.QLabel(self.tab_2)
+        self.label_43.setObjectName("label_43")
+        self.verticalLayout_7.addWidget(self.label_43)
         self.horizontalLayout_11 = QtWidgets.QHBoxLayout()
         self.horizontalLayout_11.setContentsMargins(10, 20, 10, -1)
         self.horizontalLayout_11.setObjectName("horizontalLayout_11")
@@ -325,12 +330,12 @@ class Ui_MainWindow(object):
         self.sched_import_timeEdit = QtWidgets.QTimeEdit(self.tab_2)
         self.sched_import_timeEdit.setObjectName("sched_import_timeEdit")
         self.horizontalLayout_14.addWidget(self.sched_import_timeEdit)
-        spacerItem13 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout_14.addItem(spacerItem13)
+        spacerItem14 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.horizontalLayout_14.addItem(spacerItem14)
         self.horizontalLayout_11.addLayout(self.horizontalLayout_14)
         self.verticalLayout_7.addLayout(self.horizontalLayout_11)
-        spacerItem14 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
-        self.verticalLayout_7.addItem(spacerItem14)
+        spacerItem15 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
+        self.verticalLayout_7.addItem(spacerItem15)
         self.horizontalLayout_18 = QtWidgets.QHBoxLayout()
         self.horizontalLayout_18.setContentsMargins(10, -1, 10, -1)
         self.horizontalLayout_18.setObjectName("horizontalLayout_18")
@@ -340,11 +345,11 @@ class Ui_MainWindow(object):
         self.import_status_label = QtWidgets.QLabel(self.tab_2)
         self.import_status_label.setObjectName("import_status_label")
         self.horizontalLayout_18.addWidget(self.import_status_label)
-        spacerItem15 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout_18.addItem(spacerItem15)
+        spacerItem16 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.horizontalLayout_18.addItem(spacerItem16)
         self.verticalLayout_7.addLayout(self.horizontalLayout_18)
-        spacerItem16 = QtWidgets.QSpacerItem(20, 20, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
-        self.verticalLayout_7.addItem(spacerItem16)
+        spacerItem17 = QtWidgets.QSpacerItem(20, 20, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
+        self.verticalLayout_7.addItem(spacerItem17)
         self.groupBox_5 = QtWidgets.QGroupBox(self.tab_2)
         self.groupBox_5.setObjectName("groupBox_5")
         self.verticalLayout_5 = QtWidgets.QVBoxLayout(self.groupBox_5)
@@ -392,11 +397,11 @@ class Ui_MainWindow(object):
         self.label_9 = QtWidgets.QLabel(self.groupBox_5)
         self.label_9.setObjectName("label_9")
         self.gridLayout.addWidget(self.label_9, 5, 0, 1, 1)
-        spacerItem17 = QtWidgets.QSpacerItem(5, 20, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
-        self.gridLayout.addItem(spacerItem17, 0, 2, 1, 1)
+        spacerItem18 = QtWidgets.QSpacerItem(5, 20, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
+        self.gridLayout.addItem(spacerItem18, 0, 2, 1, 1)
         self.verticalLayout_5.addLayout(self.gridLayout)
-        spacerItem18 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
-        self.verticalLayout_5.addItem(spacerItem18)
+        spacerItem19 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
+        self.verticalLayout_5.addItem(spacerItem19)
         self.import_detail_textEdit = QtWidgets.QTextEdit(self.groupBox_5)
         self.import_detail_textEdit.setFrameShape(QtWidgets.QFrame.NoFrame)
         self.import_detail_textEdit.setReadOnly(True)
@@ -422,8 +427,8 @@ class Ui_MainWindow(object):
         self.label_36.setObjectName("label_36")
         self.verticalLayout.addWidget(self.label_36)
         self.verticalLayout_4.addLayout(self.verticalLayout)
-        spacerItem19 = QtWidgets.QSpacerItem(20, 20, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
-        self.verticalLayout_4.addItem(spacerItem19)
+        spacerItem20 = QtWidgets.QSpacerItem(20, 20, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
+        self.verticalLayout_4.addItem(spacerItem20)
         self.gridLayout_6 = QtWidgets.QGridLayout()
         self.gridLayout_6.setContentsMargins(20, -1, -1, -1)
         self.gridLayout_6.setObjectName("gridLayout_6")
@@ -517,8 +522,8 @@ class Ui_MainWindow(object):
         self.preload_week_checkBox = QtWidgets.QCheckBox(self.groupBox_6)
         self.preload_week_checkBox.setObjectName("preload_week_checkBox")
         self.gridLayout_6.addWidget(self.preload_week_checkBox, 1, 0, 1, 1)
-        spacerItem20 = QtWidgets.QSpacerItem(20, 20, QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Minimum)
-        self.gridLayout_6.addItem(spacerItem20, 4, 3, 1, 1)
+        spacerItem21 = QtWidgets.QSpacerItem(20, 20, QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Minimum)
+        self.gridLayout_6.addItem(spacerItem21, 4, 3, 1, 1)
         self.preload_quarter_checkBox = QtWidgets.QCheckBox(self.groupBox_6)
         self.preload_quarter_checkBox.setObjectName("preload_quarter_checkBox")
         self.gridLayout_6.addWidget(self.preload_quarter_checkBox, 3, 0, 1, 1)
@@ -553,16 +558,16 @@ class Ui_MainWindow(object):
         self.preload_year_spinBox.setObjectName("preload_year_spinBox")
         self.gridLayout_6.addWidget(self.preload_year_spinBox, 5, 2, 1, 1)
         self.verticalLayout_4.addLayout(self.gridLayout_6)
-        spacerItem21 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.verticalLayout_4.addItem(spacerItem21)
+        spacerItem22 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        self.verticalLayout_4.addItem(spacerItem22)
         self.verticalLayout_3.addWidget(self.groupBox_6)
         self.tabWidget.addTab(self.tab_6, "")
         self.tab = QtWidgets.QWidget()
         self.tab.setObjectName("tab")
         self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.tab)
         self.verticalLayout_2.setObjectName("verticalLayout_2")
-        spacerItem22 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
-        self.verticalLayout_2.addItem(spacerItem22)
+        spacerItem23 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
+        self.verticalLayout_2.addItem(spacerItem23)
         self.horizontalLayout_15 = QtWidgets.QHBoxLayout()
         self.horizontalLayout_15.setContentsMargins(20, -1, -1, -1)
         self.horizontalLayout_15.setObjectName("horizontalLayout_15")
@@ -572,11 +577,11 @@ class Ui_MainWindow(object):
         self.collect_status_label = QtWidgets.QLabel(self.tab)
         self.collect_status_label.setObjectName("collect_status_label")
         self.horizontalLayout_15.addWidget(self.collect_status_label)
-        spacerItem23 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout_15.addItem(spacerItem23)
+        spacerItem24 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.horizontalLayout_15.addItem(spacerItem24)
         self.verticalLayout_2.addLayout(self.horizontalLayout_15)
-        spacerItem24 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
-        self.verticalLayout_2.addItem(spacerItem24)
+        spacerItem25 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
+        self.verticalLayout_2.addItem(spacerItem25)
         self.horizontalLayout_13 = QtWidgets.QHBoxLayout()
         self.horizontalLayout_13.setContentsMargins(20, -1, -1, -1)
         self.horizontalLayout_13.setObjectName("horizontalLayout_13")
@@ -588,11 +593,11 @@ class Ui_MainWindow(object):
         self.collect_source_comboBox.addItem("")
         self.collect_source_comboBox.addItem("")
         self.horizontalLayout_13.addWidget(self.collect_source_comboBox)
-        spacerItem25 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout_13.addItem(spacerItem25)
+        spacerItem26 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.horizontalLayout_13.addItem(spacerItem26)
         self.verticalLayout_2.addLayout(self.horizontalLayout_13)
-        spacerItem26 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
-        self.verticalLayout_2.addItem(spacerItem26)
+        spacerItem27 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
+        self.verticalLayout_2.addItem(spacerItem27)
         self.horizontalLayout_10 = QtWidgets.QHBoxLayout()
         self.horizontalLayout_10.setContentsMargins(20, -1, -1, -1)
         self.horizontalLayout_10.setObjectName("horizontalLayout_10")
@@ -603,11 +608,11 @@ class Ui_MainWindow(object):
         self.collect_sample_spinBox.setMaximum(86400)
         self.collect_sample_spinBox.setObjectName("collect_sample_spinBox")
         self.horizontalLayout_10.addWidget(self.collect_sample_spinBox)
-        spacerItem27 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout_10.addItem(spacerItem27)
+        spacerItem28 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.horizontalLayout_10.addItem(spacerItem28)
         self.verticalLayout_2.addLayout(self.horizontalLayout_10)
-        spacerItem28 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
-        self.verticalLayout_2.addItem(spacerItem28)
+        spacerItem29 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
+        self.verticalLayout_2.addItem(spacerItem29)
         self.horizontalLayout_8 = QtWidgets.QHBoxLayout()
         self.horizontalLayout_8.setContentsMargins(20, -1, -1, -1)
         self.horizontalLayout_8.setObjectName("horizontalLayout_8")
@@ -626,8 +631,8 @@ class Ui_MainWindow(object):
         self.collect_phase1_last_timeEdit = QtWidgets.QTimeEdit(self.tab)
         self.collect_phase1_last_timeEdit.setObjectName("collect_phase1_last_timeEdit")
         self.horizontalLayout_6.addWidget(self.collect_phase1_last_timeEdit)
-        spacerItem29 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout_6.addItem(spacerItem29)
+        spacerItem30 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.horizontalLayout_6.addItem(spacerItem30)
         self.horizontalLayout_8.addLayout(self.horizontalLayout_6)
         self.verticalLayout_2.addLayout(self.horizontalLayout_8)
         self.horizontalLayout_9 = QtWidgets.QHBoxLayout()
@@ -648,12 +653,12 @@ class Ui_MainWindow(object):
         self.collect_phase2_last_timeEdit = QtWidgets.QTimeEdit(self.tab)
         self.collect_phase2_last_timeEdit.setObjectName("collect_phase2_last_timeEdit")
         self.horizontalLayout_7.addWidget(self.collect_phase2_last_timeEdit)
-        spacerItem30 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout_7.addItem(spacerItem30)
+        spacerItem31 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.horizontalLayout_7.addItem(spacerItem31)
         self.horizontalLayout_9.addLayout(self.horizontalLayout_7)
         self.verticalLayout_2.addLayout(self.horizontalLayout_9)
-        spacerItem31 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
-        self.verticalLayout_2.addItem(spacerItem31)
+        spacerItem32 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
+        self.verticalLayout_2.addItem(spacerItem32)
         self.horizontalLayout_16 = QtWidgets.QHBoxLayout()
         self.horizontalLayout_16.setContentsMargins(20, 0, -1, -1)
         self.horizontalLayout_16.setObjectName("horizontalLayout_16")
@@ -666,8 +671,8 @@ class Ui_MainWindow(object):
         self.collect_use_zhima_checkBox.setObjectName("collect_use_zhima_checkBox")
         self.horizontalLayout_16.addWidget(self.collect_use_zhima_checkBox)
         self.verticalLayout_2.addLayout(self.horizontalLayout_16)
-        spacerItem32 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
-        self.verticalLayout_2.addItem(spacerItem32)
+        spacerItem33 = QtWidgets.QSpacerItem(20, 10, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
+        self.verticalLayout_2.addItem(spacerItem33)
         self.horizontalLayout_17 = QtWidgets.QHBoxLayout()
         self.horizontalLayout_17.setContentsMargins(20, 0, -1, -1)
         self.horizontalLayout_17.setObjectName("horizontalLayout_17")
@@ -735,6 +740,7 @@ class Ui_MainWindow(object):
         self.label_19.setText(_translate("MainWindow", "端口号："))
         self.label_13.setText(_translate("MainWindow", "密码"))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_3), _translate("MainWindow", "存储设置"))
+        self.label_43.setText(_translate("MainWindow", "    注：HDF5存储导入时，请关闭其他 hikyuu 进程，HDF5不支持同时读写！"))
         self.sched_import_pushButton.setText(_translate("MainWindow", "启动定时导入"))
         self.label_40.setText(_translate("MainWindow", "导入执行时间："))
         self.start_import_pushButton.setText(_translate("MainWindow", "手工执行导入"))

hikyuu/gui/importdata.py

@@ -3,15 +3,12 @@
 # cp936
 
 import os.path
-import sys
+import sys, time
 from configparser import ConfigParser
 
-from PyQt5.Qt import QCoreApplication
-
 from hikyuu.data.weight_to_sqlite import qianlong_import_weight
 from hikyuu.data.common_pytdx import search_best_tdx
 
-from hikyuu.gui.data.EscapetimeThread import EscapetimeThread
 from hikyuu.gui.data.UseTdxImportToH5Thread import UseTdxImportToH5Thread
 from hikyuu.gui.data.UsePytdxImportToH5Thread import UsePytdxImportToH5Thread
 
@@ -31,19 +28,25 @@ class HKUImportDataCMD:
         return import_config
 
     def initThreads(self):
-        self.escape_time_thread = None
         self.hdf5_import_thread = None
         self.mysql_import_thread = None
         self.import_running = False
         self.progress = {'DAY': 0, '1MIN': 0, '5MIN': 0, 'TRANS': 0, 'TIME': 0}
         self.info_type = {'DAY': '日线数据', '1MIN': '一分钟线', '5MIN': '五分钟线', 'TRANS': '历史分笔', 'TIME': '分时数据'}
-        self.escape_time = 0.0
+        self.start_import_time = time.time()
         self.details = []
 
+    def time_escaped(self, unit='min'):
+        if unit.lower() == 'min':
+            return (time.time() - self.start_import_time) / 60
+        if unit.lower() == 'hour':
+            return (time.time() - self.start_import_time) / 3600
+        return time.time() - self.start_import_time
+
     def print_progress(self, ktype, progress):
         if progress != self.progress[ktype]:
             print(
-                'import progress: {}%  - {} - 已耗时 {:>.2f} 分钟'.format(progress, self.info_type[ktype], self.escape_time)
+                'import progress: {}%  - {} - 已耗时 {:>.2f} 分钟'.format(progress, self.info_type[ktype], self.time_escaped())
             )
             self.progress[ktype] = progress
 
@@ -53,10 +56,7 @@ class HKUImportDataCMD:
             return
 
         msg_name, msg_task_name = msg[:2]
-        if msg_name == 'ESCAPE_TIME':
-            self.escape_time = msg_task_name / 60
-
-        elif msg_name == 'HDF5_IMPORT':
+        if msg_name == 'HDF5_IMPORT':
             if msg_task_name == 'INFO':
                 print(msg[2])
 
@@ -64,18 +64,13 @@ class HKUImportDataCMD:
                 status = msg[2]
                 if status == 'FAILURE':
                     self.details.append(msg[3])
-                self.hdf5_import_thread.terminate()
-                self.hdf5_import_thread = None
-                self.escape_time_thread.stop()
-                self.escape_time_thread = None
-                print("\n导入完毕, 共耗时 {:>.2f} 分钟".format(self.escape_time))
+                print("\n导入完毕, 共耗时 {:>.2f} 分钟".format(self.time_escaped()))
                 print('\n=========================================================')
                 print("导入详情:")
                 for info in self.details:
                     print(info)
                 print('=========================================================')
                 self.import_running = False
-                QCoreApplication.quit()
 
             elif msg_task_name == 'IMPORT_KDATA':
                 ktype, progress = msg[2:4]
@@ -139,7 +134,6 @@ class HKUImportDataCMD:
         self.import_running = True
 
         print("正在启动任务....")
-        QCoreApplication.processEvents()
 
         if config.getboolean('tdx', 'enable'):
             self.hdf5_import_thread = UseTdxImportToH5Thread(None, config)
@@ -147,19 +141,12 @@ class HKUImportDataCMD:
             self.hdf5_import_thread = UsePytdxImportToH5Thread(None, config)
 
         self.hdf5_import_thread.message.connect(self.on_message_from_thread)
-        self.hdf5_import_thread.start()
-
-        self.escape_time = 0.0
-        self.escape_time_thread = EscapetimeThread()
-        self.escape_time_thread.message.connect(self.on_message_from_thread)
-        self.escape_time_thread.start()
+        self.hdf5_import_thread.run()
 
 
 def main():
-    app = QCoreApplication(sys.argv)
     x = HKUImportDataCMD()
     x.start_import_data()
-    sys.exit(app.exec())
 
 
 if __name__ == '__main__':

hikyuu/hub.py

@@ -490,8 +490,7 @@ class HubManager(metaclass=SingletonType):
 
     @dbsession
     def get_current_hub(self, filename):
-        """用于在仓库part.py中获取当前所在的仓库名
-
+        """用于在仓库part.py中获取当前所在的仓库名。
         示例： get_current_hub(__file__)
         """
         abs_path = os.path.abspath(filename)  # 当前文件的绝对路径
@@ -590,8 +589,7 @@ def get_part_name_list(hub=None, part_type=None):
 
 
 def get_current_hub(filename):
-    """用于在仓库part.py中获取当前所在的仓库名
-
+    """用于在仓库part.py中获取当前所在的仓库名。
     示例： get_current_hub(__file__)
     """
     return HubManager().get_current_hub(filename)