Skip to content

沈秋雨 / import_hk_songs

Go to a project
Toggle navigation
Toggle navigation pinning
Commit b13789b3 b13789b3e9c696353483b54953216ba84d4157db by 沈秋雨
Options

fix(reader): 修正record_name字段查询及解析逻辑

1 parent 8c52adbf
Inline Side-by-side
Showing 2 changed files with 12 additions and 9 deletions
...@@ -38,7 +38,8 @@ SELECT ...@@ -38,7 +38,8 @@ SELECT
38 mr.album_audio_id, 38 mr.album_audio_id,
39 sar.is_main_version, 39 sar.is_main_version,
40 mr.is_high, 40 mr.is_high,
41 mr.pub_time 41 mr.pub_time,
42 mr.record_name
42 FROM hk_song_and_record sar 43 FROM hk_song_and_record sar
43 JOIN hk_music_record mr ON mr.id = sar.record_id 44 JOIN hk_music_record mr ON mr.id = sar.record_id
44 WHERE sar.song_id IN ({placeholders}) 45 WHERE sar.song_id IN ({placeholders})
...@@ -64,7 +65,8 @@ SELECT ...@@ -64,7 +65,8 @@ SELECT
64 mr.album_audio_id, 65 mr.album_audio_id,
65 sar.is_main_version, 66 sar.is_main_version,
66 mr.is_high, 67 mr.is_high,
67 mr.pub_time 68 mr.pub_time,
69 mr.record_name
68 FROM hk_song_and_record sar 70 FROM hk_song_and_record sar
69 JOIN hk_music_record mr ON mr.id = sar.record_id 71 JOIN hk_music_record mr ON mr.id = sar.record_id
70 WHERE mr.id IN ({placeholders}) 72 WHERE mr.id IN ({placeholders})
...@@ -88,7 +90,8 @@ SELECT ...@@ -88,7 +90,8 @@ SELECT
88 mr.album_audio_id, 90 mr.album_audio_id,
89 sar.is_main_version, 91 sar.is_main_version,
90 mr.is_high, 92 mr.is_high,
91 mr.pub_time 93 mr.pub_time,
94 mr.record_name
92 FROM hk_song_and_record sar 95 FROM hk_song_and_record sar
93 JOIN hk_music_record mr ON mr.id = sar.record_id 96 JOIN hk_music_record mr ON mr.id = sar.record_id
94 WHERE sar.song_id IN ({placeholders}) 97 WHERE sar.song_id IN ({placeholders})
......
...@@ -441,7 +441,7 @@ def _prepare_qq_payload(hk_row: dict, pr: dict, bucket, base_url, sp: dict, sing ...@@ -441,7 +441,7 @@ def _prepare_qq_payload(hk_row: dict, pr: dict, bucket, base_url, sp: dict, sing
441 441
442 platform_song_id = int(pr['platform_mid']) if pr.get('platform_mid') else song_id_int 442 platform_song_id = int(pr['platform_mid']) if pr.get('platform_mid') else song_id_int
443 song_uuid = str(uuid.uuid4()) 443 song_uuid = str(uuid.uuid4())
444 title, version = split_title_version(sp.get('title') or hk_row['name']) 444 title, version = split_title_version(pr['record_name'])
445 song_row = { 445 song_row = {
446 'song_uuid': song_uuid, 446 'song_uuid': song_uuid,
447 'platform_song_id': platform_song_id, 447 'platform_song_id': platform_song_id,
...@@ -554,7 +554,7 @@ def _prepare_kugou_payload(hk_row: dict, pr: dict, bucket, base_url, sp: dict, s ...@@ -554,7 +554,7 @@ def _prepare_kugou_payload(hk_row: dict, pr: dict, bucket, base_url, sp: dict, s
554 }) 554 })
555 555
556 song_uuid = str(uuid.uuid4()) 556 song_uuid = str(uuid.uuid4())
557 title, version = split_title_version(sp.get('title') or hk_row['name']) 557 title, version = split_title_version(pr['record_name'])
558 song_row = { 558 song_row = {
559 'song_uuid': song_uuid, 559 'song_uuid': song_uuid,
560 'platform_song_id': song_id, 560 'platform_song_id': song_id,
...@@ -679,7 +679,7 @@ def _prepare_netease_payload(hk_row: dict, pr: dict, bucket, base_url, sp: dict, ...@@ -679,7 +679,7 @@ def _prepare_netease_payload(hk_row: dict, pr: dict, bucket, base_url, sp: dict,
679 }) 679 })
680 680
681 song_uuid = str(uuid.uuid4()) 681 song_uuid = str(uuid.uuid4())
682 title, version = split_title_version(sp.get('title') or hk_row['name']) 682 title, version = split_title_version(pr['record_name'])
683 song_row = { 683 song_row = {
684 'song_uuid': song_uuid, 684 'song_uuid': song_uuid,
685 'platform_song_id': song_id, 685 'platform_song_id': song_id,
...@@ -986,7 +986,7 @@ def _process_qq( ...@@ -986,7 +986,7 @@ def _process_qq(
986 # 写入 song 986 # 写入 song
987 platform_song_id = int(pr['platform_mid']) if pr.get('platform_mid') else song_id_int 987 platform_song_id = int(pr['platform_mid']) if pr.get('platform_mid') else song_id_int
988 song_uuid = str(uuid.uuid4()) 988 song_uuid = str(uuid.uuid4())
989 title, version = split_title_version(sp.get('title') or hk_row['name']) 989 title, version = split_title_version(pr['record_name'])
990 upsert_qq_songs(pg_cur, [{ 990 upsert_qq_songs(pg_cur, [{
991 'song_uuid': song_uuid, 991 'song_uuid': song_uuid,
992 'platform_song_id': platform_song_id, 992 'platform_song_id': platform_song_id,
...@@ -1122,7 +1122,7 @@ def _process_kugou( ...@@ -1122,7 +1122,7 @@ def _process_kugou(
1122 }]) 1122 }])
1123 1123
1124 song_uuid = str(uuid.uuid4()) 1124 song_uuid = str(uuid.uuid4())
1125 title, version = split_title_version(sp.get('title') or hk_row['name']) 1125 title, version = split_title_version(pr['record_name'])
1126 upsert_kugou_songs(pg_cur, [{ 1126 upsert_kugou_songs(pg_cur, [{
1127 'song_uuid': song_uuid, 1127 'song_uuid': song_uuid,
1128 'platform_song_id': song_id, 1128 'platform_song_id': song_id,
...@@ -1270,7 +1270,7 @@ def _process_netease( ...@@ -1270,7 +1270,7 @@ def _process_netease(
1270 }]) 1270 }])
1271 1271
1272 song_uuid = str(uuid.uuid4()) 1272 song_uuid = str(uuid.uuid4())
1273 title, version = split_title_version(sp.get('title') or hk_row['name']) 1273 title, version = split_title_version(pr['record_name'])
1274 upsert_netease_songs(pg_cur, [{ 1274 upsert_netease_songs(pg_cur, [{
1275 'song_uuid': song_uuid, 1275 'song_uuid': song_uuid,
1276 'platform_song_id': song_id, 1276 'platform_song_id': song_id,
......