Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
# Conflicts:
#	result.log
#	result.txt
  • Loading branch information
Guovin committed Apr 5, 2024
2 parents 5c10050 + ce791c9 commit e85f1fd
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## v1.0.2

### 2024/4/5

- 修复用户配置后接口更新结果与日志文件命名问题(Fix the issue of interface update results and log file naming after user configuration)

## v1.0.1

### 2024/4/1
Expand Down
10 changes: 2 additions & 8 deletions main.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,15 +113,9 @@ async def visitPage(self, channelItems):

def main(self):
asyncio.run(self.visitPage(getChannelItems()))
user_final_file = (
"user_" + config.final_file
if os.path.exists("user_" + config.source_file)
else getattr(config, "final_file", "result.txt")
)
user_final_file = getattr(config, "final_file", "result.txt")
user_log_file = (
"user_result.log"
if os.path.exists("user_" + config.source_file)
else "result.log"
"user_result.log" if os.path.exists("user_config.py") else "result.log"
)
updateFile(user_final_file, "result_new.txt")
updateFile(user_log_file, "result_new.log")
Expand Down
2 changes: 1 addition & 1 deletion version.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version": "1.0.1"
"version": "1.0.2"
}

0 comments on commit e85f1fd

Please sign in to comment.