diff --git a/minet/cli/crowdtangle/summary.py b/minet/cli/crowdtangle/summary.py index 017698c6dd..3db95cef4d 100644 --- a/minet/cli/crowdtangle/summary.py +++ b/minet/cli/crowdtangle/summary.py @@ -10,7 +10,7 @@ from minet.cli.crowdtangle.utils import with_crowdtangle_utilities from minet.crowdtangle.constants import ( CROWDTANGLE_SUMMARY_CSV_HEADERS, - CROWDTANGLE_POST_CSV_HEADERS_WITH_LINK, + CROWDTANGLE_POST_CSV_HEADERS, ) # TODO: could be a nested loading bar @@ -25,7 +25,7 @@ def action(cli_args, client, enricher, loading_bar): if cli_args.posts is not None: posts_writer = casanova.writer( - cli_args.posts, fieldnames=CROWDTANGLE_POST_CSV_HEADERS_WITH_LINK + cli_args.posts, fieldnames=["url"] + CROWDTANGLE_POST_CSV_HEADERS ) for row, url in enricher.cells(cli_args.column, with_rows=True): @@ -42,9 +42,9 @@ def action(cli_args, client, enricher, loading_bar): if cli_args.posts is not None: stats, posts = stats - if posts is not None: + if posts is not None and posts_writer is not None: for post in posts: - posts_writer.writerow(post.as_csv_row()) + posts_writer.writerow([url], post) enricher.writerow(row, stats.as_csv_row() if stats is not None else None) diff --git a/minet/crowdtangle/constants.py b/minet/crowdtangle/constants.py index f24aa2e39a..57a2ac9a3d 100644 --- a/minet/crowdtangle/constants.py +++ b/minet/crowdtangle/constants.py @@ -137,8 +137,6 @@ CROWDTANGLE_POST_CSV_HEADERS += CROWDTANGLE_ACCOUNT_CSV_HEADERS CROWDTANGLE_POST_CSV_HEADERS += CROWDTANGLE_MEDIA_CSV_HEADERS -CROWDTANGLE_POST_CSV_HEADERS_WITH_LINK = ["url"] + CROWDTANGLE_POST_CSV_HEADERS - CROWDTANGLE_SUMMARY_CSV_HEADERS = ["%s_count" % t for t in CROWDTANGLE_REACTION_TYPES] CROWDTANGLE_LEADERBOARD_CSV_HEADERS = [ diff --git a/minet/crowdtangle/formatters.py b/minet/crowdtangle/formatters.py index a5a2874cc9..b4feaf35f1 100644 --- a/minet/crowdtangle/formatters.py +++ b/minet/crowdtangle/formatters.py @@ -10,7 +10,6 @@ CROWDTANGLE_POST_TYPES, CROWDTANGLE_REACTION_TYPES, CROWDTANGLE_POST_CSV_HEADERS, - CROWDTANGLE_POST_CSV_HEADERS_WITH_LINK, CROWDTANGLE_SUMMARY_CSV_HEADERS, CROWDTANGLE_LEADERBOARD_CSV_HEADERS, CROWDTANGLE_LEADERBOARD_CSV_HEADERS_WITH_BREAKDOWN, @@ -27,14 +26,6 @@ json=["media"], ) -CrowdTanglePostWithLink = namedrecord( - "CrowdTanglePostWithLink", - CROWDTANGLE_POST_CSV_HEADERS_WITH_LINK, - boolean=["account_verified"], - plural=["links", "expanded_links"], - json=["media"], -) - CrowdTangleSummary = namedrecord("CrowdTangleSummary", CROWDTANGLE_SUMMARY_CSV_HEADERS) CrowdTangleLeaderboard = namedrecord( @@ -54,7 +45,7 @@ def map_key(key, target): return [item[key] for item in target] -def format_post(post, link=None): +def format_post(post): row = [ post["id"], post["platformId"], @@ -74,9 +65,6 @@ def format_post(post, link=None): post.get("liveVideoStatus"), ] - if link: - row = [link] + row - stats = post["statistics"] actual_stats = stats["actual"] expected_stats = stats["expected"] @@ -110,9 +98,6 @@ def format_post(post, link=None): ] ) - if link is not None: - return CrowdTanglePostWithLink(*row) - return CrowdTanglePost(*row) diff --git a/minet/crowdtangle/summary.py b/minet/crowdtangle/summary.py index 26d77bdd6f..593c127d91 100644 --- a/minet/crowdtangle/summary.py +++ b/minet/crowdtangle/summary.py @@ -76,6 +76,6 @@ def crowdtangle_summary( else: if not raw: - posts = [format_post(post, link=link) for post in posts] + posts = [format_post(post) for post in posts] return stats, posts diff --git a/minet/crowdtangle/types.py b/minet/crowdtangle/types.py index c7c7268837..4354c741a6 100644 --- a/minet/crowdtangle/types.py +++ b/minet/crowdtangle/types.py @@ -67,11 +67,6 @@ class CrowdTanglePost(TabularRecord): media: Any = tabular_field(as_json=True) -@dataclass -class CrowdTanglePostWithLink(TabularRecord): - pass - - @dataclass class CrowdTangleSummary(TabularRecord): pass