fixed: Modules and dll loading

- all dll's in Modules folder now loaded crrectly to Assembly list
- it's no longer needed to add Addon (Modules) packages to
EmberMediaManager project to get the packages loaded, so i've removed
all NuGet packages from projects that not really need a package
- fixed wrong/bad AssemblyName for addons/modules (old ordering and
enable/disable settings for modules can not be loaded from existing
Settings.xml, each use has to check and re-order the modules)
- changed some logger entries

Addons/generic.EmberCore.NMT/generic.Compatibility.NMT.vbproj

@@ -110,8 +110,9 @@
       <HintPath>..\..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="ICSharpCode.SharpZipLib">
+    <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
       <HintPath>..\..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\..\packages\NLog.4.2.3\lib\net45\NLog.dll</HintPath>

Addons/generic.EmberCore.NMT/packages.config

@@ -2,7 +2,7 @@
 <packages>
   <package id="EntityFramework" version="6.1.3" targetFramework="net45" />
   <package id="NLog" version="4.2.3" targetFramework="net45" />
-  <package id="SharpZipLib" version="0.86.0" requireReinstallation="true" />
+  <package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
   <package id="System.Data.SQLite" version="1.0.99.0" targetFramework="net45" />
   <package id="System.Data.SQLite.Core" version="1.0.99.0" targetFramework="net45" />
   <package id="System.Data.SQLite.EF6" version="1.0.99.0" targetFramework="net45" />

Addons/scraper.Data.TVDB/TVDB_Data.vb

