Skip to content

Commit

Permalink
Built Release 0.4.1 and minor improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
modiholodri committed Dec 6, 2015
1 parent 26455b0 commit 8e06155
Show file tree
Hide file tree
Showing 9 changed files with 89 additions and 22 deletions.
Binary file modified Installation Folder/MFM Program/Movie File Merger Copyright.rtf
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
\par Mark some of the New items as Garbage if you don't want to have them or mark them as Wish to process them if they should be copied or moved to the target folder. Save the Garbage and the Wish lists.
\par Select if you want to copy or move the items to process from the Import folder. Check 'Keep Folders' if the folder structure in the Import folder should be kept. To flatten the folder structure, uncheck Keep Folders. Click Start to process the items. Wait until the processing it finished.
\par Repeat the procedure until no new items are left in the Import list.
\par \pard\keepn\s2\sb240\sa60\sl276\slmult1\b\i\f0\fs28 Lists Tab\f3
\par \pard\keepn\s2\sb240\sa60\sl276\slmult1\b\i\f0\fs28 Maintenance Tab\f3
\par \pard\keepn\s1\sb240\sa60\sl276\slmult1\b0\i0\f1\fs22 The Mainttenance tab interfaces with FileBot and the Windows Explorer via drag and drop. It's main purpose is to renames the videos and cleanup your collections.
\par \kerning32\b\f0\fs32 Additional Information
\par \pard\sa200\sl276\slmult1\kerning0\b0\f1\fs22 For more information have a look at the MFM User Manual http://movie-file-merger.org/usermanual.html or check out How to Organize Videos on Your Hard Disks http://movie-file-merger.org/organizevideos.html.
Expand Down
Binary file modified Installation Folder/MFM Program/Movie File Merger Settings.rtf
Binary file not shown.
Binary file modified Installation Folder/MFM Program/Movie File Merger.exe
Binary file not shown.
12 changes: 6 additions & 6 deletions MFM Setup Script.iss
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
AppId={{C5C730EB-3765-4B4D-B5B1-DE8F1564205A}
AppName=Movie File Merger
AppVersion=0.4.0
;AppVerName=Movie File Merger 0.4.0
AppVersion=0.4.1
;AppVerName=Movie File Merger 0.4.1
AppPublisher=Reinhold Lauer
AppPublisherURL=http://Movie-File-Merger.org/
AppSupportURL=http://Movie-File-Merger.org/
Expand All @@ -28,17 +28,17 @@ CloseApplications=False
RestartApplications=False
RestartIfNeededByRun=False
UninstallDisplayIcon={uninstallexe}
AppCopyright=(c) 2015 Reinhold Lauer
AppCopyright=(c) 2016 Reinhold Lauer
UsePreviousSetupType=False
UsePreviousTasks=False
UsePreviousLanguage=False
AppContact=reinhold.lauer@gmail.com
VersionInfoVersion=0.4.0
VersionInfoVersion=0.4.1
VersionInfoCompany=Reinhold Lauer
VersionInfoDescription=Selectively Merge Collections on Hard Disks
VersionInfoCopyright=(c) 2015 Reinhold Lauer
VersionInfoCopyright=(c) 2016 Reinhold Lauer
VersionInfoProductName=Movie File Merger
VersionInfoProductVersion=0.4.0
VersionInfoProductVersion=0.4.1
PrivilegesRequired=lowest
InfoBeforeFile="MFM Setup Info Before.rtf"
AllowRootDirectory=True
Expand Down
54 changes: 47 additions & 7 deletions Movie File Merger/MainForm.Designer.cs

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

39 changes: 33 additions & 6 deletions Movie File Merger/MainForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,7 @@ public MainForm()
}
sfdMovieFileMerger.InitialDirectory = strCollectionsPath;

LoadXmlSettings( );
// string input = Microsoft.VisualBasic.Interaction.InputBox("Prompt", "Title", "Default", -1, -1);
LoadXmlSettings( false );

Text = strNickName + " - Movie File Merger";

