调整目录结构

JakLiao · Feb 3, 2019 · 90a9073 · 90a9073
1 parent bcd07be
commit 90a9073
Show file tree

Hide file tree

Showing 14 changed files with 17 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -18,18 +18,17 @@
 
 1.手动配置config.py文件的设置项，比如姓氏、出生时间
 
-2.执行`python main.py`运行程序，看输出日志，初始化数据后这次运行Ctrl+C终止
-
-3. 注意"综合计算的结果"开头的这行结果，记下组合中出现的笔画数字。
-
-4. 从full_wuxing_dict.py挑选第3步骤中笔画的字，填写到self_wuxing_dict.py文件中的金木水火土对应的位置。
-
-5. 再次执行`python main.py`运行程序，喝杯咖啡后再回来看name.txt文件的结果吧。
+2.执行`python main.py`运行程序，看输出日志，初始化数据后这次运行Ctrl+C终止。
 
+3.注意"综合计算的结果"开头的这行结果，记下组合中出现的笔画数字。
 ```
 综合计算的结果： 2 [(3, 15, '土金金', '大吉'), (11, 7, '土土金', '大吉')]
 ```
 
+4.从`data/full_wuxing_dict.py`挑选第3步骤中笔画的字，填写到`data/self_wuxing_dict.py`文件中的金木水火土对应的位置。比如上面的例子，则选填笔画为3/7/11/15的字。
+
+5.再次执行`python main.py`运行程序，喝杯咖啡后再回来看name.txt文件的结果吧。
+
 ### 参考起名的方法：
 
 * 三才五格
@@ -40,4 +39,4 @@
 * 单个名确认后再起名
 
 #### 结语
-代码完全开放公开，如果有用，请点下Star表示支持。
+代码完全开放公开，如果有用，请点下Star表示支持。
diff --git a/name.txt → conf/__init__.py b/name.txt → conf/__init__.py
diff --git a/config.py → conf/config.py b/config.py → conf/config.py
diff --git a/constants.py → conf/constants.py b/constants.py → conf/constants.py
diff --git a/name_tested.txt → data/__init__.py b/name_tested.txt → data/__init__.py
diff --git a/baijiaxing.txt → data/baijiaxing.txt b/baijiaxing.txt → data/baijiaxing.txt
diff --git a/full_wuxing_dict.py → data/full_wuxing_dict.py b/full_wuxing_dict.py → data/full_wuxing_dict.py
diff --git a/sancai.txt → data/sancai.txt b/sancai.txt → data/sancai.txt
diff --git a/self_wuxing_dict.py → data/self_wuxing_dict.py b/self_wuxing_dict.py → data/self_wuxing_dict.py
diff --git a/三才五格姓名学(整理).doc → doc/三才五格姓名学(整理).doc b/三才五格姓名学(整理).doc → doc/三才五格姓名学(整理).doc
diff --git a/main.py b/main.py
@@ -4,12 +4,11 @@
 import random
 import traceback
 from collections import defaultdict
-import config
-import constants
-from config import LAST_NAME, MIN_SINGLE_NUM, MAX_SINGLE_NUM, SELECTED_SANCAI, SELECTED_XITONGSHEN
+from conf import config, constants
+from conf.config import LAST_NAME, MIN_SINGLE_NUM, MAX_SINGLE_NUM, SELECTED_SANCAI, SELECTED_XITONGSHEN
 import utils
 import time
-import self_wuxing_dict as w  # 自选用 self_wuxing_dict ，全集用 wuxing_dict
+from data import self_wuxing_dict as w
 
 g_sancai_wuxing_dict = {}
 g_baijiaxing_dict = {}  # 百家姓最佳搭配

diff --git a/result/name.txt b/result/name.txt
diff --git a/result/name_tested.txt b/result/name_tested.txt
diff --git a/utils.py b/utils.py
@@ -1,18 +1,17 @@
 from collections import defaultdict
 from urllib import parse
 import requests
-import constants
-import config
-import full_wuxing_dict as fwd
-from config import MIN_SINGLE_NUM, MAX_SINGLE_NUM, SEX, THRESHOLD_SCORE
+from conf import config, constants
+from data import full_wuxing_dict as fwd
+from conf.config import MIN_SINGLE_NUM, MAX_SINGLE_NUM, SEX, THRESHOLD_SCORE
 import urllib
 from http import cookiejar
 from urllib import request
 
-TESTED_FILE = 'name_tested.txt'  # 已经在网站测试过的名字
-RESULT_FILE = 'name.txt'  # 结果算到的好名字
-SANCAI_FILE = 'sancai.txt'  # 三才五行参考结语
-BAIJIAXING_FILE = 'baijiaxing.txt'  # 百家姓最佳搭配
+TESTED_FILE = 'result/name_tested.txt'  # 已经在网站测试过的名字
+RESULT_FILE = 'result/name.txt'  # 结果算到的好名字
+SANCAI_FILE = 'data/sancai.txt'  # 三才五行参考结语
+BAIJIAXING_FILE = 'data/baijiaxing.txt'  # 百家姓最佳搭配
 
 
 def getTestedDict():