LiuFuhua / xj-marketing

Go to a project
Toggle navigation Toggle navigation pinning
liufuhua007
941c82e0 1 parent b63460b0

fix merge

Inline Side-by-side
Showing 1 changed file with 0 additions and 6 deletions
...@@ -74,19 +74,15 @@ async def main(): ...@@ -74,19 +74,15 @@ async def main():
74 elif args.platform == SOCIAL_MEDIA_KUAISHOU: 74 elif args.platform == SOCIAL_MEDIA_KUAISHOU:
75 await ks_setup(str(account_file), handle=True) 75 await ks_setup(str(account_file), handle=True)
76 elif args.platform == SOCIAL_MEDIA_WANGYIHAO: 76 elif args.platform == SOCIAL_MEDIA_WANGYIHAO:
77 -<<<<<<< HEAD
78 await wyh_setup(str(account_file), handle=True, auto=False) 77 await wyh_setup(str(account_file), handle=True, auto=False)
79 # elif args.platform == SOCIAL_MEDIA_XHS: 78 # elif args.platform == SOCIAL_MEDIA_XHS:
80 # await xhs_setup(str(account_file), handle=True) 79 # await xhs_setup(str(account_file), handle=True)
81 -=======
82 await wyh_setup(str(account_file), handle=True) 80 await wyh_setup(str(account_file), handle=True)
83 elif args.platform == SOCIAL_MEDIA_XHS: 81 elif args.platform == SOCIAL_MEDIA_XHS:
84 await xhs_setup(str(account_file), handle=True) 82 await xhs_setup(str(account_file), handle=True)
85 ->>>>>>> 137c8c81e73faaa366d86e49e291228c805236a3
86 elif args.platform == SOCIAL_MEDIA_TOUTIAO: 83 elif args.platform == SOCIAL_MEDIA_TOUTIAO:
87 await toutiao_setup(str(account_file), handle=True, auto=False) 84 await toutiao_setup(str(account_file), handle=True, auto=False)
88 elif args.platform == SOCIAL_MEDIA_BAIJIAHAO: 85 elif args.platform == SOCIAL_MEDIA_BAIJIAHAO:
89 -<<<<<<< HEAD
90 await toutiao_setup(str(account_file), handle=True, auto=False) 86 await toutiao_setup(str(account_file), handle=True, auto=False)
91 87
92 elif args.action == 'auto_login': 88 elif args.action == 'auto_login':
...@@ -107,11 +103,9 @@ async def main(): ...@@ -107,11 +103,9 @@ async def main():
107 await toutiao_setup(str(account_file), handle=True, auto=True) 103 await toutiao_setup(str(account_file), handle=True, auto=True)
108 elif args.platform == SOCIAL_MEDIA_BAIJIAHAO: 104 elif args.platform == SOCIAL_MEDIA_BAIJIAHAO:
109 await toutiao_setup(str(account_file), handle=True, auto=True) 105 await toutiao_setup(str(account_file), handle=True, auto=True)
110 -=======
111 await toutiao_setup(str(account_file), handle=True) 106 await toutiao_setup(str(account_file), handle=True)
112 elif args.platform == SOCIAL_MEDIA_SOHU: 107 elif args.platform == SOCIAL_MEDIA_SOHU:
113 await sohu_setup(str(account_file), handle=True) 108 await sohu_setup(str(account_file), handle=True)
114 ->>>>>>> 137c8c81e73faaa366d86e49e291228c805236a3
115 109
116 elif args.action == 'upload': 110 elif args.action == 'upload':
117 title, tags = get_title_and_hashtags(args.video_file) 111 title, tags = get_title_and_hashtags(args.video_file)
......