Expand Down Expand Up @@ -413,10 +412,10 @@ string readXmlSetting ( XmlDocument doc, string sSettingName, string sDefault )
/// <summary>
/// Loads the XML settings.
/// </summary>
void LoadXmlSettings ()
void LoadXmlSettings ( bool bReset )
{
strXmlFilePath = Path.Combine( strPrivatePath, "MFM Settings.xml" );
if ( !File.Exists( strXmlFilePath ) ) {
if ( !File.Exists( strXmlFilePath ) || bReset ) {
using (XmlWriter writer = XmlWriter.Create( strXmlFilePath )) // create a dummy
{
writer.WriteStartDocument();
Expand All @@ -433,6 +432,7 @@ void LoadXmlSettings ()
strNickName = readXmlSetting ( xmlSettings, "/MFMSettings/General/NickName", "Anonymous" );
cobSearchInfo.Text = readXmlSetting ( xmlSettings, "/MFMSettings/General/SeachInfo", "IMDb" );
cobSearchDownload.Text = readXmlSetting ( xmlSettings, "/MFMSettings/General/SeachDownload", "Torrentz" );
cobDoubleClickDefault.Text = readXmlSetting ( xmlSettings, "/MFMSettings/General/DoubleClickDefault", "Play" );
cbGetHigherRes.Checked = readXmlSetting ( xmlSettings, "/MFMSettings/General/GetHigherRes", "True" ) == "True";
lblLastChecked.Text = readXmlSetting ( xmlSettings, "/MFMSettings/General/LastChecked", "Last Checked: Never" );
cobCheckForUpdates.Text = readXmlSetting ( xmlSettings, "/MFMSettings/General/CheckForUpdates", "Last Checked: Never" );
Expand All @@ -444,7 +444,7 @@ void LoadXmlSettings ()

// Name Unification settings
tbCutNameBeforeRegex.Text = readXmlSetting ( xmlSettings, "/MFMSettings/NameUnification/CutNameBeforeRegex", @"720p|1080p|(cd[1234])|x264|aac|divx|xvid|dvd" );
tbOnlyCharactersRegex.Text = readXmlSetting ( xmlSettings, "/MFMSettings/NameUnification/OnlyCharactersRegex", @"[^a-zA-Z0-9 -'üöä]" );
tbOnlyCharactersRegex.Text = readXmlSetting ( xmlSettings, "/MFMSettings/NameUnification/OnlyCharactersRegex", @"[^\p{L}\p{N} -'ก-์]" );
tbToLowerRegex.Text = readXmlSetting ( xmlSettings, "/MFMSettings/NameUnification/ToLowerRegex", @" On | A | The | Of | And | Or | To | From | For | In | As | At | With " );
tbEpisodesIdRegex.Text = readXmlSetting ( xmlSettings, "/MFMSettings/NameUnification/EpisodesIdRegex", @".s\d+[e ]\d+" );
tbGoodDocuNameRegex.Text = readXmlSetting ( xmlSettings, "/MFMSettings/NameUnification/GoodDocuRegex", @".* S[12]\d{3}E\d{1,3} .*$" );
Expand Down Expand Up @@ -518,6 +518,7 @@ void SaveXmlSettings( )
writer.WriteElementString ( "NickName", strNickName );
writer.WriteElementString ( "SeachInfo", cobSearchInfo.Text );
writer.WriteElementString ( "SeachDownload", cobSearchDownload.Text );
writer.WriteElementString ( "DoubleClickDefault", cobDoubleClickDefault.Text );
writer.WriteElementString ( "GetHigherRes", cbGetHigherRes.Checked.ToString() );
writer.WriteElementString ( "LastChecked", lblLastChecked.Text );
writer.WriteElementString ( "CheckForUpdates", cobCheckForUpdates.Text );
Expand Down Expand Up @@ -2021,7 +2022,23 @@ void LvItemSelectionChanged( object sender, ListViewItemSelectionChangedEventArg
/// <param name="e">The arguments that the implementor of this event may find useful.</param>
void LvDoubleClick( object sender, EventArgs e )
{
SearchInfo( (ListView)sender );
switch ( cobDoubleClickDefault.Text ) {
case "DoubleClick Default":
Play ( );
break;
case "Play":
Play ( );
break;
case "Search Info":
SearchInfo( (ListView)sender );
break;
case "Search Download":
SearchDownload ( (ListView)sender );
break;
default:
Play ( );
break;
}
}

/// <summary>
Expand Down Expand Up @@ -2801,5 +2818,15 @@ void SettingsChanged(object sender, EventArgs e)
{
SaveXmlSettings ( );
}

/// <summary>
/// Reset all settings to their default values.
/// </summary>
/// <param name="sender">The object that invoked the event that fired the event handler.</param>
/// <param name="e">The arguments that the implementor of this event may find useful.</param>
void BtnResetSettingsClick(object sender, EventArgs e)
{
LoadXmlSettings( true );
}
}
}
2 changes: 1 addition & 1 deletion Movie File Merger/MainForm.resx
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAC0
JAAAAk1TRnQBSQFMAgEBGwEAAUQBDQFEAQ0BEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
JAAAAk1TRnQBSQFMAgEBGwEAAWQBDQFkAQ0BEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAAXADAAEBAQABCAYAARwYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
Expand Down
2 changes: 1 addition & 1 deletion Movie File Merger/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@
//
// You can specify all the values or you can use the default the Revision and
// Build Numbers by using the '*' as shown below:
[assembly: AssemblyVersion("0.5.0.0")]
[assembly: AssemblyVersion("0.4.1.0")]

0 comments on commit 8e06155

Please sign in to comment.