Move check formatting into custom Formatter

Author: domdfcoding

flake8_github_action/__init__.py

@@ -30,7 +30,6 @@
 from typing_extensions import NoReturn
 
 # this package
-from flake8_github_action.annotation import Annotation
 from flake8_github_action.flake8_app import Application
 
 __author__: str = "Dominic Davis-Foster"

flake8_github_action/__main__.py

@@ -53,3 +53,7 @@ def main(ctx: click.Context):
 
 if __name__ == "__main__":
 	sys.exit(main(obj={}))
+
+
+
+

flake8_github_action/annotation.py

@@ -30,25 +30,23 @@
 #  Copyright (C) 2012-2016 Ian Cordasco <graffatcolmingov@gmail.com>
 #  MIT Licensed
 #
+#  "GitHubFormatter" based on https://gitlab.com/pycqa/flake8-json
+#  Copyright (C) 2017-2018 Ian Stapleton Cordasco <graffatcolmingov@gmail.com>
+#  MIT Licensed
+#
 
 # stdlib
-import json
 from functools import partial
 from gettext import ngettext
-from io import StringIO
-from typing import List, Optional, Tuple, Type
+from typing import Optional, Tuple, Type
 
 # 3rd party
 import click
 import flake8.main.application  # type: ignore
 from flake8.formatting.base import BaseFormatter  # type: ignore
-from flake8_json_reporter.reporters import DefaultJSON  # type: ignore
 from typing_extensions import NoReturn
 
-# this package
-from flake8_github_action.annotation import Annotation
-
-__all__ = ["Application", "JsonFormatter"]
+__all__ = ["Application", "GitHubFormatter"]
 
 _error = partial(ngettext, "error", "errors")
 _file = partial(ngettext, "file", "files")
@@ -125,31 +123,47 @@ def make_formatter(self, formatter_class: Optional[Type[BaseFormatter]] = None)
 		Initialize a formatter based on the parsed options.
 		"""
 
-		self.formatter = JsonFormatter(self.options)
+		self.formatter = GitHubFormatter(self.options)
 
-	def report(self):
-		"""
-		Report errors, statistics, and benchmarks.
-		"""
 
-		super().report()
+class GitHubFormatter(BaseFormatter):
 
-		json_annotations = json.loads(self.formatter.output_fd.getvalue()).items()
+	def write_line(self, line):
+		"""
+		Override write for convenience.
+		"""
+		self.write(line, None)
 
-		for filename, raw_annotations in json_annotations:
-			if raw_annotations:
-				print(filename)
+	def start(self):
+		super().start()
+		self.files_reported_count = 0
 
-			for annotation in raw_annotations:
-				print(Annotation.from_flake8json(filename, annotation).to_str())
+	def beginning(self, filename):
+		"""
+		We're starting a new file.
+		"""
 
+		self.reported_errors_count = 0
 
-class JsonFormatter(DefaultJSON):
+	def finished(self, filename):
+		"""
+		We've finished processing a file.
+		"""
 
-	def __init__(self, *args, **kwargs):
-		super().__init__(*args, **kwargs)
+		self.files_reported_count += 1
 
-		self.output_fd = StringIO()
+	def format(self, violation):
+		"""
+		Format a violation.
+		"""
 
+		if self.reported_errors_count == 0:
+			self.write_line(violation.filename)
 
+			self.write_line(
+					f"::warning "
+					f"file={violation.filename},line={violation.line_number},col={violation.column_number}"
+					f"::{violation.code}: {violation.text}"
+					)
 
+		self.reported_errors_count += 1

flake8_github_action/flake8_app.py

@@ -1,6 +1,4 @@
-attrs>=20.3.0
 click>=7.1.2
 consolekit>=0.6.0
 flake8>=3.8.4
-flake8-json>=19.8.0
 typing-extensions>=3.7.4.3