diff --git a/Common.py b/Common.py index e45d1a6..ebc05a7 100644 --- a/Common.py +++ b/Common.py @@ -12,6 +12,8 @@ from bilibili import Bilibili, VideoPart config = { # 录像的主播ID "l_u": "97621754276", + # 视频位置 + "path": ".", # 标题及预留时间位置 "t_t": "【永恒de草薙直播录播】直播于 {}", # 标签 @@ -414,7 +416,7 @@ def uploadVideo(name): loginBilibili() doClean() if forceNotUpload is False: - b.preUpload(VideoPart(title=name, path=os.path.basename(name))) + b.preUpload(VideoPart(path=name, title=os.path.basename(name))) else: appendUploadStatus("设置了不上传,所以[{}]不会上传了".format(name)) if not forceNotEncode: diff --git a/liveDownloader.py b/liveDownloader.py index b8ae667..cde0b2d 100644 --- a/liveDownloader.py +++ b/liveDownloader.py @@ -14,15 +14,18 @@ def download(): Common.appendError("Download with No StreamUrl Specific") break path = datetime.strftime(datetime.now(), "%Y%m%d_%H%M.flv") + base_path = Common.config["path"] + if not os.path.isdir(base_path): + os.makedirs(base_path) try: p = session.get(Common.streamUrl, stream=True, timeout=3) p.raise_for_status() except Exception as e: Common.appendError("Download >{}< with Exception [{}]".format(path,e.__str__())) break - Common.api.initSave(path+".xml") + Common.api.initSave(os.path.join(base_path, path)+".xml") Common.appendDownloadStatus("Download >{}< Start".format(path)) - f = open(path, "wb") + f = open(os.path.join(base_path, path), "wb") _size = 0 try: for T in p.iter_content(chunk_size=Common.config["c_s"]):