Skip to content

Commit

Permalink
🍬重构Config.py #155 #191 #202 #203 #206 #220 #226 #227 #243 #267 #287 #294
Browse files Browse the repository at this point in the history 
 #312 #320 #332 #335 #341 #343 #346 #355 #357 #360 #361 #362 #364 #365 #367 #370 #372 #374 #376 #377 #379 #380 #381 #382 #383 #393 #394 #397 #398 #399 #401 #402 #403 #404 #406 #407 #408 #410 #414 #416 #419 #420 #422 #423 #426 #431 #432 #433 #434 #435 #436 #437 #446 #448 #449 #450 #451 #452 #454 #455 #456 #567 #460 #466 #469 #470 #471 #472 #475 #476 #477 #480 #481 #483 #484 #485

1、改用ConfigObj来操作配置文件，可保存配置文件的注释
#155 #191 #202 #203 #206 #220 #226 #227 #243 #267 #287 #294 #312 #320 #332 #335 #341 #343 #346 #355 #357 #360 #361 #362 #364 #365 #367 #370 #372 #374 #376 #377 #379 #380 #381 #382 #383 #393 #394 #397 #398 #399 #401 #402 #403 #404 #406 #407 #408 #410 #414 #416 #419 #420 #422 #423 #426 #431 #432 #433 #434 #435 #436 #437 #446 #448 #449 #450 #451 #452 #454 #455 #456 #567 #460 #466 #469 #470 #471 #472 #475 #476 #477 #480 #481 #483 #484 #485
  • Loading branch information
@Johnserf-Seed
Johnserf-Seed committed Aug 4, 2023
1 parent 3d9db1b commit ec387a3
Showing 1 changed file with 61 additions and 30 deletions.
91 changes: 61 additions & 30 deletions Util/Config.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def __init__(self):
'music': 'yes',
'path': 'Download',
'mode': 'post',
'cookie':'',
'cookie':'请扫码登录，cookie会自动保存',
'interval':'0',
'update':'yes'
}
Expand All @@ -37,58 +37,89 @@ def check(self):
Returns:
self.cf: 配置文件对象
"""
# 实例化读取配置文件
self.cf = Util.configparser.RawConfigParser()

if Util.os.path.isfile("conf.ini") == True:
# 用utf-8防止出错
self.cf.read("conf.ini", encoding="utf-8")
self.cf = Util.ConfigObj('conf.ini', encoding='utf-8')
else:
print('[ 提示 ]:没有检测到配置文件，生成中!\r')
Util.console.print('[ 提示 ]:没有检测到配置文件，生成中!\r')
Util.log.info('[ 提示 ]:没有检测到配置文件，生成中!')
try:
# 实例化读取配置文件
self.cf = Util.ConfigObj('conf.ini', encoding='utf-8')
# 往配置文件写入内容
self.cf.add_section("uid")
self.cf.set("uid", "uid", "https://v.douyin.com/JcjJ5Tq/")
self.cf.add_section("music")
self.cf.set("music", "music", "yes")
# self.cf.add_section("path")
# self.cf.set("path", "path", ".\\Download\\")
self.cf.add_section("mode")
self.cf.set("mode", "mode", "post")
self.cf.add_section("cookie")
self.cf.set("cookie", "cookie", "#从web端获取后粘贴")
self.cf.add_section("interval")
self.cf.set("interval", "interval", "0")
self.cf.add_section("update")
self.cf.set("update", "update", "yes")
with open("conf.ini", "w") as f:
self.cf.write(f)
print('[ 提示 ]:生成成功!\r')
Util.log.info('[ 提示 ]:生成成功!')
self.cf['uid'] = 'https://v.douyin.com/JcjJ5Tq/'
# 添加注释
self.cf.comments['uid'] = ['用户主页(非视频链接)',
'单视频请用TikTokDownload或TikTokWeb']
self.cf['music'] = 'yes'
self.cf.comments['music'] = ['',
'视频原声保存(yes|no)']
self.cf['path'] = 'Download'
self.cf.comments['path'] = ['',
'作品保存位置，只支持相对路径',
'不了解不用修改']
self.cf['mode'] = 'post'
self.cf.comments['mode'] = ['',
'下载模式(post|like|listcollection)',
'下载喜欢、收藏视频请确保开放所有人可见']
self.cf['cookie'] = ''
self.cf.comments['cookie'] = ['',
'置空该选项本程序会自动打开二维码获取cookie',
'本程序不会共享、存储、处理、加密、上传你的cookie配置',
'请妥善保管你个人的cookie信息，发issues贴log文件的时候注意脱敏，防止泄露！']
self.cf['interval'] = '0'
self.cf.comments['interval'] = ['',
'根据作品发布日期区间下载作品',
'例如2022-01-01|2023-01-01下载的是2022年所有作品',
'填0即是下载全部时间']
self.cf['update'] = 'yes'
self.cf.comments['update'] = ['',
'选择是否自动更新(yes|no)',
'由于更新频率快，默认yes可以保持最新版本']
# 写入到文件
self.cf.filename = 'conf.ini'
self.cf.write()
Util.console.print('[ 配置 ]:配置文件生成成功!\r')
Util.log.info('[ 配置 ]:配置文件生成成功!')

except Exception as writeiniError:
Util.log.error(writeiniError)
Util.console.print('[ 配置 ]:配置文件写入失败!\r')
Util.log.error('[ 配置 ]:配置文件写入失败! %s' % writeiniError)
self.download()

return self.cf

def download(self) -> None:
"""
下载配置文件
"""
try:
print('[ 提示 ]:从GitHub为您下载配置文件!\r')
Util.console.print('[ 提示 ]:从GitHub为您下载配置文件!\r')
Util.log.info('[ 提示 ]:从GitHub为您下载配置文件!')
r = Util.requests.get(
'https://cdn.jsdelivr.net/gh/Johnserf-Seed/TikTokDownload@main/conf.ini')
with open("conf.ini", "w") as f:
f.write(r.content)
print('[ 提示 ]:下载配置成功!\r')
Util.console.print('[ 提示 ]:下载配置成功!\r')
Util.log.info('[ 提示 ]:下载配置成功!')
except Exception as iniError:
print('[ 提示 ]:下载失败，请检查网络!\r')
Util.console.print('[ 提示 ]:下载失败，请检查网络!\r')
Util.log.info('[ 提示 ]:下载失败，请检查网络!')
Util.log.error(iniError)
return

if __name__ == '__main__':
Config()
def save(self, cookie) -> None:
if Util.os.path.isfile("conf.ini") == True:
# 用utf-8防止出错
self.cf = Util.ConfigObj('conf.ini', encoding='utf-8')
self.cf['cookie'] = cookie
# 写入到文件
self.cf.filename = 'conf.ini'
self.cf.write()
Util.console.print('[ 配置 ]:cookie更新成功!\r')
Util.log.info('[ 配置 ]:cookie更新成功!')
Util.log.info(cookie)
else:
self.check()

return self.cf

0 comments on commit ec387a3

Please sign in to comment.