From 3143694c7a92a787ae5eb06aef23294704e00155 Mon Sep 17 00:00:00 2001
From: guanjihuan <guanjihuan@163.com>
Date: Wed, 28 Feb 2024 09:41:05 +0800
Subject: [PATCH] 0.1.86

---
 PyPI/setup.cfg                            |  2 +-
 PyPI/src/guan.egg-info/PKG-INFO           |  2 +-
 PyPI/src/guan/file_reading_and_writing.py | 30 ++++++-----------------
 3 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/PyPI/setup.cfg b/PyPI/setup.cfg
index c516eb6..d040c31 100644
--- a/PyPI/setup.cfg
+++ b/PyPI/setup.cfg
@@ -1,7 +1,7 @@
 [metadata]
 # replace with your username:
 name = guan
-version = 0.1.85
+version = 0.1.86
 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 c3305db..303da7d 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.85
+Version: 0.1.86
 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 081205b..6bc65e4 100644
--- a/PyPI/src/guan/file_reading_and_writing.py
+++ b/PyPI/src/guan/file_reading_and_writing.py
@@ -70,42 +70,26 @@ def read_text_file(file_path='./a.txt', make_file=None):
         return content
 
 # 获取目录中的所有文件名
-def get_all_filenames_in_directory(directory='./', file_format=None, show_root_path=None):
+def get_all_filenames_in_directory(directory='./', file_format=None, show_root_path=0, sort=1, include_subdirectory=1):
     import os
     file_list = []
     for root, dirs, files in os.walk(directory):
         for i0 in range(len(files)):
             if file_format == None:
-                if show_root_path == None:
+                if show_root_path == 0:
                     file_list.append(files[i0])
                 else:
                     file_list.append(root+'/'+files[i0])
             else:
                 if file_format in files[i0]:
-                    if show_root_path == None:
+                    if show_root_path == 0:
                         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, 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:
-                if show_root_path == None:
-                    file_list.append(files[i0])
-                else:
-                    file_list.append(root+'/'+files[i0])
-            else:
-                if file_format in files[i0]:
-                    if show_root_path == None:
-                        file_list.append(files[i0])
-                    else:
-                        file_list.append(root+'/'+files[i0])
-        break
+        if include_subdirectory != 1:
+            break
+    if sort == 1:
+        sorted(file_list)
     return file_list
 
 # 获取文件夹中某种文本类型的文件以及读取所有内容