libs/rt-thread
libs/rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4587 from Guozhanxin/file_check

Browse Source 
[update] file_check.py, Improve compatibility.
This commit is contained in:
Bernard Xiong 2021-04-09 15:46:50 +08:00 committed by GitHub
commit c6dae74401
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/file_check.py
View File

@ -80,9 +80,9 @@ class CheckOut:
def get_new_file(self): def get_new_file(self):
file_list = list() file_list = list()
try: try:
os.system('git remote add rtt_repo {} 1>/dev/null'.format(self.rtt_repo)) os.system('git remote add rtt_repo {}'.format(self.rtt_repo))
os.system('git fetch rtt_repo 1>/dev/null') os.system('git fetch rtt_repo')
os.system('git reset rtt_repo/{} --soft 1>/dev/null'.format(self.rtt_branch)) os.system('git reset rtt_repo/{} --soft'.format(self.rtt_branch))
os.system('git status > git.txt') os.system('git status > git.txt')
except Exception as e: except Exception as e:
logging.error(e) logging.error(e)
@ -119,7 +119,7 @@ class FormatCheck:
def __check_file(self, file_lines, file_path): def __check_file(self, file_lines, file_path):
line_num = 1 line_num = 1
check_result = False check_result = True
for line in file_lines: for line in file_lines:
# check line start # check line start
line_start = line.replace(' ', '') line_start = line.replace(' ', '')
@ -140,7 +140,7 @@ class FormatCheck:
logging.info("Start to check files format.") logging.info("Start to check files format.")
if len(self.file_list) == 0: if len(self.file_list) == 0:
logging.warning("There are no files to check license.") logging.warning("There are no files to check license.")
return 0 return True
encoding_check_result = True encoding_check_result = True
format_check_result = True format_check_result = True
for file_path in self.file_list: for file_path in self.file_list:
@ -156,13 +156,13 @@ class FormatCheck:
else: else:
continue continue
if code != 'utf-8': if code != 'utf-8' and code != 'ascii':
logging.error("[{0}]: encoding not utf-8, please format it.".format(file_path)) logging.error("[{0}]: encoding not utf-8, please format it.".format(file_path))
encoding_check_result = False encoding_check_result = False
else: else:
logging.info('[{0}]: encoding check success.'.format(file_path)) logging.info('[{0}]: encoding check success.'.format(file_path))
with open(file_path, 'r') as f: with open(file_path, 'r', encoding = "utf-8") as f:
file_lines = f.readlines() file_lines = f.readlines()
format_check_result = self.__check_file(file_lines, file_path) format_check_result = self.__check_file(file_lines, file_path)