Merge pull request Samueli924#187 from yhm97/main

Samueli924 · web-flow · commit 4f1cceb32b2c · 2022-10-30T15:56:32.000+08:00
修复任务为音频时报错403
diff --git a/api/chaoxing.py b/api/chaoxing.py
@@ -192,7 +192,7 @@ def add_log(self, personid, courseid, classid, encode):
             self.logger.debug(resp.text)
             self.logger.debug("---resp.text info end---")
 
-    def main_pass_video(self, personid, dtoken, otherInfo, playingTime, clazzId, duration, jobid, objectId, userid, _tsp):
+    def main_pass_video(self, personid, dtoken, otherInfo, playingTime, clazzId, duration, jobid, objectId, userid, dtype, _tsp):
         url = 'https://mooc1-api.chaoxing.com/multimedia/log/a/{}/{}'.format(personid, dtoken)
         # print(url)
         params = {
@@ -208,7 +208,8 @@ def main_pass_video(self, personid, dtoken, otherInfo, playingTime, clazzId, dur
             'isdrag': '0',
             'enc': self.get_enc(clazzId, jobid, objectId, playingTime, duration, userid),
             'rt': '0.9',  # 'rt': '1.0',  ??
-            'dtype': 'Video',
+            # 'dtype': 'Video', 音频文件为Audio
+            'dtype': dtype,
             'view': 'pc',
             '_t': str(int(round( time.time()*1000)))
         }
@@ -218,9 +219,16 @@ def main_pass_video(self, personid, dtoken, otherInfo, playingTime, clazzId, dur
             mylist.append(my)
         params = "&".join(mylist)
         # print:(url+params)
-        return self.session.get(url, params=params).json()
+        tmp_response = self.session.get(url, params=params)
+        try:
+            result = tmp_response.json()
+        except Exception:
+            self.logger.debug("任务失败")
+            result = {'error': {'status_code': tmp_response.status_code, 'text': tmp_response.text}}
+        return result
+        # return self.session.get(url, params=params).json()
 
-    def pass_video(self, video_duration, cpi, dtoken, otherInfo, clazzid, jobid, objectid, userid, name, speed, _tsp):
+    def pass_video(self, video_duration, cpi, dtoken, otherInfo, clazzid, jobid, objectid, userid, name, speed, dtype, _tsp):
         sec = 58
         playingTime = 0
         print("当前播放速率："+str(speed)+"倍速")
@@ -237,6 +245,7 @@ def pass_video(self, video_duration, cpi, dtoken, otherInfo, clazzid, jobid, obj
                     jobid,
                     objectid,
                     userid,
+                    dtype,
                     _tsp
                 )
                 # print(res)
@@ -245,7 +254,7 @@ def pass_video(self, video_duration, cpi, dtoken, otherInfo, clazzid, jobid, obj
                     break
                 elif res.get('error'):
                     self.logger.debug("---result info begin---")
-                    self.logger.debug(res.get)
+                    self.logger.debug(res)
                     self.logger.debug("---result info end---")
                     raise Exception('出现错误')
                 continue
diff --git a/main.py b/main.py
@@ -71,7 +71,7 @@ def do_work(chaoxingAPI):
                 jobid = None
                 if "jobid" in attachments:
                     jobid = attachments["jobid"]
-                else: 
+                else:
                     if "jobid" in attachment:
                         jobid = attachment["jobid"]
                     elif attachment.get('property', False):
@@ -92,6 +92,10 @@ def do_work(chaoxingAPI):
                 #     else:
                 #         print("当前视频不支持倍速播放,跳过")
                 #         chaoxing.speed = set_speed
+                dtype = 'Video'
+                if 'audio' in attachment['property']['module']:
+                    dtype = 'Audio'
+
                 chaoxingAPI.pass_video(
                     video_info['duration'],
                     attachments['defaults']['cpi'],
@@ -103,6 +107,7 @@ def do_work(chaoxingAPI):
                     chaoxingAPI.uid,
                     attachment['property']['name'],
                     chaoxingAPI.speed,
+                    dtype,
                     chaoxingAPI.get_current_ms
                 )
                 ft.pause(10, 13)