@@ -237,8 +237,8 @@ Public Class TVDB_Data
     ''' <param name="ScrapeOptions">What kind of data is being requested from the scrape(global scraper settings)</param>
     ''' <returns>Database.DBElement Object (nMovie) which contains the scraped data</returns>
     ''' <remarks></remarks>
-    Function Scraper(ByRef oDBTV As Database.DBElement, ByRef ScrapeModifiers As Structures.ScrapeModifiers, ByRef ScrapeType As Enums.ScrapeType, ByRef ScrapeOptions As Structures.ScrapeOptions) As Interfaces.ModuleResult_Data_TVShow Implements Interfaces.ScraperModule_Data_TV.Scraper_TVShow
-        logger.Trace("Started TVDB Scraper")
+    Function Scraper_TV(ByRef oDBTV As Database.DBElement, ByRef ScrapeModifiers As Structures.ScrapeModifiers, ByRef ScrapeType As Enums.ScrapeType, ByRef ScrapeOptions As Structures.ScrapeOptions) As Interfaces.ModuleResult_Data_TVShow Implements Interfaces.ScraperModule_Data_TV.Scraper_TVShow
+        logger.Trace("[TVDB_Data] [Scraper_TV] [Start]")
 
         LoadSettings()
 
@@ -260,13 +260,17 @@ Public Class TVDB_Data
                     nTVShow = _scraper.GetSearchTVShowInfo(oDBTV.TVShow.Title, oDBTV, ScrapeType, ScrapeModifiers, FilteredOptions)
                 End If
                 'if still no search result -> exit
-                If nTVShow Is Nothing Then Return New Interfaces.ModuleResult_Data_TVShow With {.Result = Nothing}
+                If nTVShow Is Nothing Then
+                    logger.Trace("[TVDB_Data] [Scraper_TV] [Abort] No search result found")
+                    Return New Interfaces.ModuleResult_Data_TVShow With {.Result = Nothing}
+                End If
             End If
         End If
 
         If nTVShow Is Nothing Then
             Select Case ScrapeType
                 Case Enums.ScrapeType.AllAuto, Enums.ScrapeType.FilterAuto, Enums.ScrapeType.MarkedAuto, Enums.ScrapeType.MissingAuto, Enums.ScrapeType.NewAuto, Enums.ScrapeType.SelectedAuto
+                    logger.Trace("[TVDB_Data] [Scraper_TV] [Abort] No search result found")
                     Return New Interfaces.ModuleResult_Data_TVShow With {.Result = Nothing}
             End Select
         End If
@@ -279,6 +283,7 @@ Public Class TVDB_Data
                         'if a tvshow is found, set DoSearch back to "false" for following scrapers
                         ScrapeModifiers.DoSearch = False
                     Else
+                        logger.Trace("[TVDB_Data] [Scraper_TV] [Abort] [Cancelled] Cancelled by user")
                         Return New Interfaces.ModuleResult_Data_TVShow With {.Cancelled = True, .Result = Nothing}
                     End If
                 End Using
@@ -298,12 +303,12 @@ Public Class TVDB_Data
             End If
         End If
 
-        logger.Trace("Finished TVDB Scraper")
+        logger.Trace("[TVDB_Data] [Scraper_TV] [Done]")
         Return New Interfaces.ModuleResult_Data_TVShow With {.Result = nTVShow}
     End Function
 
     Public Function Scraper_TVEpisode(ByRef oDBTVEpisode As Database.DBElement, ByVal ScrapeOptions As Structures.ScrapeOptions) As Interfaces.ModuleResult_Data_TVEpisode Implements Interfaces.ScraperModule_Data_TV.Scraper_TVEpisode
-        logger.Trace("Started TVDB Scraper")
+        logger.Trace("[TVDB_Data] [Scraper_TVEpisode] [Start]")
 
         LoadSettings()
 
@@ -321,6 +326,7 @@ Public Class TVDB_Data
             ElseIf Not String.IsNullOrEmpty(oDBTVEpisode.TVEpisode.Aired) Then
                 nTVEpisode = _scraper.GetTVEpisodeInfo(CInt(oDBTVEpisode.TVShow.TVDB), oDBTVEpisode.TVEpisode.Aired, FilteredOptions)
             Else
+                logger.Trace("[TVDB_Data] [Scraper_TVEpisode] [Abort] No TV Show TVDB ID and also no AiredDate available")
                 Return New Interfaces.ModuleResult_Data_TVEpisode With {.Result = Nothing}
             End If
         End If
@@ -338,7 +344,7 @@ Public Class TVDB_Data
             End If
         End If
 
-        logger.Trace("Finished TVDB Scraper")
+        logger.Trace("[TVDB_Data] [Scraper_TVEpisode] [Done]")
         Return New Interfaces.ModuleResult_Data_TVEpisode With {.Result = nTVEpisode}
     End Function
 

Addons/scraper.FanartTV.Poster/FanartTV_Image.vb

@@ -529,7 +529,7 @@ Public Class FanartTV_Image
     End Sub
 
     Function Scraper_Movie(ByRef DBMovie As Database.DBElement, ByRef ImagesContainer As MediaContainers.SearchResultsContainer, ByVal ScrapeModifiers As Structures.ScrapeModifiers) As Interfaces.ModuleResult Implements Interfaces.ScraperModule_Image_Movie.Scraper
-        logger.Trace("Started scrape FanartTV")
+        logger.Trace("[FanartTV_Image] [Scraper_Movie] [Start]")
 
         LoadSettings_Movie()
         Dim _scraper As New FanartTVs.Scraper(_SpecialSettings_Movie)
@@ -541,15 +541,15 @@ Public Class FanartTV_Image
         ElseIf Not String.IsNullOrEmpty(DBMovie.Movie.TMDBID) Then
             ImagesContainer = _scraper.GetImages_Movie_MovieSet(DBMovie.Movie.TMDBID, FilteredModifiers)
         Else
-            logger.Trace(String.Concat("No IMDB and TMDB ID exist to search: ", DBMovie.ListTitle))
+            logger.Trace(String.Concat("[FanartTV_Image] [Scraper_Movie] [Abort] No IMDB and TMDB ID exist to search: ", DBMovie.ListTitle))
         End If
 
-        logger.Trace(New StackFrame().GetMethod().Name, "Finished scrape FanartTV")
+        logger.Trace("[FanartTV_Image] [Scraper_Movie] [Done]")
         Return New Interfaces.ModuleResult With {.breakChain = False}
     End Function
 
     Function Scraper_MovieSet(ByRef DBMovieset As Database.DBElement, ByRef ImagesContainer As MediaContainers.SearchResultsContainer, ByVal ScrapeModifiers As Structures.ScrapeModifiers) As Interfaces.ModuleResult Implements Interfaces.ScraperModule_Image_MovieSet.Scraper
-        logger.Trace("Started scrape FanartTV")
+        logger.Trace("[FanartTV_Image] [Scraper_MovieSet] [Start]")
 
         If String.IsNullOrEmpty(DBMovieset.MovieSet.TMDB) Then
             If DBMovieset.MovieList IsNot Nothing AndAlso DBMovieset.MovieList.Count > 0 Then
@@ -566,12 +566,12 @@ Public Class FanartTV_Image
             ImagesContainer = _scraper.GetImages_Movie_MovieSet(DBMovieset.MovieSet.TMDB, FilteredModifiers)
         End If
 
-        logger.Trace("Finished scrape FanartTV")
+        logger.Trace("[FanartTV_Image] [Scraper_MovieSet] [Start]")
         Return New Interfaces.ModuleResult With {.breakChain = False}
     End Function
 
     Function Scraper_TV(ByRef DBTV As Database.DBElement, ByRef ImagesContainer As MediaContainers.SearchResultsContainer, ByVal ScrapeModifiers As Structures.ScrapeModifiers) As Interfaces.ModuleResult Implements Interfaces.ScraperModule_Image_TV.Scraper
-        logger.Trace("Started scrape FanartTV")
+        logger.Trace("[FanartTV_Image] [Scraper_TV] [Start]")
 
         LoadSettings_TV()
         Dim _scraper As New FanartTVs.Scraper(_SpecialSettings_TV)
@@ -585,25 +585,25 @@ Public Class FanartTV_Image
                         ImagesContainer.MainFanarts = _scraper.GetImages_TV(DBTV.TVShow.TVDB, FilteredModifiers).MainFanarts
                     End If
                 Else
-                    logger.Trace(String.Concat("No TVDB ID exist to search: ", DBTV.ListTitle))
+                    logger.Trace(String.Concat("[FanartTV_Image] [Scraper_TV] [Abort] No TVDB ID exist to search: ", DBTV.ListTitle))
                 End If
             Case Enums.ContentType.TVSeason
                 If Not String.IsNullOrEmpty(DBTV.TVShow.TVDB) Then
                     ImagesContainer = _scraper.GetImages_TV(DBTV.TVShow.TVDB, FilteredModifiers)
                 Else
-                    logger.Trace(String.Concat("No TVDB ID exist to search: ", DBTV.ListTitle))
+                    logger.Trace(String.Concat("[FanartTV_Image] [Scraper_TV] [Abort] No TVDB ID exist to search: ", DBTV.ListTitle))
                 End If
             Case Enums.ContentType.TVShow
                 If Not String.IsNullOrEmpty(DBTV.TVShow.TVDB) Then
                     ImagesContainer = _scraper.GetImages_TV(DBTV.TVShow.TVDB, FilteredModifiers)
                 Else
-                    logger.Trace(String.Concat("No TVDB ID exist to search: ", DBTV.ListTitle))
+                    logger.Trace(String.Concat("[FanartTV_Image] [Scraper_TV] [Abort] No TVDB ID exist to search: ", DBTV.ListTitle))
                 End If
             Case Else
-                logger.Error(String.Concat("Unhandled ContentType"))
+                logger.Error(String.Concat("[FanartTV_Image] [Scraper_TV] [Abort] Unhandled ContentType"))
         End Select
 
-        logger.Trace(New StackFrame().GetMethod().Name, "Finished scrape FanartTV")
+        logger.Trace("[FanartTV_Image] [Scraper_TV] [Start]")
         Return New Interfaces.ModuleResult With {.breakChain = False}
     End Function
 

Addons/scraper.FanartTV.Poster/packages.config

@@ -2,5 +2,4 @@
 <packages>
   <package id="FanartTv" version="2.0.5" targetFramework="net45" />
   <package id="NLog" version="4.2.3" targetFramework="net45" />
-  <package id="SharpZipLib" version="0.86.0" requireReinstallation="true" />
 </packages>

Addons/scraper.FanartTV.Poster/scraper.Image.FanartTV.vbproj

@@ -131,9 +131,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\packages\FanartTv.2.0.5\lib\FanartTv.dll</HintPath>
     </Reference>
-    <Reference Include="ICSharpCode.SharpZipLib">
-      <HintPath>..\..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
-    </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\..\packages\NLog.4.2.3\lib\net45\NLog.dll</HintPath>
       <Private>True</Private>

Addons/scraper.IMDB.Data/IMDB_Data.vb

@@ -447,7 +447,7 @@ Public Class IMDB_Data
     ''' <returns>Database.DBElement Object (nMovie) which contains the scraped data</returns>
     ''' <remarks></remarks>
     Function Scraper_Movie(ByRef oDBElement As Database.DBElement, ByRef ScrapeModifiers As Structures.ScrapeModifiers, ByRef ScrapeType As Enums.ScrapeType, ByRef ScrapeOptions As Structures.ScrapeOptions) As Interfaces.ModuleResult_Data_Movie Implements Interfaces.ScraperModule_Data_Movie.Scraper_Movie
-        logger.Trace("Started IMDB Scraper")
+        logger.Trace("[IMDB_Data] [Scraper_Movie] [Start]")
 
         LoadSettings_Movie()
 
@@ -510,7 +510,7 @@ Public Class IMDB_Data
             End If
         End If
 
-        logger.Trace("Finished IMDB Scraper")
+        logger.Trace("[IMDB_Data] [Scraper_Movie] [Done]")
         Return New Interfaces.ModuleResult_Data_Movie With {.Result = nMovie}
     End Function
     ''' <summary>
