Skip to content

Commit

Permalink
Update Assembly info
Browse files Browse the repository at this point in the history
  • Loading branch information
RolandPheasant committed Nov 17, 2015
1 parent b5d7a15 commit e755dd0
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 11 deletions.
8 changes: 4 additions & 4 deletions Source/TailBlazer.Domain/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("TailBlazer.Domain")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyTitle("Tail Blazer")]
[assembly: AssemblyDescription("Tail blazer is a file tail utility")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("TailBlazer.Domain")]
[assembly: AssemblyCopyright("Copyright © 2015")]
[assembly: AssemblyProduct("TailBlazer")]
[assembly: AssemblyCopyright("Copyright © 2015")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down
6 changes: 3 additions & 3 deletions Source/TailBlazer/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("TailBlazer")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyTitle("Tail Blazer")]
[assembly: AssemblyDescription("Tail blazer is a file tail utility")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("TailBlazer")]
[assembly: AssemblyCopyright("Copyright © 2015")]
[assembly: AssemblyCopyright("Copyright © 2015")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down
13 changes: 9 additions & 4 deletions Source/TailBlazer/Views/FileTailerViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,21 @@ public FileTailerViewModel(ILogger logger,ISchedulerProvider schedulerProvider,
if (schedulerProvider == null) throw new ArgumentNullException(nameof(schedulerProvider));
if (fileInfo == null) throw new ArgumentNullException(nameof(fileInfo));


//user entered filter
var filterRequest = this.WhenValueChanged(vm => vm.SearchText).Throttle(TimeSpan.FromMilliseconds(125));

//define scroll to observable
var autoChanged = this.WhenValueChanged(vm => vm.AutoTail);
var scroller = _userScrollRequested
.CombineLatest(autoChanged, (user, auto) =>
var scroller = _userScrollRequested.CombineLatest(autoChanged, (user, auto) =>
{
var mode = AutoTail ? ScrollingMode.Tail : ScrollingMode.User;
var mode = auto ? ScrollingMode.Tail : ScrollingMode.User;
return new ScrollRequest(mode, user.PageSize, user.FirstIndex);
})
.Sample(TimeSpan.FromMilliseconds(50))
.Sample(TimeSpan.FromMilliseconds(125))
.DistinctUntilChanged();

//construct tailer
var tailer = new FileTailer(fileInfo, filterRequest, scroller);


Expand Down Expand Up @@ -91,6 +95,7 @@ void IScrollReceiver.ScrollTo(ScrollBoundsArgs boundsArgs)
if (boundsArgs == null) throw new ArgumentNullException(nameof(boundsArgs));
var mode = AutoTail ? ScrollingMode.Tail : ScrollingMode.User;

//TODO: get rid of subject (alas each time I have tried to get rid of it, scrolling has been messed up!)
_userScrollRequested.OnNext(new ScrollRequest(mode, boundsArgs.PageSize,boundsArgs.FirstIndex));
PageSize = boundsArgs.PageSize;
FirstIndex = boundsArgs.FirstIndex;
Expand Down

0 comments on commit e755dd0

Please sign in to comment.