Skip to content

Commit

Permalink
Need to checkin these changes before I start development again
Browse files Browse the repository at this point in the history
Notes:
- Code builds
- It has had a few tests
- Needs full testing
- Needs checking for performance
  • Loading branch information
smurfiv_cp authored and smurfiv_cp committed Nov 5, 2012
1 parent 1e124e0 commit 61619f9
Show file tree
Hide file tree
Showing 59 changed files with 1,217 additions and 567 deletions.
14 changes: 3 additions & 11 deletions Liquesce/AdvancedPropertiesDisplay.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ public AdvancedPropertiesDisplay(ConfigDetails cd)
if (cd != null)
{
ThreadCount = cd.ThreadCount;
DokanDebugMode = cd.DebugMode;
AllocationMode = cd.AllocationMode.ToString();
HoldOffMBytes = cd.HoldOffBufferBytes / (1024 * 1024);
ServiceLogLevel = cd.ServiceLogLevel;
Expand All @@ -59,24 +58,17 @@ public AdvancedPropertiesDisplay(ConfigDetails cd)
[Editor(typeof(NumericUpDownTypeEditor), typeof(UITypeEditor)), MinMaxAttribute(1, 1024000, 1024)]
public ulong HoldOffMBytes { get; set;}

[DescriptionAttribute("Turn Dokan Debug information on, to all it to be captured in an appropriate app."),
DisplayName("Dokan Debug Mode")
, CategoryAttribute("Dokan")
]
public bool DokanDebugMode { get; set; }


[DescriptionAttribute("0 is automatic, use 1 for problem finding scenario's.\rRange 0 <-> 32"),
[DescriptionAttribute("0 is automatic (Number of processing units * 2), use 1 for problem finding scenario's.\rRange 0 <-> 31"),
DisplayName("Thread Count")
, CategoryAttribute("Dokan")
]
[TypeConverter(typeof(NumericUpDownTypeConverter))]
[Editor(typeof(NumericUpDownTypeEditor), typeof(UITypeEditor)), MinMaxAttribute(0, 32)]
[Editor(typeof(NumericUpDownTypeEditor), typeof(UITypeEditor)), MinMaxAttribute(0, 31)]
public ushort ThreadCount { get; set; }

[DescriptionAttribute("The amount of information that will be placed into the Log files.\r" +
"Trace means slower performance!\r." +
"Useful for creating bug reports - set threads to 1 as well"),
"Useful for creating bug reports - set Thread Count to 1 as well"),
DisplayName("Service Logging Level")
, CategoryAttribute("Service")
]
Expand Down
12 changes: 12 additions & 0 deletions Liquesce/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<configSections>
<section name="nlog" type="NLog.Config.ConfigSectionHandler, NLog"/>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
<section name="Liquesce.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
<section name="Liquesce.Settings1" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
</sectionGroup>
</configSections>
Expand All @@ -27,6 +28,17 @@
</rules>
</nlog>
<userSettings>
<Liquesce.Properties.Settings>
<setting name="WindowLocation" serializeAs="String">
<value />
</setting>
<setting name="UpdateRequired" serializeAs="String">
<value>True</value>
</setting>
<setting name="TailWindowLocation" serializeAs="String">
<value />
</setting>
</Liquesce.Properties.Settings>
<Liquesce.Settings1>
<setting name="WindowLocation" serializeAs="String">
<value />
Expand Down
16 changes: 13 additions & 3 deletions Liquesce/ChangeLog.rtf
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,31 @@ Keep an open eye on the \cf0\b{\field{\*\fldinst{HYPERLINK "http://liquesce.code
- Change the space usage to be a table with scroll-bars to give better layout options (And sorting etc.)\par
- Error 1450: Insufficient System Resources for Service\par
- Dokan Move A directory to its parent (Over a share) does not pass correct information to UserSpace\par
\par
- Disk Full with "Total Commander" file copy on 12-01-beta2 XP Server\par
- \par
\cf0\ul\b\par
\cf1\ulnone\b0\par
\cf0\ul\b Done\par
\par
2012-05-##\par
2012-06-##\par
\ulnone\b0 - Add logging Callback function, to allow UserSpace to perform logging of Dokan interface calls.\par
- If Liquesce logging level is set to Debug or Trace, then the Dokan UserSpace Dll is set to DebugCallback.\par
- Add TailForm to the Management application to see the Service log files changing.\par
- If Liquesce Trace level is set, then the Debug Flag for the system driver is also set (Use DebugView).\par
-- More optimisations to give the optimising compiler a chance\par
- \par
\ul\b\par
2012-05-29 Test Release\par
\ulnone\b0 - Add numericUpDown range control to the property Gird\par
\cf3 - Advanced Settings - File Detail Cache Seconds\par
\cf0 - Addition of buttons to allow user to perform the workarouns for SMB and EnableOpLocks overrides.\par
- fix \cf3 Create new files when All the sources have below the Hold-Off area is not handled well.\cf0\par
- Change default thread value to 0, now that it has been tested.\par
- unable to reproduce \cf3 Number of Folders not showing up over a share\par
\cf0 - Fix \cf3 Cannot rename folders with 12-01-beta2 in XP Server\par
\cf0 - Start to convert project over to using 64 Native API's and Builds\cf3\par
\cf0 - Start to convert project over to using 64 Native API's and Builds\par
-- Fix compile warnings\par
-- Start to optimise usage of variables to give the optimising compiler a chance\cf3\par
\cf0\par
\ul\b\par
2012-04-29 (RC2)\par
Expand Down
1 change: 0 additions & 1 deletion Liquesce/GridAdvancedSettings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ private void button1_Click(object sender, EventArgs e)
if (cd != null)
{
cd.ThreadCount = apd.ThreadCount;
cd.DebugMode = apd.DokanDebugMode;
Enum.TryParse(apd.AllocationMode, out cd.AllocationMode);
cd.HoldOffBufferBytes = (apd.HoldOffMBytes * (1024 * 1024));
cd.ServiceLogLevel = apd.ServiceLogLevel;
Expand Down
11 changes: 10 additions & 1 deletion Liquesce/Liquesce.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,12 @@
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<DependentUpon>Settings.settings</DependentUpon>
</Compile>
<Compile Include="TailForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="TailForm.Designer.cs">
<DependentUpon>TailForm.cs</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
Expand All @@ -158,6 +164,9 @@
<DependentUpon>MainForm.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="TailForm.resx">
<DependentUpon>TailForm.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include=".NETFramework,Version=v4.0">
Expand Down Expand Up @@ -195,7 +204,7 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ProjectExtensions>
<VisualStudio>
<UserProperties BuildVersion_UpdateAssemblyVersion="True" BuildVersion_UpdateFileVersion="True" BuildVersion_UseGlobalSettings="True" BuildVersion_BuildVersioningStyle="YearStamp.MonthStamp.DayStamp.Increment" />
<UserProperties BuildVersion_BuildVersioningStyle="YearStamp.MonthStamp.DayStamp.Increment" BuildVersion_UseGlobalSettings="True" BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" />
</VisualStudio>
</ProjectExtensions>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Expand Down
22 changes: 14 additions & 8 deletions Liquesce/LogDisplay.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
// </summary>
// --------------------------------------------------------------------------------------------------------------------
#endregion

using System;
using System.Diagnostics;
using System.IO;
Expand All @@ -38,13 +39,8 @@ static public class DisplayLog
{
static private readonly Logger Log = LogManager.GetCurrentClassLogger();

/// <summary>
///
/// </summary>
static public void LogDisplay(string logLocation)
static public string FindLogLocation(string logLocation)
{
try
{
OpenFileDialog openFileDialog = new OpenFileDialog
{
InitialDirectory =
Expand All @@ -57,9 +53,19 @@ static public void LogDisplay(string logLocation)
Title = "Select name to view contents"
};

if (openFileDialog.ShowDialog() == DialogResult.OK)
return (openFileDialog.ShowDialog() == DialogResult.OK) ? openFileDialog.FileName : string.Empty;
}
/// <summary>
///
/// </summary>
static public void LogDisplay(string logLocation)
{
try
{
logLocation = FindLogLocation(logLocation);
if (!string.IsNullOrEmpty(logLocation))
{
Process word = Process.Start("Wordpad.exe", '"' + openFileDialog.FileName + '"');
Process word = Process.Start("Wordpad.exe", '"' + logLocation + '"');
if (word != null)
{
word.WaitForInputIdle();
Expand Down
63 changes: 39 additions & 24 deletions Liquesce/MainForm.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 16 additions & 1 deletion Liquesce/MainForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -794,10 +794,25 @@ private void userLogViewToolStripMenuItem_Click(object sender, EventArgs e)
DisplayLog.LogDisplay(@"Liquesce\Logs");
}

private void serviceLogViewToolStripMenuItem_Click(object sender, EventArgs e)
private void viewToolStripMenuItem_Click(object sender, EventArgs e)
{
DisplayLog.LogDisplay(@"LiquesceSvc\Logs");
}

private void tailToolStripMenuItem_Click(object sender, EventArgs e)
{
try
{
string logLocation = DisplayLog.FindLogLocation(@"LiquesceSvc\Logs");
if (!string.IsNullOrEmpty(logLocation))
{
new TailForm(logLocation).Show(this);
}
}
catch (Exception ex)
{
Log.ErrorException("OpenFile has an exception: ", ex);
}
}

private void globalConfigSettingsToolStripMenuItem_Click(object sender, EventArgs e)
Expand Down
4 changes: 2 additions & 2 deletions Liquesce/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("12.5.934.29")]
[assembly: AssemblyFileVersion("12.5.934.29")]
[assembly: AssemblyVersion("12.6.941.7")]
[assembly: AssemblyFileVersion("12.6.941.7")]
14 changes: 13 additions & 1 deletion Liquesce/Properties/Settings.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 61619f9

Please sign in to comment.