beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

repo: tweak algorithm

Browse source
This commit is contained in:
Hylke Bons 2011-05-22 15:46:15 +01:00
parent 16bfce692a
commit 7be63b07c9
2 changed files with 33 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
SparkleLib/Git/SparkleRepoGit.cs
View file

@ -120,9 +120,9 @@ namespace SparkleLib {
if (git.ExitCode == 0) {
return true;
//FetchRebaseAndPush ();TODO
} else {
return false;
//FetchRebaseAndPush ();TODO
}
}
@ -134,7 +134,7 @@ namespace SparkleLib {
git.Start ();
git.WaitForExit ();
if (git.ExitCode == 0) {Console.WriteLine ("REBASING");
if (git.ExitCode == 0) {
Rebase ();
return true;
} else {

57
SparkleLib/SparkleRepoBase.cs
View file

@ -72,36 +72,18 @@ namespace SparkleLib {
public abstract bool SyncDown ();
public abstract bool HasUnsyncedChanges { get; set; }
public bool ServerOnline {
get {
return this.server_online;
}
}
public SyncStatus Status {
get {
return this.status;
}
}
public delegate void SyncStatusChangedEventHandler (SyncStatus new_status);
public event SyncStatusChangedEventHandler SyncStatusChanged;
public delegate void NewChangeSetEventHandler (SparkleChangeSet change_set, string source_path);
public delegate void ConflictResolvedEventHandler ();
public delegate void ChangesDetectedEventHandler ();
public event NewChangeSetEventHandler NewChangeSet;
public delegate void ConflictResolvedEventHandler ();
public event ConflictResolvedEventHandler ConflictResolved;
public delegate void ChangesDetectedEventHandler ();
public event ChangesDetectedEventHandler ChangesDetected;
protected void OnConflictResolved ()
{
if (ConflictResolved != null)
ConflictResolved ();
}
// TODO: constructor (path, url, backend)
public SparkleRepoBase (string path, SparkleBackend backend)
@ -132,7 +114,7 @@ namespace SparkleLib {
SyncDownBase ();
}
if (this.is_polling && !this.listener.IsConnected && !this.listener.IsConnecting)
if (this.is_polling && !this.listener.IsConnecting)
this.listener.Connect ();
if (HasUnsyncedChanges)
@ -166,6 +148,26 @@ namespace SparkleLib {
}
public bool ServerOnline {
get {
return this.server_online;
}
}
public SyncStatus Status {
get {
return this.status;
}
}
protected void OnConflictResolved ()
{
if (ConflictResolved != null)
ConflictResolved ();
}
public virtual bool CheckForRemoteChanges () // HasRemoteChanges { get; } ?
{
return true;
@ -258,7 +260,7 @@ namespace SparkleLib {
// Start polling when the connection to the irc channel is lost
this.listener.Disconnected += delegate {
SparkleHelpers.DebugInfo ("Local", "[" + Name + "] Falling back to polling");
SparkleHelpers.DebugInfo (Name, "Falling back to polling");
this.is_polling = true;
};
@ -304,7 +306,7 @@ namespace SparkleLib {
DisableWatching ();
while (AnyDifferences)
SyncUpBase ();//TODO look at algorithm
SyncUpBase ();
EnableWatching ();
}
}
@ -315,7 +317,7 @@ namespace SparkleLib {
// Starts a timer when something changes
private void OnFileActivity (object o, FileSystemEventArgs fse_args)
{
if (fse_args.Name.StartsWith (".git/"))
if (fse_args.Name.StartsWith (".git/") || fse_args.Name.StartsWith (".hg/"))
return;
WatcherChangeTypes wct = fse_args.ChangeType;
@ -395,6 +397,9 @@ namespace SparkleLib {
if (SyncStatusChanged != null)
SyncStatusChanged (SyncStatus.Idle);
if (HasUnsyncedChanges)
SyncUp ();
} else {
SparkleHelpers.DebugInfo ("SyncDown", "[" + Name + "] Error");
this.server_online = false;