@@ -521,7 +521,7 @@ Public Class IMDB_Data
     ''' <returns>Database.DBElement Object (nMovie) which contains the scraped data</returns>
     ''' <remarks></remarks>
     Function Scraper_TV(ByRef oDBElement As Database.DBElement, ByRef ScrapeModifiers As Structures.ScrapeModifiers, ByRef ScrapeType As Enums.ScrapeType, ByRef ScrapeOptions As Structures.ScrapeOptions) As Interfaces.ModuleResult_Data_TVShow Implements Interfaces.ScraperModule_Data_TV.Scraper_TVShow
-        logger.Trace("Started IMDB Scraper")
+        logger.Trace("[IMDB_Data] [Scraper_TV] [Start]")
 
         LoadSettings_TV()
 
@@ -575,7 +575,7 @@ Public Class IMDB_Data
             End If
         End If
 
-        logger.Trace("Finished IMDB Scraper")
+        logger.Trace("[IMDB_Data] [Scraper_TV] [Done]")
         Return New Interfaces.ModuleResult_Data_TVShow With {.Result = nTVShow}
     End Function
 

Addons/scraper.IMDB.Poster/IMDB_Image.vb

@@ -137,12 +137,12 @@ Public Class IMDB_Image
     End Sub
 
     Function Scraper(ByRef DBMovie As Database.DBElement, ByRef ImagesContainer As MediaContainers.SearchResultsContainer, ByVal ScrapeModifiers As Structures.ScrapeModifiers) As Interfaces.ModuleResult Implements Interfaces.ScraperModule_Image_Movie.Scraper
