diff --git a/PyPI/setup.cfg b/PyPI/setup.cfg index 01ce958..c516eb6 100644 --- a/PyPI/setup.cfg +++ b/PyPI/setup.cfg @@ -1,7 +1,7 @@ [metadata] # replace with your username: name = guan -version = 0.1.84 +version = 0.1.85 author = guanjihuan author_email = guanjihuan@163.com description = An open source python package diff --git a/PyPI/src/guan.egg-info/PKG-INFO b/PyPI/src/guan.egg-info/PKG-INFO index ab1c68f..c3305db 100644 --- a/PyPI/src/guan.egg-info/PKG-INFO +++ b/PyPI/src/guan.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: guan -Version: 0.1.84 +Version: 0.1.85 Summary: An open source python package Home-page: https://py.guanjihuan.com Author: guanjihuan diff --git a/PyPI/src/guan/file_reading_and_writing.py b/PyPI/src/guan/file_reading_and_writing.py index 9b8f42a..081205b 100644 --- a/PyPI/src/guan/file_reading_and_writing.py +++ b/PyPI/src/guan/file_reading_and_writing.py @@ -56,12 +56,13 @@ def open_file(filename='a', file_format='.txt', mode='add'): f = open(filename+file_format, 'w', encoding='UTF-8') return f -# 读取文本文件内容,如果不存在,则新建空文件,并返回空字符串 -def read_text_file(file_path='./a.txt'): +# 读取文本文件内容。如果文件不存在,返回空字符串 +def read_text_file(file_path='./a.txt', make_file=None): import os if not os.path.exists(file_path): - with open(file_path, 'w') as f: - pass + if make_file != None: + with open(file_path, 'w') as f: + pass return '' else: with open(file_path, 'r') as f: @@ -69,29 +70,41 @@ def read_text_file(file_path='./a.txt'): return content # 获取目录中的所有文件名 -def get_all_filenames_in_directory(directory='./', file_format=None): +def get_all_filenames_in_directory(directory='./', file_format=None, show_root_path=None): import os file_list = [] for root, dirs, files in os.walk(directory): for i0 in range(len(files)): if file_format == None: - file_list.append(files[i0]) + if show_root_path == None: + file_list.append(files[i0]) + else: + file_list.append(root+'/'+files[i0]) else: if file_format in files[i0]: - file_list.append(files[i0]) + if show_root_path == None: + file_list.append(files[i0]) + else: + file_list.append(root+'/'+files[i0]) return file_list # 获取目录中的所有文件名(不包括子目录) -def get_all_filenames_in_directory_without_subdirectory(directory='./', file_format=None): +def get_all_filenames_in_directory_without_subdirectory(directory='./', file_format=None, show_root_path=None): import os file_list = [] for root, dirs, files in os.walk(directory): for i0 in range(len(files)): if file_format == None: - file_list.append(files[i0]) + if show_root_path == None: + file_list.append(files[i0]) + else: + file_list.append(root+'/'+files[i0]) else: if file_format in files[i0]: - file_list.append(files[i0]) + if show_root_path == None: + file_list.append(files[i0]) + else: + file_list.append(root+'/'+files[i0]) break return file_list