Commit 9d68d077: ShellViewEx.Navigate(...): Commented out code

ArchiveProcressScreen.cs

-5+1

/BExplorer/BetterExplorer/ArchiveView/ArchiveProcressScreen.cs

View

}

[Obsolete("Should be changed into a Tuple<string>")]

public class ArchiveEventArgs {

public string OutputLocation {

get;

private set;

}

public string OutputLocation { get; private set; }

public ArchiveEventArgs(string output) {

MainWindow.xaml.cs

-6+5

/BExplorer/BetterExplorer/MainWindow.xaml.cs

View

[Obsolete("Can remove move this!!! Someone should!!!")]

public bool IsCalledFromLoading;

[Obsolete("Find a way to remove this!")]

public bool isOnLoad;

[Obsolete("Does nothing")]

private bool IsCloseLastTabCloseApp;

//[Obsolete("Does nothing")]

//private bool IsCloseLastTabCloseApp;

[Obsolete("Does nothing")]

private void chkIsLastTabCloseApp_Click(object sender, RoutedEventArgs e) {

var b = this.chkIsLastTabCloseApp.IsChecked;

if (b != null)

this.IsCloseLastTabCloseApp = b.Value;

//var b = this.chkIsLastTabCloseApp.IsChecked;

//if (b != null)

// this.IsCloseLastTabCloseApp = b.Value;

}

BreadcrumbItem.cs

+2

/BreadcrumbBar/BreadcrumbBar/BreadcrumbItem.cs

View

public object GetTraceItem(ShellItem trace) {

//this.ApplyTemplate();

return Items.OfType<ShellItem>().SingleOrDefault(s => s!=null && s.GetHashCode() == trace.GetHashCode());

//TODO: Can we delete the below dead code?

foreach (object item in Items.OfType<ShellItem>().ToArray()) {

BreadcrumbItem bcItem = ContainerFromItem(item);

var rootValue = bcItem.DataContext as ShellItem;

AsyncUnbuffCopy.cs

-121+35

/Shell/FileOperation/AsyncUnbuffCopy.cs

View

using System.Threading;

using System.Threading.Tasks;

namespace BExplorer.Shell

{

internal class AsyncUnbuffCopy : IDisposable

{

namespace BExplorer.Shell {

internal class AsyncUnbuffCopy : IDisposable {

#region setup

//private static readonly ILog Log = LogManager.GetLogger(typeof(AsyncUnbuffCopy));

//private readonly bool _isDebugEnabled = Log.IsDebugEnabled;

private byte[] _writehash;

#endregion

public void Dispose()

{

if (_infile != null)

{

public void Dispose() {

if (_infile != null) {

_infile.Dispose();

_infile = null;

}

if (_outfile != null)

{

if (_outfile != null) {

_outfile.Dispose();

_outfile = null;

}

if (blockFO != null)

{

if (blockFO != null) {

blockFO.Dispose();

blockFO = null;

}

private void AsyncReadFile()

{

private void AsyncReadFile() {

var md5 = MD5.Create();

//open input file

try

{

_infile = new FileStream(_inputfile, FileMode.Open, FileAccess.Read, FileShare.None, CopyBufferSize,

FileFlagNoBuffering | FileOptions.SequentialScan);

}

catch (Exception e)

{

//if (_isDebugEnabled)

//{

// //Log.Debug("Failed to open for read");

// //Log.Debug(e);

//}

throw;

}

//if we have data read it

while ((_bytesRead1 = _infile.Read(Buffer1, 0, CopyBufferSize)) != 0)

{

while ((_bytesRead1 = _infile.Read(Buffer1, 0, CopyBufferSize)) != 0) {

blockFO.WaitOne();

if (_bytesRead1 < CopyBufferSize)

md5.TransformBlock(Buffer1, 0, _bytesRead1, Buffer1, 0);

Monitor.Enter(_locker1);

try

{

try {

while (_buffer2Dirty) Monitor.Wait(_locker1);

Buffer.BlockCopy(Buffer1, 0, Buffer2, 0, _bytesRead1);

// //Log.Debug("Total Read : " + _totalbytesread);

//}

}

catch (Exception e)

{

//Log.Fatal("Read Failed.");

//Log.Fatal(e);

catch {

_readfailed = true;

throw;

}

// For last block:

if (_checksum)

{

if (_checksum) {

md5.TransformFinalBlock(Buffer1, 0, _bytesRead1);

_readhash = md5.Hash;

}

_infile.Dispose();

}

private void AsyncWriteFile()

{

private void AsyncWriteFile() {

//open file for write unbuffered and set length to prevent growth and file fragmentation

try

{

_outfile = new FileStream(_outputfile, FileMode.Create, FileAccess.Write, FileShare.None, 8,

FileOptions.WriteThrough | FileFlagNoBuffering);

//set file size to minimum of one buffer to cut down on fragmentation

_outfile.SetLength((long)(_infilesize > CopyBufferSize ? (Math.Ceiling((double)_infilesize / CopyBufferSize) * CopyBufferSize) : CopyBufferSize));

}

catch (Exception e)

{

//Log.Fatal("Failed to open for write unbuffered");

//Log.Fatal(e);

throw;

}

var pctinc = 0.0;

var progress = pctinc;

//progress stuff

if (_reportprogress)

{

if (_reportprogress) {

//if (_isDebugEnabled)

//{

// //Log.Debug("Report Progress : True");

// //Log.Debug("_totalbyteswritten : " + _totalbyteswritten);

// //Log.Debug("_infilesize - CopyBufferSize: " + (_infilesize - CopyBufferSize));

//}

while ((_totalbyteswritten < _infilesize) && !_readfailed)

{

while ((_totalbyteswritten < _infilesize) && !_readfailed) {

blockFO.WaitOne();

lock (_locker1)

{

lock (_locker1) {

while (!_buffer2Dirty) Monitor.Wait(_locker1);

Buffer.BlockCopy(Buffer2, 0, Buffer3, 0, CopyBufferSize);

_buffer2Dirty = false;

Monitor.PulseAll(_locker1);

//fancy dan in place percent update on each write.

if (_reportprogress)

{

if (_reportprogress) {

Console.SetCursorPosition(_origCol, _origRow);

if (progress < 101 - pctinc)

{

if (progress < 101 - pctinc) {

progress = progress + pctinc;

Console.Write("%{0}", Math.Round(progress, 0));

}

try

{

_outfile.Write(Buffer3, 0, CopyBufferSize);

}

catch (Exception e)

{

//Log.Fatal("Write Unbuffered Failed");

//Log.Fatal(e);

throw;

}

_totalbyteswritten = _totalbyteswritten + CopyBufferSize;

//if (_isDebugEnabled)

//{

_outfile.Close();

_outfile.Dispose();

try

{

//if (_isDebugEnabled)

//{

// //Log.Debug("Open File Set Length");

_outfile.Close();

_outfile.Dispose();

}

catch (Exception e)

{

//if (_isDebugEnabled)

//{

// //Log.Debug("Failed to open for write set length");

// //Log.Debug(e);

//}

throw;

}

public int AsyncCopyFileUnbuffered(string inputfile, string outputfile, bool overwrite, bool movefile, bool checksum, int buffersize, bool reportprogress, int bytessecond)

{

public int AsyncCopyFileUnbuffered(string inputfile, string outputfile, bool overwrite, bool movefile, bool checksum, int buffersize, bool reportprogress, int bytessecond) {

//if (_isDebugEnabled)

//{

// Log.Error("Enter Normal Method");

_outputfile = outputfile;

//if the overwrite flag is set to false check to see if the file is there.

if (File.Exists(outputfile) && !overwrite)

{

if (File.Exists(outputfile) && !overwrite) {

//Log.Debug("Destination File Exists!");

return 0;

}

//create the directory if it doesn't exist

if (!File.Exists(outputfile))

if (!Directory.Exists(outputfile))

{

try

{

if (!Directory.Exists(outputfile)) {

// ReSharper disable AssignNullToNotNullAttribute

Directory.CreateDirectory(Path.GetDirectoryName(outputfile));

// ReSharper restore AssignNullToNotNullAttribute

}

catch (Exception e)

{

//Log.Fatal("Create Directory Failed.");

//Log.Fatal(e);

throw;

}

//get input file size for later use

var inputFileInfo = new FileInfo(_inputfile);

_infilesize = inputFileInfo.Length;

var writefile = new Thread(AsyncWriteFile) { Name = "WriteThread", IsBackground = true };

writefile.Start();

if (_reportprogress)

{

if (_reportprogress) {

//set fancy curor position

_origRow = Console.CursorTop;

_origCol = Console.CursorLeft;

//Log.InfoFormat("Async File {0} Done", _inputfile);

//}

if (checksum)

{

if (checksum) {

//if (_isDebugEnabled)

//{

// //Log.Debug("Checksum Destination File Started");

//hang out until the checksums are done.

checksumwritefile.Join();

if (BitConverter.ToString(_readhash) == BitConverter.ToString(_writehash))

{

if (BitConverter.ToString(_readhash) == BitConverter.ToString(_writehash)) {

//Log.Info("Checksum Verified");

}

else

{

else {

//Log.Info("Checksum Failed");

var sb = new StringBuilder();

for (var i = 0; i < _readhash.Length; i++)

{

for (var i = 0; i < _readhash.Length; i++) {

sb.Append(_readhash[i].ToString("x2"));

}

//Log.DebugFormat("_readhash output : {0}", sb);

sb = new StringBuilder();

for (var i = 0; i < _writehash.Length; i++)

{

for (var i = 0; i < _writehash.Length; i++) {

sb.Append(_writehash[i].ToString("x2"));

}

//Log.DebugFormat("_writehash output : {0}", sb);

}

if (movefile && File.Exists(inputfile) && File.Exists(outputfile))

try

{

if (movefile && File.Exists(inputfile) && File.Exists(outputfile)) {

try {

File.Delete(inputfile);

}

catch (IOException ioex)

{

//Log.Error("File in use or locked cannot move file.");

//Log.Error(ioex);

catch {

}

catch (Exception ex)

{

//Log.Error("File Failed to Delete");

//Log.Error(ex);

}

return 1;

}

//hash output file

public void GetMD5HashFromOutputFile()

{

public void GetMD5HashFromOutputFile() {

var md5 = MD5.Create();

var fs = new FileStream(_outputfile,

FileMode.Open, FileAccess.Read, FileShare.Read, CopyBufferSize,

var buff = new byte[CopyBufferSize];

int bytesread;

while ((bytesread = fs.Read(buff, 0, buff.Length)) != 0)

{

while ((bytesread = fs.Read(buff, 0, buff.Length)) != 0) {

md5.TransformBlock(buff, 0, bytesread, buff, 0);

}

md5.TransformFinalBlock(buff, 0, bytesread);

FileOperation.xaml.cs

-23+19

/Shell/FileOperation/FileOperation.xaml.cs

View

using System.Windows.Media;

using System.Windows.Threading;

namespace BExplorer.Shell

{

namespace BExplorer.Shell {

/// <summary>

/// Interaction logic for FileOperation.xaml

/// </summary>

public partial class FileOperation : UserControl

{

public partial class FileOperation : UserControl {

public String[] SourceItemsCollection { get; set; }

public String DestinationLocation { get; set; }

public FileOperationDialog ParentContents { get; set; }

public Boolean Cancel = false;

public OperationType OperationType { get; set; }

private ManualResetEvent _block;

//private ManualResetEvent _block;

//private MessageReceiver mr;

public Guid Handle;

private int CurrentStatus = -1;

//private int CurrentStatus = -1;

const FileOptions FileFlagNoBuffering = (FileOptions)0x20000000;

private bool DeleteToRB { get; set; }

Thread CopyThread;

//Thread CopyThread;

public delegate void NewMessageDelegate(string NewMessage);

private Boolean IsAdminFO = false;

//private Boolean IsAdminFO = false;

IntPtr CorrespondingWinHandle = IntPtr.Zero;

System.Windows.Forms.Timer LoadTimer = new System.Windows.Forms.Timer();

private ManualResetEvent _block2;

//private ManualResetEvent _block2;

DateTime OperationStartTime = DateTime.Now;

long totaltransfered = 0;

long oldbyteVlaue = 0;

int procCompleted = 0;

//long totaltransfered = 0;

//long oldbyteVlaue = 0;

//int procCompleted = 0;

Dictionary<String, long> oldbyteVlaues = new Dictionary<string, long>();

DateTime LastMeasuredTime = DateTime.Now;

long lastTotalTransfered = 0;

ulong totalSize = 0;

int CopyItemsCount = 0;

Boolean IsNeedAdminFO = false;

bool isProcess = false;

//long lastTotalTransfered = 0;

//ulong totalSize = 0;

//int CopyItemsCount = 0;

//Boolean IsNeedAdminFO = false;

//bool isProcess = false;

public FileOperation()

{

public FileOperation() {

InitializeComponent();

}

// }

private bool isloaded = false;

//private bool isloaded = false;

// private void prOverallProgress_Loaded(object sender, RoutedEventArgs e)

// {

// }

private void UserControl_Loaded(object sender, RoutedEventArgs e)

{

this.isloaded = true;

private void UserControl_Loaded(object sender, RoutedEventArgs e) {

//this.isloaded = true;

}

IContextMenu.cs

-3+3

/Shell/Interop/IContextMenu.cs

View

int idCmdFirst, int idCmdLast,

CMF uFlags);

void InvokeCommand(ref CMINVOKECOMMANDINFOEX pici);

//void InvokeCommand(ref CMINVOKECOMMANDINFOEX pici);

[PreserveSig]

HResult GetCommandString(int idcmd, uint uflags, int reserved,

new HResult QueryContextMenu(IntPtr hMenu, uint indexMenu, int idCmdFirst,

int idCmdLast, CMF uFlags);

[PreserveSig]

new HResult InvokeCommand(ref CMINVOKECOMMANDINFO pici);

//[PreserveSig]

//new HResult InvokeCommand(ref CMINVOKECOMMANDINFO pici);

[PreserveSig]

new HResult GetCommandString(int idcmd, uint uflags, int reserved,

FileSystemKnownFolder.cs

/Shell/KnownFolders/FileSystemKnownFolder.cs

View

Defaults.cs

/Shell/Defaults.cs

View

ShellViewEx.cs

/Shell/ShellViewEx.cs

View

SyncQueue.cs

/Shell/SyncQueue.cs

View

SearchBox.xaml.cs

/WpfControlLibrary1/SearchBox.xaml.cs

View

BetterExplorer1.psess

/BetterExplorer1.psess

View

BetterExplorer140808(6).vsp

/BetterExplorer140808(6).vsp

View



	BExplorer/BetterExplorer
	ArchiveView
	ArchiveProcressScreen.cs
	MainWindow.xaml.cs
	BreadcrumbBar/BreadcrumbBar
	BreadcrumbItem.cs
	Shell
	FileOperation
	AsyncUnbuffCopy.cs
	FileOperation.xaml.cs
	Interop
	IContextMenu.cs
	KnownFolders
	FileSystemKnownFolder.cs
	Defaults.cs
	ShellViewEx.cs
	SyncQueue.cs
	WpfControlLibrary1
	SearchBox.xaml.cs
	BetterExplorer1.psess
	BetterExplorer140808(6).vsp +