diff --git a/Movie File Merger.sln b/Movie File Merger.sln index 45aa2a9..8f96a70 100644 --- a/Movie File Merger.sln +++ b/Movie File Merger.sln @@ -1,18 +1,36 @@  -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -# SharpDevelop 5.1 +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Express 14 for Windows Desktop +VisualStudioVersion = 14.0.25420.1 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Movie File Merger", "Movie File Merger\Movie File Merger.csproj", "{58266960-EA2C-447E-9084-40D36650E7A7}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Movie File MergerTests", "Movie File MergerTests\Movie File MergerTests.csproj", "{CE40EB5C-69A1-40BB-8A53-45A61BAD7EBB}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {58266960-EA2C-447E-9084-40D36650E7A7}.Debug|Any CPU.ActiveCfg = Debug|x86 {58266960-EA2C-447E-9084-40D36650E7A7}.Debug|x86.ActiveCfg = Debug|x86 {58266960-EA2C-447E-9084-40D36650E7A7}.Debug|x86.Build.0 = Debug|x86 + {58266960-EA2C-447E-9084-40D36650E7A7}.Release|Any CPU.ActiveCfg = Release|x86 {58266960-EA2C-447E-9084-40D36650E7A7}.Release|x86.ActiveCfg = Release|x86 {58266960-EA2C-447E-9084-40D36650E7A7}.Release|x86.Build.0 = Release|x86 + {CE40EB5C-69A1-40BB-8A53-45A61BAD7EBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CE40EB5C-69A1-40BB-8A53-45A61BAD7EBB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CE40EB5C-69A1-40BB-8A53-45A61BAD7EBB}.Debug|x86.ActiveCfg = Debug|Any CPU + {CE40EB5C-69A1-40BB-8A53-45A61BAD7EBB}.Debug|x86.Build.0 = Debug|Any CPU + {CE40EB5C-69A1-40BB-8A53-45A61BAD7EBB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CE40EB5C-69A1-40BB-8A53-45A61BAD7EBB}.Release|Any CPU.Build.0 = Release|Any CPU + {CE40EB5C-69A1-40BB-8A53-45A61BAD7EBB}.Release|x86.ActiveCfg = Release|Any CPU + {CE40EB5C-69A1-40BB-8A53-45A61BAD7EBB}.Release|x86.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE EndGlobalSection EndGlobal diff --git a/Movie File Merger/MainForm.Designer.cs b/Movie File Merger/MainForm.Designer.cs index 0bd1d9c..e19578f 100644 --- a/Movie File Merger/MainForm.Designer.cs +++ b/Movie File Merger/MainForm.Designer.cs @@ -5,7 +5,7 @@ */ namespace Movie_File_Merger { - partial class MainForm + partial class MFMForm { /// /// Designer variable used to keep track of non-visual components. @@ -36,7 +36,7 @@ protected override void Dispose(bool disposing) private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm)); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MFMForm)); this.fbdMovieFileMerger = new System.Windows.Forms.FolderBrowserDialog(); this.ilMovieFileMerger = new System.Windows.Forms.ImageList(this.components); this.tmrUpdateCounters = new System.Windows.Forms.Timer(this.components); diff --git a/Movie File Merger/MainForm.cs b/Movie File Merger/MainForm.cs index b9ba430..289aa71 100644 --- a/Movie File Merger/MainForm.cs +++ b/Movie File Merger/MainForm.cs @@ -33,7 +33,7 @@ namespace Movie_File_Merger /// /// Application to selectively combine collections on hard disks. /// - public partial class MainForm : Form { + public partial class MFMForm : Form { ListView lvDragSource = null; // the list view from which has been dragged Color DragColor = Color.Red; // the color of the item which has been dragged string[] saCollections = { "Miscellaneous", "Adults", "Movies", "Documentaries", "Series", "Clips" }; // all collections @@ -94,7 +94,7 @@ public partial class MainForm : Form { /// /// MFM main form to selectivley combine video collections /// - public MainForm( ) + public MFMForm( ) { InitializeComponent( ); LogInfo( "Initializing Movie File Merger..." ); @@ -182,13 +182,13 @@ public MainForm( ) /// /// Converts a datetime to the standard date format yyyy-mm-dd. /// - /// The date time to standardize. + /// The date time to standardize. /// The standzadized date string. - string StandardizeDate( DateTime dtToSStandardize ) + public string StandardizeDate( DateTime dtToStandardize ) { - return dtToSStandardize.Year.ToString( "D4" ) + "-" + - dtToSStandardize.Month.ToString( "D2" ) + "-" + - dtToSStandardize.Day.ToString( "D2" ); + return dtToStandardize.Year.ToString( "D4" ) + "-" + + dtToStandardize.Month.ToString( "D2" ) + "-" + + dtToStandardize.Day.ToString( "D2" ); } /// @@ -196,11 +196,11 @@ string StandardizeDate( DateTime dtToSStandardize ) /// /// The date time to standardize. /// The standzadized time string. - string StandardizeTime( DateTime dtToSStandardize ) + string StandardizeTime( DateTime dtToStandardize ) { - return dtToSStandardize.Hour.ToString( "D2" ) + "-" + - dtToSStandardize.Minute.ToString( "D2" ) + "-" + - dtToSStandardize.Second.ToString( "D2" ); + return dtToStandardize.Hour.ToString( "D2" ) + "-" + + dtToStandardize.Minute.ToString( "D2" ) + "-" + + dtToStandardize.Second.ToString( "D2" ); } /// diff --git a/Movie File Merger/Program.cs b/Movie File Merger/Program.cs index 8cb6926..cff6f92 100644 --- a/Movie File Merger/Program.cs +++ b/Movie File Merger/Program.cs @@ -21,7 +21,7 @@ private static void Main(string[] args) { Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); - Application.Run(new MainForm()); + Application.Run(new MFMForm()); } } diff --git a/Movie File MergerTests/MFMFormTests.cs b/Movie File MergerTests/MFMFormTests.cs new file mode 100644 index 0000000..7376322 --- /dev/null +++ b/Movie File MergerTests/MFMFormTests.cs @@ -0,0 +1,17 @@ +using Microsoft.VisualStudio.TestTools.UnitTesting; +using Movie_File_Merger; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Movie_File_Merger.Tests { + [TestClass( )] + public class MFMFormTests { + [TestMethod( )] + public void StandardizeDateTest( ) + { + + } + } +} \ No newline at end of file diff --git a/Movie File MergerTests/Movie File MergerTests.csproj b/Movie File MergerTests/Movie File MergerTests.csproj new file mode 100644 index 0000000..e691581 --- /dev/null +++ b/Movie File MergerTests/Movie File MergerTests.csproj @@ -0,0 +1,90 @@ + + + + Debug + AnyCPU + {CE40EB5C-69A1-40BB-8A53-45A61BAD7EBB} + Library + Properties + Movie_File_MergerTests + Movie File MergerTests + v4.0 + 512 + {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 10.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages + False + UnitTest + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + + + + + + + + {58266960-EA2C-447E-9084-40D36650E7A7} + Movie File Merger + + + + + + + False + + + False + + + False + + + False + + + + + + + + \ No newline at end of file diff --git a/Movie File MergerTests/Properties/AssemblyInfo.cs b/Movie File MergerTests/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..993ef35 --- /dev/null +++ b/Movie File MergerTests/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// 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( "Movie File MergerTests" )] +[assembly: AssemblyDescription( "" )] +[assembly: AssemblyConfiguration( "" )] +[assembly: AssemblyCompany( "" )] +[assembly: AssemblyProduct( "Movie File MergerTests" )] +[assembly: AssemblyCopyright( "Copyright © 2017" )] +[assembly: AssemblyTrademark( "" )] +[assembly: AssemblyCulture( "" )] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible( false )] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid( "ce40eb5c-69a1-40bb-8a53-45a61bad7ebb" )] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// 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( "1.0.0.0" )] +[assembly: AssemblyFileVersion( "1.0.0.0" )] diff --git a/MovieFileMergerTest/Movie File Merger Test.csproj b/MovieFileMergerTest/Movie File Merger Test.csproj new file mode 100644 index 0000000..9918d4c --- /dev/null +++ b/MovieFileMergerTest/Movie File Merger Test.csproj @@ -0,0 +1,90 @@ + + + + Debug + AnyCPU + {0E1265E4-8AFF-46B2-9A69-04588917C568} + Library + Properties + MovieFileMergerTest + MovieFileMergerTest + v4.5 + 512 + {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 10.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages + False + UnitTest + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + + + + + + + + + {58266960-ea2c-447e-9084-40d36650e7a7} + Movie File Merger + + + + + + + False + + + False + + + False + + + False + + + + + + + + \ No newline at end of file diff --git a/MovieFileMergerTest/Properties/AssemblyInfo.cs b/MovieFileMergerTest/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..e629b05 --- /dev/null +++ b/MovieFileMergerTest/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// 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( "MovieFileMergerTest" )] +[assembly: AssemblyDescription( "" )] +[assembly: AssemblyConfiguration( "" )] +[assembly: AssemblyCompany( "" )] +[assembly: AssemblyProduct( "MovieFileMergerTest" )] +[assembly: AssemblyCopyright( "Copyright © 2017" )] +[assembly: AssemblyTrademark( "" )] +[assembly: AssemblyCulture( "" )] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible( false )] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid( "0e1265e4-8aff-46b2-9a69-04588917c568" )] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// 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( "1.0.0.0" )] +[assembly: AssemblyFileVersion( "1.0.0.0" )] diff --git a/MovieFileMergerTest/UnitTestBasics.cs b/MovieFileMergerTest/UnitTestBasics.cs new file mode 100644 index 0000000..ff2b8e5 --- /dev/null +++ b/MovieFileMergerTest/UnitTestBasics.cs @@ -0,0 +1,29 @@ +using Movie_File_Merger; +using System; +using Microsoft.VisualStudio.TestTools.UnitTesting; + +namespace Movie_File_Merger { + [TestClass( )] + public class UnitTestBasics { + [TestMethod( )] + public void StandardizeDateTest( ) + { + DateTime dtNew = new DateTime( 2017, 01, 13 ); + + string str20170113 = MFMForm.StandardizeDate( dtNew ); + + Assert.Fail( ); + } + } +} + +namespace MovieFileMergerTest { + [TestClass] + public class UnitTestBasics { + [TestMethod] + public void TestStandardizeDate( ) + { + + } + } +}