code cleanup & optimizations.

Code/Directory Scanner/DirectoryScanner.cs

@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Threading;
 using System.Windows.Forms;
 using EMA.Core;
 using EMA.ImportingEngine;
@@ -108,7 +107,11 @@ var allfiles
             }
             catch (Exception e)
             {
-                Debugger.LogMessageToFile(e.ToString());
+
+                Debugger
+                    .LogMessageToFile
+                    (e.ToString());
+
             }
 
             return true;
@@ -210,7 +213,8 @@ private static int CalculateTotalDirectoryCount
             {
 
                 dirsTotal = GetDirectoryCount
-                    (importRootFolder, ref currentDir);
+                    (importRootFolder,
+                    ref currentDir);
 
 
             }

Code/Directory Scanner/RecursiveDirectoryScanner.cs

@@ -7,12 +7,20 @@
 using EMA.ImportingEngine;
 using MeediOS;
 
+
+
 namespace EMA.MediaSnapshotEngine
 {
 
+
+
+
     class RecursiveDirectoryScanner
     {
 
+
+
+
         internal static bool ScanDirectoryRecursively
             (
             string strDir,
@@ -31,12 +39,18 @@ IEnumerable<string> videoExtensionsCommon
         {
 
 
-                MainImportingEngine.GeneralStatus = "Performing media importing...";
+                MainImportingEngine.GeneralStatus
+                    = "Performing media importing...";
+
+
 
-                if (Helpers.UserCancels("Scanning directory " + strDir + "..."))
+                if (Helpers.UserCancels
+                    ("Scanning directory "
+                    + strDir + "..."))
                     return false;
 
 
+
                 if (!DirectoryScanner
                     .ImportFilesFromDirectory
                     (strDir,
@@ -58,18 +72,38 @@ IEnumerable<string> videoExtensionsCommon
                     return false;
 
 
-                IEnumerable<string> directories = new BindingList<string>();
+                IEnumerable<string> directories
+                    = new BindingList<string>();
+
+
 
                 try
                 {
-                    directories = GetSubDirectories(strDir);
+
+                    directories
+                        = GetSubDirectories
+                        (strDir);
+
+
                 }
                 catch (PathTooLongException e)
                 {
-                    MessageBox.Show(@"Path too long");
-                    Debugger.LogMessageToFile("[Directory scanner] An unexpected error occured while the Directory scanner" +
-                                              " was trying to retrieve sub-directories of the directory " + strDir + 
-                                              ". The error was: " + e);
+
+
+                    //MessageBox.Show
+                    //    (@"Path too long");
+
+
+                    Debugger.LogMessageToFile
+                        ("[Directory scanner]" +
+                         " An unexpected error occured " +
+                         "while the Directory scanner" +
+                         " was trying to retrieve " +
+                         "sub-directories of the directory "
+                         + strDir + 
+                         ". The error was: " + e);
+
+
                 }
 
 
@@ -93,23 +127,41 @@ IEnumerable<string> videoExtensionsCommon
         }
 
 
-        private static IEnumerable<string> GetSubDirectories(string strDir)
+        private static IEnumerable<string>
+            GetSubDirectories
+            (string strDir)
         {
+
+
             string[] directories;
 
             try
             {
-                directories = Directory.GetDirectories(strDir);
+
+
+                directories 
+                    = Directory
+                    .GetDirectories
+                    (strDir);
+
+
             }
             catch
             {
                 return null;
             }
 
+
+
             return directories;
         }
 
 
+
+
+
+
+
         //TODO: make all these parameters a struct
         private static bool ScanSubDirectories
             (IMLSection moviesSection,
@@ -202,4 +254,7 @@ internal static bool ScanSubDirectoriesAndImportMediaFiles
 
     }
 
+
+
+
 }

Code/File Metadata Extractors/MovieFileMetadataExtractor.cs

@@ -1,6 +1,6 @@
 //'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
 //'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-//''    Easy Media Adder for Meedio/MeediOS                                                               ''
+//''    Easy Film Importer for Meedio/MeediOS                                                               ''
 //''    Copyright (C) 2008-2012  Stavros Skamagkis                               ''
 //''                                                                             ''
 //''    This program is free software: you can redistribute it and/or modify     ''

Code/File Metadata Extractors/VideoFilenameCleaner.cs

@@ -83,11 +83,17 @@ private static string RemoveTagsFromFilename
             }
 
 
+
             if (releaseIndex > 0)
-                filename = filename.Substring(0, releaseIndex);
+                filename = filename.Substring
+                    (0, releaseIndex);
+
+
 
             filename = filename.Trim();
 
+
+
             return filename;
         }
 
@@ -109,13 +115,18 @@ string pluginPath
 
 
                     Helpers.UpdateProgress
-                        ("","Loading filename cleaner dictionaries...");
+                        ("","Loading filename " +
+                            "cleaner dictionaries...");
+
 
                     Debugger.LogMessageToFile
-                        ("Loading filename cleaner dictionaries...");
+                        ("Loading filename " +
+                         "cleaner dictionaries...");
+
 
                     string dictionaryPath 
-                        = pluginPath + @"Video filename cleaner dictionary\";
+                        = pluginPath +
+                        @"Video filename cleaner dictionary\";
 
 
 
@@ -144,6 +155,7 @@ string dictionaryPath
 
                     }
                     catch (Exception e)
+
                     {
 
                         Helpers.UpdateProgress

Code/Media Section Populator/MediaSectionPopulator.cs

@@ -125,7 +125,8 @@ private static void ImportVideo
 
 
 
-        private static bool AdhereToVideoFilesizeThreshold(FileInfo file)
+        private static bool AdhereToVideoFilesizeThreshold
+            (FileInfo file)
         {
 
 

Code/Media Section Populator/MediaSectionPopulatorHelpers.cs

@@ -2,9 +2,13 @@
 using System.IO;
 using System.Windows.Forms;
 
+
+
 namespace EMA.MediaSnapshotEngine
 {
 
+
+
     internal class MediaSectionPopulatorHelpers
     {
 
@@ -13,13 +17,22 @@ internal class MediaSectionPopulatorHelpers
 
         internal static bool ProceedToImportMovie(FileInfo file)
         {
+
+
             Application.DoEvents();
 
-            bool videoIsLocatedInAMovieFolder = VideoIsLocatedInAMovieFolder(file);
+
+            bool videoIsLocatedInAMovieFolder
+                = VideoIsLocatedInAMovieFolder(file);
+
 
             Application.DoEvents();
 
-            bool proceedToImport = videoIsLocatedInAMovieFolder;
+
+            bool proceedToImport
+                = videoIsLocatedInAMovieFolder;
+
+
 
 
             return proceedToImport;
@@ -31,34 +44,70 @@ internal static bool ProceedToImportMovie(FileInfo file)
 
 
 
-        internal static bool VideoIsLocatedInAMovieFolder(FileSystemInfo file)
+        internal static bool VideoIsLocatedInAMovieFolder
+            (FileSystemInfo file)
         {
 
             Application.DoEvents();
 
             bool isFilm = false;
 
-            foreach (string filmsFolder in Settings.FilmsFolders)
+
+            foreach (string filmsFolder 
+                in Settings.FilmsFolders)
             {
-                if (String.IsNullOrEmpty(filmsFolder)) continue;
 
-                if (!file.FullName.Contains(filmsFolder)) continue;
+
+                if (String.IsNullOrEmpty
+                    (filmsFolder))
+                    continue;
+
+
+
+                if (!file.FullName
+                    .Contains
+                    (filmsFolder))
+                    continue;
+
+
 
                 Debugger.LogMessageToFile(
-                    "This video file is contained in the specified films root directory and will be considered to be a film.");
+                    "This video file is contained" +
+                    " in the specified films root directory" +
+                    " and will be considered to be a film.");
+
+
                 isFilm = true;
+
+
             }
 
+
             Application.DoEvents();
 
             return isFilm;
         }
 
-        internal static bool SkipTrailer(FileSystemInfo file)
+
+
+
+        internal static bool
+            SkipTrailer
+            (FileSystemInfo file)
         {
-            string fileNameWoExt = file.Name.Replace(file.Extension, "");
 
-            return fileNameWoExt.EndsWith("-trailer");
+
+            string fileNameWoExt 
+                = file.Name.Replace
+                (file.Extension, "");
+
+
+
+            return fileNameWoExt
+                .EndsWith
+                ("-trailer");
+
+
         }