Commit 85a27ffd authored by Maxime Lefrançois's avatar Maxime Lefrançois
Browse files

Closes #34 issue with .DS_store files

parent 7bf3b4d3

src/main/java/fr/emse/gitlab/saref/checkers/Clause_9_3_Checker.java

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ public class Clause_9_3_Checker extends AbstractClauseChecker { 


		String nonCsv = Files.walk(path, 1).filter(p -> {

			try {

				return p.toFile().isFile() && !csvMatcher.matches(p);

				return p.toFile().isFile() && !csvMatcher.matches(p) && !p.toFile().getName().startsWith(".");

			} catch (Exception ex) {

				return false;

			}

src/main/java/fr/emse/gitlab/saref/checkers/Clause_9_4_1_Checker.java

+11 −3
Original line number Diff line number Diff line
@@ -27,9 +27,11 @@ package fr.emse.gitlab.saref.checkers; 


import java.io.File;

import java.io.FileInputStream;

import java.io.IOException;

import java.io.InputStreamReader;

import java.nio.charset.Charset;

import java.nio.charset.MalformedInputException;

import java.nio.file.Files;



import org.apache.jena.atlas.RuntimeIOException;

import org.apache.jena.riot.Lang;
@@ -46,7 +48,7 @@ import fr.emse.gitlab.saref.utils.Languages; 
public class Clause_9_4_1_Checker extends AbstractClauseChecker {



	private static enum MESSAGE {

		one, name, turtle;

		one, name, turtle, ioexception;

	}



	public Clause_9_4_1_Checker(RepositoryManager repositoryManager) {
@@ -56,9 +58,15 @@ public class Clause_9_4_1_Checker extends AbstractClauseChecker { 
	@Override

	public void checkClause() throws SAREFPipelineException {

		File dir = new File(repository.getDirectory(), "ontology");

		if (dir.list().length != 1) {



		try {

			if (Files.walk(dir.toPath(), 1).filter(p -> !p.toFile().isFile() && !p.toFile().getName().startsWith("."))

					.count() != 1) {

				logError(getMessage(MESSAGE.one, repository.getProject().getOntologyFileName(Languages.TEXT_TURTLE)));

			}

		} catch (IOException e) {

			logError(getMessage(MESSAGE.ioexception), e);

		}

		File file = new File(dir, repository.getProject().getOntologyFileName(Languages.TEXT_TURTLE));

		if (!file.isFile()) {

			String msg = getMessage(MESSAGE.name, repository.getOntologyFileName(Languages.TEXT_TURTLE));

src/main/java/fr/emse/gitlab/saref/checkers/Clause_9_5_Checker.java

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ public class Clause_9_5_Checker extends AbstractClauseChecker { 


		String nonCsv = Files.walk(path, 1).filter(p -> {

			try {

				return p.toFile().isFile() && !csvMatcher.matches(p);

				return p.toFile().isFile() && !csvMatcher.matches(p) && !p.toFile().getName().startsWith(".");

			} catch (Exception ex) {

				return false;

			}

src/main/java/fr/emse/gitlab/saref/checkers/Clause_9_6_1_Checker.java

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ public class Clause_9_6_1_Checker extends AbstractClauseChecker { 


			String nonTtl = Files.walk(dir.toPath(), 1).filter(p -> {

				try {

					return p.toFile().isFile() && !TTL_MATCHER.matches(p);

					return p.toFile().isFile() && !TTL_MATCHER.matches(p) && !p.toFile().getName().startsWith(".");

				} catch (Exception ex) {

					return false;

				}

src/main/java/fr/emse/gitlab/saref/checkers/Clause_9_6_2_Checker.java

+0 −2
Original line number Diff line number Diff line
@@ -34,10 +34,8 @@ import fr.emse.gitlab.saref.SAREFPipelineException; 
import fr.emse.gitlab.saref.entities.SAREFExample;

import fr.emse.gitlab.saref.entities.SAREFExtension;

import fr.emse.gitlab.saref.entities.SAREFProject;

import fr.emse.gitlab.saref.entities.SAREFVersion;

import fr.emse.gitlab.saref.entities.SAREFVersionName;

import fr.emse.gitlab.saref.managers.RepositoryManager;

import fr.emse.gitlab.saref.vocabs.SHACL;



/**

 * Checks TS 103 673 Clause 9.6.2: Prefixes declaration