Skip to content
This repository has been archived by the owner on Jul 26, 2022. It is now read-only.

Commit

Permalink
Ignore files specified in .syignore recursive
Browse files Browse the repository at this point in the history
  • Loading branch information
Julian Goestl committed Feb 4, 2016
1 parent 63f6d22 commit 9bd1ad5
Show file tree
Hide file tree
Showing 5 changed files with 212 additions and 132 deletions.
15 changes: 11 additions & 4 deletions syncany-lib/src/main/java/org/syncany/config/IgnoredFiles.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
*/
public class IgnoredFiles {
private static final Logger logger = Logger.getLogger(ConfigHelper.class.getSimpleName());

private Set<String> ignorePatterns;
private Set<String> ignorePaths;
private File ignoreFile;
Expand All @@ -50,14 +50,21 @@ public IgnoredFiles(File ignoreFile) {
* Method to check whether a file should be ignored.
* Should only be called at indexing time.
*/
public boolean isFileIgnored(String filePath) {
public boolean isFileIgnored(String filePath, String fileName) {
// Check all exact paths
for (String path : ignorePaths) {
if (path.equals(filePath)) {
return true;
}
}

// Check all recursive
for (String path : ignorePaths) {
if (path.equals(fileName)) {
return true;
}
}

// Check all regular expressions
for (String pattern : ignorePatterns) {
if (filePath.matches(pattern)) {
Expand All @@ -77,10 +84,10 @@ public void loadPatterns() {
String ignorePatternLine = scanner.nextLine().trim();

if (!ignorePatternLine.isEmpty()) {
parseIgnoreFileLine(ignorePatternLine);
parseIgnoreFileLine(ignorePatternLine);
}
}

scanner.close();
}
catch (FileNotFoundException e) {
Expand Down
144 changes: 73 additions & 71 deletions syncany-lib/src/main/java/org/syncany/operations/status/StatusOperation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,111 +47,112 @@
* The status operation analyzes the local file tree and compares it to the current local
* database. It uses the {@link FileVersionComparator} to determine differences and returns
* new/changed/deleted files in form of a {@link ChangeSet}.
*
*
* @author Philipp C. Heckel <philipp.heckel@gmail.com>
*/
public class StatusOperation extends Operation {
private static final Logger logger = Logger.getLogger(StatusOperation.class.getSimpleName());
private FileVersionComparator fileVersionComparator;
private static final Logger logger = Logger.getLogger(StatusOperation.class.getSimpleName());

private FileVersionComparator fileVersionComparator;
private SqlDatabase localDatabase;
private StatusOperationOptions options;

private LocalEventBus eventBus;

public StatusOperation(Config config) {
this(config, new StatusOperationOptions());
}
}

public StatusOperation(Config config, StatusOperationOptions options) {
super(config);
super(config);

this.fileVersionComparator = new FileVersionComparator(config.getLocalDir(), config.getChunker().getChecksumAlgorithm());
this.localDatabase = new SqlDatabase(config);
this.options = options;
this.options = options;

this.eventBus = LocalEventBus.getInstance();
}
}

@Override
public StatusOperationResult execute() throws Exception {
logger.log(Level.INFO, "");
logger.log(Level.INFO, "Running 'Status' at client "+config.getMachineName()+" ...");
logger.log(Level.INFO, "Running 'Status' at client " + config.getMachineName() + " ...");
logger.log(Level.INFO, "--------------------------------------------");

if (options != null && options.isForceChecksum()) {
logger.log(Level.INFO, "Force checksum ENABLED.");
}

if (options != null && !options.isDelete()) {
logger.log(Level.INFO, "Delete missing files DISABLED.");
}

// Get local database
logger.log(Level.INFO, "Querying current file tree from database ...");
eventBus.post(new StatusStartSyncExternalEvent(config.getLocalDir().getAbsolutePath()));
logger.log(Level.INFO, "Querying current file tree from database ...");
eventBus.post(new StatusStartSyncExternalEvent(config.getLocalDir().getAbsolutePath()));

// Path to actual file version
final Map<String, FileVersion> filesInDatabase = localDatabase.getCurrentFileTree();

// Find local changes
logger.log(Level.INFO, "Analyzing local folder "+config.getLocalDir()+" ...");
logger.log(Level.INFO, "Analyzing local folder " + config.getLocalDir() + " ...");
ChangeSet localChanges = findLocalChanges(filesInDatabase);

if (!localChanges.hasChanges()) {
logger.log(Level.INFO, "- No changes to local database");
}

// Return result
StatusOperationResult statusResult = new StatusOperationResult();
statusResult.setChangeSet(localChanges);
eventBus.post(new StatusEndSyncExternalEvent(config.getLocalDir().getAbsolutePath(), localChanges.hasChanges()));

eventBus.post(new StatusEndSyncExternalEvent(config.getLocalDir().getAbsolutePath(), localChanges.hasChanges()));

return statusResult;
}

private ChangeSet findLocalChanges(final Map<String, FileVersion> filesInDatabase) throws FileNotFoundException, IOException {
ChangeSet localChanges = findLocalChangedAndNewFiles(config.getLocalDir(), filesInDatabase);

if (options == null || options.isDelete()) {
findAndAppendDeletedFiles(localChanges, filesInDatabase);
}

return localChanges;
}

private ChangeSet findLocalChangedAndNewFiles(final File root, Map<String, FileVersion> filesInDatabase) throws FileNotFoundException, IOException {
}

private ChangeSet findLocalChangedAndNewFiles(final File root, Map<String, FileVersion> filesInDatabase)
throws FileNotFoundException, IOException {
Path rootPath = Paths.get(root.getAbsolutePath());
StatusFileVisitor fileVisitor = new StatusFileVisitor(rootPath, filesInDatabase);

StatusFileVisitor fileVisitor = new StatusFileVisitor(rootPath, filesInDatabase);
Files.walkFileTree(rootPath, fileVisitor);
return fileVisitor.getChangeSet();

return fileVisitor.getChangeSet();
}
private void findAndAppendDeletedFiles(ChangeSet localChanges, Map<String,FileVersion> filesInDatabase) {

private void findAndAppendDeletedFiles(ChangeSet localChanges, Map<String, FileVersion> filesInDatabase) {
for (FileVersion lastLocalVersion : filesInDatabase.values()) {
// Check if file exists, remove if it doesn't
File lastLocalVersionOnDisk = new File(config.getLocalDir()+File.separator+lastLocalVersion.getPath());
File lastLocalVersionOnDisk = new File(config.getLocalDir() + File.separator + lastLocalVersion.getPath());

// Ignore this file history if the last version is marked "DELETED"
if (lastLocalVersion.getStatus() == FileStatus.DELETED) {
continue;
}

// If file has VANISHED, mark as DELETED
if (!FileUtil.exists(lastLocalVersionOnDisk)) {
localChanges.getDeletedFiles().add(lastLocalVersion.getPath());
}
}
}
}

private class StatusFileVisitor implements FileVisitor<Path> {
private Path root;
private ChangeSet changeSet;
private ChangeSet changeSet;
private Map<String, FileVersion> currentFileTree;

public StatusFileVisitor(Path root, Map<String, FileVersion> currentFileTree) {
this.root = root;
this.changeSet = new ChangeSet();
Expand All @@ -161,65 +162,65 @@ public StatusFileVisitor(Path root, Map<String, FileVersion> currentFileTree) {
public ChangeSet getChangeSet() {
return changeSet;
}

@Override
public FileVisitResult visitFile(Path actualLocalFile, BasicFileAttributes attrs) throws IOException {
String relativeFilePath = FileUtil.getRelativeDatabasePath(root.toFile(), actualLocalFile.toFile()); //root.relativize(actualLocalFile).toString();

// Skip Syncany root folder
if (actualLocalFile.toFile().equals(config.getLocalDir())) {
return FileVisitResult.CONTINUE;
}

// Skip .syncany (or app related acc. to config)
boolean isAppRelatedDir =
actualLocalFile.toFile().equals(config.getAppDir())
|| actualLocalFile.toFile().equals(config.getCache())
|| actualLocalFile.toFile().equals(config.getDatabaseDir())
|| actualLocalFile.toFile().equals(config.getLogDir());

boolean isAppRelatedDir = actualLocalFile.toFile().equals(config.getAppDir())
|| actualLocalFile.toFile().equals(config.getCache())
|| actualLocalFile.toFile().equals(config.getDatabaseDir())
|| actualLocalFile.toFile().equals(config.getLogDir());

if (isAppRelatedDir) {
logger.log(Level.FINEST, "- Ignoring file (syncany app-related): {0}", relativeFilePath);
return FileVisitResult.SKIP_SUBTREE;
}

// Check if file is locked
boolean fileLocked = FileUtil.isFileLocked(actualLocalFile.toFile());

if (fileLocked) {
logger.log(Level.FINEST, "- Ignoring file (locked): {0}", relativeFilePath);
logger.log(Level.FINEST, "- Ignoring file (locked): {0}", relativeFilePath);
return FileVisitResult.CONTINUE;
}
}

// Check database by file path
FileVersion expectedLastFileVersion = currentFileTree.get(relativeFilePath);
if (expectedLastFileVersion != null) {

if (expectedLastFileVersion != null) {
// Compare
boolean forceChecksum = options != null && options.isForceChecksum();
FileVersionComparison fileVersionComparison = fileVersionComparator.compare(expectedLastFileVersion, actualLocalFile.toFile(), forceChecksum);

FileVersionComparison fileVersionComparison = fileVersionComparator.compare(expectedLastFileVersion, actualLocalFile.toFile(),
forceChecksum);

if (fileVersionComparison.areEqual()) {
changeSet.getUnchangedFiles().add(relativeFilePath);
}
else {
changeSet.getChangedFiles().add(relativeFilePath);
}
}
}
else {
if (!config.getIgnoredFiles().isFileIgnored(relativeFilePath)) {
if (!config.getIgnoredFiles().isFileIgnored(relativeFilePath, actualLocalFile.toFile().getName())) {
changeSet.getNewFiles().add(relativeFilePath);
logger.log(Level.FINEST, "- New file: "+relativeFilePath);
logger.log(Level.FINEST, "- New file: " + relativeFilePath);
}
else {
logger.log(Level.FINEST, "- Ignoring file; " + relativeFilePath);
return FileVisitResult.SKIP_SUBTREE;
}
}
}

// Check if file is symlink directory
boolean isSymlinkDir = attrs.isDirectory() && attrs.isSymbolicLink();

if (isSymlinkDir) {
logger.log(Level.FINEST, " + File is sym. directory. Skipping subtree.");
return FileVisitResult.SKIP_SUBTREE;
Expand All @@ -228,8 +229,9 @@ public FileVisitResult visitFile(Path actualLocalFile, BasicFileAttributes attrs
return FileVisitResult.CONTINUE;
}
}

@Override public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {

@Override
public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
return visitFile(dir, attrs);
}

Expand Down
Loading

0 comments on commit 9bd1ad5

Please sign in to comment.