Skip to content
This repository was archived by the owner on Feb 19, 2020. It is now read-only.

Fix generate_filename #36

Merged
rtfpessoa merged 2 commits into from
Dec 20, 2017
Merged

Fix generate_filename #36

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
703ab7b
Fix generate_filename
IceflowRE Nov 15, 2017
5bba7e0
Move get_git_directory to the beginning
IceflowRE Nov 15, 2017
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
27 changes: 12 additions & 15 deletions src/codacy/reporter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,30 +46,18 @@ def get_git_directory():
return subprocess.check_output(['git', 'rev-parse', '--show-toplevel']).decode("utf-8").strip()


def file_exists(rootdir, filename):
for root, subFolders, files in os.walk(rootdir):
if filename in files:
return True
else:
for subFolder in subFolders:
return file_exists(os.path.join(rootdir, subFolder), filename)
return False


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

if not git_directory:
git_directory = get_git_directory()

for source in sources:
if file_exists(source, filename):
if os.path.isfile(source + "/" + filename):
return strip_prefix(source, git_directory).strip("/") + "/" + filename.strip("/")

logging.debug("File not found: " + filename)
return filename


Expand Down Expand Up @@ -127,6 +115,9 @@ def percent(s):
}

sources = [x.firstChild.nodeValue for x in report_xml.getElementsByTagName('source')]
# replace windows style seperator with linux style seperator
for i in range(len(sources)):
sources[i] = sources[i].replace("\\", "/")
classes = report_xml.getElementsByTagName('class')
total_lines = 0
for cls in classes:
Expand Down Expand Up @@ -202,6 +193,12 @@ def run():
if not args.report:
args.report.append(DEFAULT_REPORT_FILE)

if args.directory:
git_directory = args.directory
else:
git_directory = get_git_directory()
git_directory.replace("\\", "/")

# Explictly check ALL files before parsing any
for rfile in args.report:
if not os.path.isfile(rfile):
Expand All @@ -211,7 +208,7 @@ def run():
reports = []
for rfile in args.report:
logging.info("Parsing report file %s...", rfile)
reports.append(parse_report_file(rfile, args.directory))
reports.append(parse_report_file(rfile, git_directory))

report = merge_and_round_reports(reports)

Expand Down