Skip to content

Commit

Permalink
Change milliseconds to seconds
Browse files Browse the repository at this point in the history
  • Loading branch information
logical-1985516 committed Jul 6, 2024
1 parent 310856e commit 5b6caf0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
5 changes: 2 additions & 3 deletions src/main/java/reposense/authorship/FileInfoAnalyzer.java
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,8 @@ private void aggregateBlameAuthorModifiedAndDateInfo(RepoConfiguration config, F
GitBlameLineInfo blameLineInfo = GitBlame.blameLine(config.getRepoRoot(), "", fileInfo.getPath(),
lineNumber + 1); // line numbers in git are 1-indexed
String commitHash = blameLineInfo.getCommitHash();
long commitDateInMs = blameLineInfo.getTimestampInSeconds() * 1000;
LocalDateTime commitDate = LocalDateTime.ofInstant(Instant.ofEpochMilli(commitDateInMs),
config.getZoneId());
LocalDateTime commitDate = LocalDateTime.ofInstant(
Instant.ofEpochSecond(blameLineInfo.getTimestampInSeconds()), config.getZoneId());
Author author = config.getAuthor(blameLineInfo.getAuthorName(), blameLineInfo.getAuthorEmail());

if (!fileInfo.isFileLineTracked(lineNumber) || author.isIgnoringFile(filePath)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,11 @@ public static boolean analyzeAuthorship(RepoConfiguration config, String filePat
GitBlameLineInfo deletedLineInfo = GitBlame.blameLine(config.getRepoRoot(), deletedLine.getGitBlameCommitHash(),
deletedLine.getFilePath(), deletedLine.getLineNumber());
Author previousAuthor = config.getAuthor(deletedLineInfo.getAuthorName(), deletedLineInfo.getAuthorEmail());
long sinceDateInMilliseconds = ZonedDateTime.of(config.getSinceDate(), config.getZoneId()).toEpochSecond();
long sinceDateInSeconds = ZonedDateTime.of(config.getSinceDate(), config.getZoneId()).toEpochSecond();

// Give full credit if author is unknown, is before since date, is in ignored list, or is an ignored file
if (previousAuthor.equals(Author.UNKNOWN_AUTHOR)
|| deletedLineInfo.getTimestampInSeconds() < sinceDateInMilliseconds
|| deletedLineInfo.getTimestampInSeconds() < sinceDateInSeconds
|| CommitHash.isInsideCommitList(deletedLineInfo.getCommitHash(), config.getIgnoreCommitList())
|| previousAuthor.isIgnoringFile(Paths.get(deletedLine.getFilePath()))) {
return true;
Expand Down

0 comments on commit 5b6caf0

Please sign in to comment.