-        logger.Trace("Started scrape", New StackTrace().ToString())
+        logger.Trace("[IMDB_Image] [Scraper] [Start]")
         LoadSettings()
 
         ImagesContainer = IMDB.GetIMDBPosters(DBMovie.Movie.IMDBID)
 
-        logger.Trace("Finished scrape", New StackTrace().ToString())
+        logger.Trace("[IMDB_Image] [Scraper] [Start]")
         Return New Interfaces.ModuleResult With {.breakChain = False}
     End Function
 

Addons/scraper.IMPA.Poster/packages.config

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="NLog" version="4.2.3" targetFramework="net45" />
-  <package id="SharpZipLib" version="0.86.0" requireReinstallation="true" />
 </packages>

Addons/scraper.Image.TVDB/TVDB_Image.vb

@@ -192,7 +192,7 @@ Public Class TVDB_Image
     End Sub
 
     Function Scraper(ByRef DBTV As Database.DBElement, ByRef ImagesContainer As MediaContainers.SearchResultsContainer, ByVal ScrapeModifiers As Structures.ScrapeModifiers) As Interfaces.ModuleResult Implements Interfaces.ScraperModule_Image_TV.Scraper
-        logger.Trace("Started scrape TVDB")
+        logger.Trace("[TVDB_Image] [Scraper] [Start]")
 
         LoadSettings()
         Dim _scraper As New TVDBs.Scraper(_SpecialSettings)
@@ -207,24 +207,24 @@ Public Class TVDB_Image
                         ImagesContainer.MainFanarts = _scraper.GetImages_TV(DBTV.TVShow.TVDB, FilteredModifiers).MainFanarts
                     End If
                 Else
-                    logger.Trace(String.Concat("No TVDB ID exist to search: ", DBTV.ListTitle))
+                    logger.Trace(String.Concat("[TVDB_Image] [Scraper] [Abort] No TVDB ID exist to search: ", DBTV.ListTitle))
                 End If
             Case Enums.ContentType.TVSeason
                 If Not String.IsNullOrEmpty(DBTV.TVShow.TVDB) Then
                     ImagesContainer = _scraper.GetImages_TV(DBTV.TVShow.TVDB, FilteredModifiers)
                 Else
