Skip to content
This repository was archived by the owner on Feb 19, 2020. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions src/codacy/reporter.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,15 @@ def file_exists(rootdir, filename):
return False


def generate_filename(sources, filename):
def generate_filename(sources, filename, git_directory):
def strip_prefix(line, prefix):
if line.startswith(prefix):
return line[len(prefix):]
else:
return line

git_directory = get_git_directory()
if not git_directory:
git_directory = get_git_directory()

for source in sources:
if file_exists(source, filename):
Expand All @@ -75,7 +76,7 @@ def strip_prefix(line, prefix):
return filename


def parse_report_file(report_file):
def parse_report_file(report_file, git_directory):
"""Parse XML file and POST it to the Codacy API
:param report_file:
"""
Expand All @@ -97,7 +98,7 @@ def percent(s):
classes = report_xml.getElementsByTagName('class')
for cls in classes:
file_report = {
'filename': generate_filename(sources, cls.attributes['filename'].value),
'filename': generate_filename(sources, cls.attributes['filename'].value, git_directory),
'total': percent(cls.attributes['line-rate'].value),
'coverage': {},
}
Expand Down Expand Up @@ -141,6 +142,7 @@ def run():
parser = argparse.ArgumentParser(description='Codacy coverage reporter for Python.')
parser.add_argument("-r", "--report", type=str, help="coverage report file", default=DEFAULT_REPORT_FILE)
parser.add_argument("-c", "--commit", type=str, help="git commit hash")
parser.add_argument("-d", "--directory", type=str, help="git top level directory")
parser.add_argument("-v", "--verbose", help="show debug information", action="store_true")

args = parser.parse_args()
Expand All @@ -160,7 +162,7 @@ def run():
exit(1)

logging.info("Parsing report file...")
report = parse_report_file(args.report)
report = parse_report_file(args.report, args.directory)

logging.info("Uploading report...")
upload_report(report, CODACY_PROJECT_TOKEN, args.commit)
2 changes: 1 addition & 1 deletion tests/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def file_get_contents(filename):
with open(filename) as f:
return f.read()

generated = codacy.reporter.parse_report_file(generated_filename)
generated = codacy.reporter.parse_report_file(generated_filename, '')

json_content = file_get_contents(expected_filename)
expected = json.loads(json_content)
Expand Down