mac

Author: ablozhou

.gitignore

@@ -1,4 +1,5 @@
 __pycache__
 dist/
 build/
-.vscode
+.vscode
+.*

Pipfile

@@ -1,5 +1,5 @@
 [[source]]
-url = "http://mirrors.aliyun.com/pypi/simple/"
+url = "https://mirrors.aliyun.com/pypi/simple/"
 verify_ssl = true
 name = "pypi"
 

Pipfile.lock

@@ -53,6 +53,10 @@
 
 
 ## 运行
+### Windows
 下载zip包，执行双击 typewords.exe
 
 运行后，可点击左上角图标，在下拉菜单中选“属性”，设置字体Font，方便孩子看得更清楚。
+### Mac
+下载zip包，命令行或双击执行 typewords
+

Readme.md

@@ -2,19 +2,31 @@
 import random
 import excel
 import time
-from colorama import init, Fore#, Style # Back
-
+import sys
+import os
+from colorama import init, Fore, Back#, Style # Back
+from os import path
+debug = False
+#data = path.abspath(path.join(path.dirname(__file__), 'words.xlsx'))
+data = path.abspath(path.join(path.dirname(sys.argv[0])))+'/words.xlsx'
 class TypeWords:
     help_cmds={"/help":"相关命令帮助", "/exit":"退出","/choose":"选类别,[99]为全部","/next":"下一个类别"}
     params = {"exit":False, "type":99}
     sheetnames={}
 
     def __init__(self):
-        
+        if debug:
+            print( 'sys.argv[0] is', sys.argv[0] )
+            print( 'sys.executable is', sys.executable )
+            print( 'os.getcwd is', os.getcwd() )
+            bundle_dir = path.abspath(path.dirname(__file__))
+            print( 'bundle_dir is', bundle_dir)
+            print( '__file__ path is ',path.dirname(__file__))        
+            print( 'data is',data)        
         self.points = 0
         self.dicts={}
         # get words
-        self.words = excel.ReadExcel('words.xlsx')
+        self.words = excel.ReadExcel(data)
         self.cmds={"/help":self.help_print, "/choose":self.choose_types,"/exit":self.exit,
         "/next":self.next_type}
 
@@ -71,7 +83,7 @@ def practise(self):
             leng = len(word)
             print()
             print(Fore.CYAN+"---points: %d---" % (self.points, ))
-            print(Fore.WHITE+self.dicts[word])
+            print(Fore.RESET+self.dicts[word])
             print(Fore.GREEN)
             print(word)
             print(Fore.YELLOW, end="")
@@ -98,4 +110,4 @@ def practise(self):
 if __name__ == '__main__':
     init()
     t = TypeWords()
-    t.practise()
+    t.practise()

typewords.py

@@ -7,7 +7,7 @@ block_cipher = None
 a = Analysis(['typewords.py'],
              pathex=[],
              binaries=[],
-             datas=[],
+             datas=[('words.xlsx', '.'), ('Readme.md', '.')],
              hiddenimports=[],
              hookspath=[],
              hooksconfig={},