-                    logger.Trace(String.Concat("No TVDB ID exist to search: ", DBTV.ListTitle))
+                    logger.Trace(String.Concat("[TVDB_Image] [Scraper] [Abort] No TVDB ID exist to search: ", DBTV.ListTitle))
                 End If
             Case Enums.ContentType.TVShow
                 If Not String.IsNullOrEmpty(DBTV.TVShow.TVDB) Then
                     ImagesContainer = _scraper.GetImages_TV(DBTV.TVShow.TVDB, FilteredModifiers)
                 Else
-                    logger.Trace(String.Concat("No TVDB ID exist to search: ", DBTV.ListTitle))
+                    logger.Trace(String.Concat("[TVDB_Image] [Scraper] [Abort] No TVDB ID exist to search: ", DBTV.ListTitle))
                 End If
             Case Else
         End Select
 
-        logger.Trace(New StackFrame().GetMethod().Name, "Finished scrape TVDB")
+        logger.Trace("[TVDB_Image] [Scraper] [Done]")
         Return New Interfaces.ModuleResult With {.breakChain = False}
     End Function
 

Addons/scraper.MPDB.Poster/packages.config

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="NLog" version="4.2.3" targetFramework="net45" />
-  <package id="SharpZipLib" version="0.86.0" requireReinstallation="true" />
 </packages>

Addons/scraper.MoviepilotDE.Data/MoviepilotDE_Data.vb

@@ -151,7 +151,7 @@ Public Class MoviepilotDE_Data
     ''' <returns>Database.DBElement Object (nMovie) which contains the scraped data</returns>
     ''' <remarks></remarks>
     Function Scraper_Movie(ByRef oDBMovie As Database.DBElement, ByRef ScrapeModifiers As Structures.ScrapeModifiers, ByRef ScrapeType As Enums.ScrapeType, ByRef ScrapeOptions As Structures.ScrapeOptions) As Interfaces.ModuleResult_Data_Movie Implements Interfaces.ScraperModule_Data_Movie.Scraper_Movie
-        logger.Trace("Started MoviepilotDE Scraper")
+        logger.Trace("[MoviepilotDE_Data] [Scraper_Movie] [Start]")
 
         LoadSettings()
 
@@ -162,7 +162,7 @@ Public Class MoviepilotDE_Data
             nMovie = _scraper.GetMovieInfo(oDBMovie.Movie.OriginalTitle, oDBMovie.Movie.Title, oDBMovie.Movie.Year, FilteredOptions)
         End If
 
-        logger.Trace("Finished MoviepilotDE Scraper")
+        logger.Trace("[MoviepilotDE_Data] [Scraper_Movie] [Done]")
         Return New Interfaces.ModuleResult_Data_Movie With {.Result = nMovie}
     End Function
 

Addons/scraper.OFDB.Data/OFDB_Data.vb

@@ -170,7 +170,7 @@ Public Class OFDB_Data
     ''' <returns>Database.DBElement Object (nMovie) which contains the scraped data</returns>
     ''' <remarks></remarks>
     Function Scraper_Movie(ByRef oDBMovie As Database.DBElement, ByRef Modifier As Structures.ScrapeModifiers, ByRef Type As Enums.ScrapeType, ByRef ScrapeOptions As Structures.ScrapeOptions) As Interfaces.ModuleResult_Data_Movie Implements Interfaces.ScraperModule_Data_Movie.Scraper_Movie
-        logger.Trace("Started OFDB Scraper")
+        logger.Trace("[OFDB_Data] [Scraper_Movie] [Start]")
 
         LoadSettings()
 
@@ -179,15 +179,15 @@ Public Class OFDB_Data
 
         'datascraper needs imdb of movie!
         If String.IsNullOrEmpty(oDBMovie.Movie.ID) Then
-            logger.Trace("IMDB-ID of movie is needed, but not availaible! Leave OFDB scraper...")
+            logger.Trace("[OFDB_Data] [Scraper_Movie] [Abort] IMDB-ID of movie is needed, but not availaible")
             Return New Interfaces.ModuleResult_Data_Movie With {.Result = Nothing}
         End If
 
         If Modifier.MainNFO Then
             nMovie = _scraper.GetMovieInfo(oDBMovie.Movie.ID, FilteredOptions)
         End If
 
-        logger.Trace("Finished OFDB Scraper")
+        logger.Trace("[OFDB_Data] [Scraper_Movie] [Done]")
         Return New Interfaces.ModuleResult_Data_Movie With {.Result = nMovie}
     End Function