From 025825cffa18c7cfa7fa470d3a04853ba8d4e3a9 Mon Sep 17 00:00:00 2001
From: zj3D <flysmart.ww@qq.com>
Date: Thu, 7 Mar 2024 19:32:35 +0800
Subject: [PATCH] =?UTF-8?q?db=20=E8=B7=AF=E5=BE=84=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cppy/cp_util.py                               |   2 ++
 .../ORM/__pycache__/createDb.cpython-38.pyc   | Bin 1469 -> 0 bytes
 计算设备/数据库/tf-26.py               |  21 +++++++++++++-----
 3 files changed, 17 insertions(+), 6 deletions(-)
 delete mode 100644 计算设备/数据库/ORM/__pycache__/createDb.cpython-38.pyc

diff --git a/cppy/cp_util.py b/cppy/cp_util.py
index 76defb6..56fe658 100644
--- a/cppy/cp_util.py
+++ b/cppy/cp_util.py
@@ -10,6 +10,8 @@ testfilename = 'test.txt'
 testfilename = 'pride-and-prejudice.txt'
 testfilename = 'Prey.txt'
 
+db_filename = "tf.db"  
+
 site_packages = site.getsitepackages()
 for package in site_packages:
     if 'package' in  package:
diff --git a/计算设备/数据库/ORM/__pycache__/createDb.cpython-38.pyc b/计算设备/数据库/ORM/__pycache__/createDb.cpython-38.pyc
deleted file mode 100644
index 9de75d70923e09028b5d2049b116f66668930ec0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1469
zcmaJ>&2Jk;6yMoh@2=OouG=Olq-pOy#JN`$YDx*J5J75OA&o4J);q7sCi~&cu1nk-
zG7_hX1FAS6L@YSaOT-xvC;k8qoaPEiTkhO>Z=EJN6vmq8_cilAesA_+82SdTzrTG2
z&l-mDCkYo9>Wn+M%Ri7vL$cJ!7-yNu&CKFfW^+4h@CGBBnL3%v-I}*jFKhB<&D*KZ
zeY7{yRu=Gp8Q@M09)iEyKD<=Z4qTqG8RJ)K=_*`-U}o|K>A=F*#y2Kk1O|)JmEKd6
zFTHQbru08Eqz~cL;@41a$pGb`mfwQ6Ww>Xm-|M@UVPVG9Z{QzZCk|tWyDNt`V2OBX
zZyDY8E3C}uHgp&(h$;|}Zznlu=iMS5XSsIo=M`*&(#}?;l6+hH8-;>oJO2PCU8Xw{
z;xtlGl{^M9j7mUVpddv>k(WEkXcHAJITVkQ6!Iv8Cw{q~CKcRTTU+a+&4zfVh$)AQ
z%SPc2?(#MgFgTM2Hzng1*wB!sw6GHn@-Ff=@*eS1#+%^FhIFKhx|Z~?zNYs2a8PYv
zc<xuo)tQw2=a|+=C0V2<Vy`a68RyCV7<Bk?q2z`F<nwr<Jvv0$<B9e#iuc5*7>%(&
zC^x%-_Jp9agwVbaSs}+M@qrNg<0w6~ghEu&a9+O<%EFoyRjAEGDjG5EQGiiY?PxbH
zu;F>7JkmEl!CcDchPqB?i2MUc;#&hW?8&H#25<l>PD&_OlYDigift8T83MIhR+AJ~
zv#6{<4gUK1yBCL_p8PO7{^g6o%cI$gqpw~b{d)ZU=Yx}HKb|~2I{xX)!AB219L$H{
z-mo{Cs1`<A!d=oE@tDm5{CTX_|2JYA==^_(AxeZ+qect=5ixtprid2=XV`^v?9?T^
zjCZIB;?XH036y;mp#DjC4rdP=N$IL(BA1bDcH8PI2@6CPiBK))%~#h*th;Yh0Ns2Y
zVWJ!~@z!hL1zt{Qs1A`cB<9=-=_t(`xJ$}w-YE||)n>JYW+aP}T!`*XP2(S>@eX7Y
zWzyNRX{d9lL+j;pryfpU@4_QfE*{eD3l4?K=EGtZr4HiJXwr*EVq7JuYLc&g7oVlJ
z=hGz<MMJ6GXjs-7%#CJG2;PdvO5x-Q^wIWik>or$eYk>Ld2nyNzkYXp>pk)C!F}z_
zKNRz}Qv>RDqxv8zt5Q1(vf?plFM}$gLDl~02PR6>H#Jdvx98929fp^cH<7HIPF!F+
T)`Hb$z7<#<x6|~@fcfUX#a)kn

diff --git a/计算设备/数据库/tf-26.py b/计算设备/数据库/tf-26.py
index 4c3584a..8288778 100644
--- a/计算设备/数据库/tf-26.py
+++ b/计算设备/数据库/tf-26.py
@@ -1,5 +1,5 @@
 import sqlite3, os.path
-from cppy.cp_util import *
+from cppy.cp_util import testfilepath,db_filename,extract_file_words
 
 
 # 数据库表结构
@@ -45,17 +45,26 @@ def load_file_into_database(path_to_file, connection):
     connection.commit()
     c.close()
 
-
+#######################################################
 # 建数据库，处理数据入库
-db_path = 'tfdb'
-if not os.path.isfile(db_path):
-    with sqlite3.connect(db_path) as connection:
+#######################################################
+
+# 获取当前文件所在的目录  
+current_dir = os.path.dirname(os.path.abspath(__file__))   
+# 构造数据库文件的完整路径  
+db_file_path = os.path.join(current_dir, db_filename)    
+
+if os.path.exists(db_file_path):          
+    os.remove(db_file_path)   
+
+if not os.path.isfile(db_file_path):
+    with sqlite3.connect(db_file_path) as connection:
         create_db_schema(connection)
         load_file_into_database(testfilepath, connection)
 
 
 # 查询输出
-with sqlite3.connect(db_path) as connection:
+with sqlite3.connect(db_file_path) as connection:
     c = connection.cursor()
     c.execute("SELECT value, COUNT(*) as C FROM words GROUP BY value ORDER BY C DESC LIMIT 10")
     for row in c.fetchall():