diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index a8dd93d6d4..0000000000 --- a/.gitmodules +++ /dev/null @@ -1,9 +0,0 @@ -[submodule "Emby.XmlTv"] - path = Emby.XmlTv - url = https://github.com/jellyfin/Emby.XmlTv.git -[submodule "ImageMagickSharp"] - path = ImageMagickSharp - url = https://github.com/jellyfin/ImageMagickSharp.git -[submodule "Emby.IsoMounting"] - path = Emby.IsoMounting - url = https://github.com/jellyfin/Emby.IsoMounting.git diff --git a/Emby.IsoMounting b/Emby.IsoMounting deleted file mode 160000 index c06ed2667c..0000000000 --- a/Emby.IsoMounting +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c06ed2667c6b0288d856fa6ab305e23d2529fd9a diff --git a/Emby.IsoMounting/.gitignore b/Emby.IsoMounting/.gitignore new file mode 100644 index 0000000000..bdc3535f74 --- /dev/null +++ b/Emby.IsoMounting/.gitignore @@ -0,0 +1,108 @@ +# Build Folders (you can keep bin if you'd like, to store dlls and pdbs) +[Bb]in/ +[Oo]bj/ + +# mstest test results +TestResults + +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. + +# User-specific files +*.suo +*.user +*.sln.docstates + +# Build results +[Dd]ebug/ +[Rr]elease/ +x64/ +*_i.c +*_p.c +*.ilk +*.meta +*.obj +*.pch +*.pdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.log +*.vspscc +*.vssscc +.builds + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opensdf +*.sdf + +# Visual Studio profiler +*.psess +*.vsp +*.vspx + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper* + +# NCrunch +*.ncrunch* +.*crunch*.local.xml + +# Installshield output folder +[Ee]xpress + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish + +# Publish Web Output +*.Publish.xml + +# NuGet Packages Directory +packages + +# Windows Azure Build Output +csx +*.build.csdef + +# Windows Store app package directory +AppPackages/ + +# Others +[Bb]in +[Oo]bj +sql +TestResults +[Tt]est[Rr]esult* +*.Cache +ClientBin +[Ss]tyle[Cc]op.* +~$* +*.dbmdl +Generated_Code #added for RIA/Silverlight projects + +# Backup & report files from converting an old project file to a newer +# Visual Studio version. Backup files are not needed, because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML diff --git a/Emby.IsoMounting/IsoMounter.sln b/Emby.IsoMounting/IsoMounter.sln new file mode 100644 index 0000000000..7505be4f70 --- /dev/null +++ b/Emby.IsoMounting/IsoMounter.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.27004.2009 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IsoMounter", "IsoMounter\IsoMounter.csproj", "{B94C929C-6552-4620-9BE5-422DD9A151BA}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {B94C929C-6552-4620-9BE5-422DD9A151BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B94C929C-6552-4620-9BE5-422DD9A151BA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B94C929C-6552-4620-9BE5-422DD9A151BA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B94C929C-6552-4620-9BE5-422DD9A151BA}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {C0E8EAD1-E4D7-44CD-B801-03BD12F30B1B} + EndGlobalSection +EndGlobal diff --git a/Emby.IsoMounting/IsoMounter/Configuration/PluginConfiguration.cs b/Emby.IsoMounting/IsoMounter/Configuration/PluginConfiguration.cs new file mode 100644 index 0000000000..9308b8c891 --- /dev/null +++ b/Emby.IsoMounting/IsoMounter/Configuration/PluginConfiguration.cs @@ -0,0 +1,8 @@ +using MediaBrowser.Model.Plugins; + +namespace IsoMounter.Configuration +{ + public class PluginConfiguration : BasePluginConfiguration + { + } +} \ No newline at end of file diff --git a/Emby.IsoMounting/IsoMounter/IsoMounter.csproj b/Emby.IsoMounting/IsoMounter/IsoMounter.csproj new file mode 100644 index 0000000000..49a9d948c0 --- /dev/null +++ b/Emby.IsoMounting/IsoMounter/IsoMounter.csproj @@ -0,0 +1,13 @@ + + + + + + + + + netcoreapp2.1 + false + + + diff --git a/Emby.IsoMounting/IsoMounter/LinuxIsoManager.cs b/Emby.IsoMounting/IsoMounter/LinuxIsoManager.cs new file mode 100644 index 0000000000..12669d05d3 --- /dev/null +++ b/Emby.IsoMounting/IsoMounter/LinuxIsoManager.cs @@ -0,0 +1,481 @@ +using System; +using System.IO; +using System.Threading; +using System.Threading.Tasks; +using MediaBrowser.Model.Diagnostics; +using MediaBrowser.Model.IO; +using MediaBrowser.Model.Logging; +using MediaBrowser.Model.System; +using System.Runtime.InteropServices; + +namespace IsoMounter +{ + public class LinuxIsoManager : IIsoMounter + { + [DllImport("libc", SetLastError = true)] + public static extern uint getuid(); + + #region Private Fields + + private readonly IEnvironmentInfo EnvironmentInfo; + private readonly bool ExecutablesAvailable; + private readonly IFileSystem FileSystem; + private readonly ILogger Logger; + private readonly string MountCommand; + private readonly string MountPointRoot; + private readonly IProcessFactory ProcessFactory; + private readonly string SudoCommand; + private readonly string UmountCommand; + + #endregion + + #region Constructor(s) + + public LinuxIsoManager(ILogger logger, IFileSystem fileSystem, IEnvironmentInfo environment, IProcessFactory processFactory) + { + + EnvironmentInfo = environment; + FileSystem = fileSystem; + Logger = logger; + ProcessFactory = processFactory; + + MountPointRoot = FileSystem.DirectorySeparatorChar + "tmp" + FileSystem.DirectorySeparatorChar + "Emby"; + + Logger.Debug( + "[{0}] System PATH is currently set to [{1}].", + Name, + EnvironmentInfo.GetEnvironmentVariable("PATH") ?? "" + ); + + Logger.Debug( + "[{0}] System path separator is [{1}].", + Name, + EnvironmentInfo.PathSeparator + ); + + Logger.Debug( + "[{0}] Mount point root is [{1}].", + Name, + MountPointRoot + ); + + // + // Get the location of the executables we need to support mounting/unmounting ISO images. + // + + SudoCommand = GetFullPathForExecutable("sudo"); + + Logger.Info( + "[{0}] Using version of [sudo] located at [{1}].", + Name, + SudoCommand + ); + + MountCommand = GetFullPathForExecutable("mount"); + + Logger.Info( + "[{0}] Using version of [mount] located at [{1}].", + Name, + MountCommand + ); + + UmountCommand = GetFullPathForExecutable("umount"); + + Logger.Info( + "[{0}] Using version of [umount] located at [{1}].", + Name, + UmountCommand + ); + + if (!String.IsNullOrEmpty(SudoCommand) && !String.IsNullOrEmpty(MountCommand) && !String.IsNullOrEmpty(UmountCommand)) { + ExecutablesAvailable = true; + } else { + ExecutablesAvailable = false; + } + + } + + #endregion + + #region Interface Implementation for IIsoMounter + + public bool IsInstalled { + get { + return true; + } + } + + public string Name { + get { return "LinuxMount"; } + } + + public bool RequiresInstallation { + get { + return false; + } + } + + public bool CanMount(string path) + { + + if (EnvironmentInfo.OperatingSystem == MediaBrowser.Model.System.OperatingSystem.Linux) { + Logger.Info( + "[{0}] Checking we can attempt to mount [{1}], Extension = [{2}], Operating System = [{3}], Executables Available = [{4}].", + Name, + path, + Path.GetExtension(path), + EnvironmentInfo.OperatingSystem, + ExecutablesAvailable.ToString() + ); + + if (ExecutablesAvailable) { + return string.Equals(Path.GetExtension(path), ".iso", StringComparison.OrdinalIgnoreCase); + } else { + return false; + } + } else { + return false; + } + + } + + public Task Install(CancellationToken cancellationToken) + { + return Task.FromResult(false); + } + + public async Task Mount(string isoPath, CancellationToken cancellationToken) + { + + LinuxMount mountedISO; + + if (MountISO(isoPath, out mountedISO)) { + + return mountedISO; + + }else{ + + throw new IOException(String.Format( + "An error occurred trying to mount image [$0].", + isoPath + )); + + } + + } + + #endregion + + #region Interface Implementation for IDisposable + + // Flag: Has Dispose already been called? + private bool disposed = false; + + public void Dispose() + { + + // Dispose of unmanaged resources. + Dispose(true); + + // Suppress finalization. + GC.SuppressFinalize(this); + + } + + protected virtual void Dispose(bool disposing) + { + + if (disposed) { + return; + } + + Logger.Info( + "[{0}] Disposing [{1}].", + Name, + disposing.ToString() + ); + + if (disposing) { + + // + // Free managed objects here. + // + + } + + // + // Free any unmanaged objects here. + // + + disposed = true; + + } + + #endregion + + #region Private Methods + + private string GetFullPathForExecutable(string name) + { + + foreach (string test in (EnvironmentInfo.GetEnvironmentVariable("PATH") ?? "").Split(EnvironmentInfo.PathSeparator)) { + + string path = test.Trim(); + + if (!String.IsNullOrEmpty(path) && FileSystem.FileExists(path = Path.Combine(path, name))) { + return FileSystem.GetFullPath(path); + } + + } + + return String.Empty; + + } + + private uint GetUID() + { + + var uid = getuid(); + + Logger.Debug( + "[{0}] Our current UID is [{1}], GetUserId() returned [{2}].", + Name, + uid.ToString(), + uid + ); + + return uid; + + } + + private bool ExecuteCommand(string cmdFilename, string cmdArguments) + { + + bool processFailed = false; + + var process = ProcessFactory.Create( + new ProcessOptions { + CreateNoWindow = true, + RedirectStandardOutput = true, + RedirectStandardError = true, + UseShellExecute = false, + FileName = cmdFilename, + Arguments = cmdArguments, + IsHidden = true, + ErrorDialog = false, + EnableRaisingEvents = true + } + ); + + try { + + process.Start(); + + //StreamReader outputReader = process.StandardOutput.; + //StreamReader errorReader = process.StandardError; + + Logger.Debug( + "[{0}] Standard output from process is [{1}].", + Name, + process.StandardOutput.ReadToEnd() + ); + + Logger.Debug( + "[{0}] Standard error from process is [{1}].", + Name, + process.StandardError.ReadToEnd() + ); + + } catch (Exception ex) { + + processFailed = true; + + Logger.Debug( + "[{0}] Unhandled exception executing command, exception is [{1}].", + Name, + ex.Message + ); + + } + + if (!processFailed && process.ExitCode == 0) { + return true; + } else { + return false; + } + + } + + private bool MountISO(string isoPath, out LinuxMount mountedISO) + { + + string cmdArguments; + string cmdFilename; + string mountPoint = Path.Combine(MountPointRoot, Guid.NewGuid().ToString()); + + if (!string.IsNullOrEmpty(isoPath)) { + + Logger.Info( + "[{0}] Attempting to mount [{1}].", + Name, + isoPath + ); + + Logger.Debug( + "[{0}] ISO will be mounted at [{1}].", + Name, + mountPoint + ); + + } else { + + throw new ArgumentNullException(nameof(isoPath)); + + } + + try { + FileSystem.CreateDirectory(mountPoint); + } catch (UnauthorizedAccessException) { + throw new IOException("Unable to create mount point(Permission denied) for " + isoPath); + } catch (Exception) { + throw new IOException("Unable to create mount point for " + isoPath); + } + + if (GetUID() == 0) { + cmdFilename = MountCommand; + cmdArguments = string.Format("\"{0}\" \"{1}\"", isoPath, mountPoint); + } else { + cmdFilename = SudoCommand; + cmdArguments = string.Format("\"{0}\" \"{1}\" \"{2}\"", MountCommand, isoPath, mountPoint); + } + + Logger.Debug( + "[{0}] Mount command [{1}], mount arguments [{2}].", + Name, + cmdFilename, + cmdArguments + ); + + if (ExecuteCommand(cmdFilename, cmdArguments)) { + + Logger.Info( + "[{0}] ISO mount completed successfully.", + Name + ); + + mountedISO = new LinuxMount(this, isoPath, mountPoint); + + } else { + + Logger.Info( + "[{0}] ISO mount completed with errors.", + Name + ); + + try { + + FileSystem.DeleteDirectory(mountPoint, false); + + } catch (Exception ex) { + + Logger.Info( + "[{0}] Unhandled exception removing mount point, exception is [{1}].", + Name, + ex.Message + ); + + } + + mountedISO = null; + + } + + return mountedISO != null; + + } + + private void UnmountISO(LinuxMount mount) + { + + string cmdArguments; + string cmdFilename; + + if (mount != null) { + + Logger.Info( + "[{0}] Attempting to unmount ISO [{1}] mounted on [{2}].", + Name, + mount.IsoPath, + mount.MountedPath + ); + + } else { + + throw new ArgumentNullException(nameof(mount)); + + } + + if (GetUID() == 0) { + cmdFilename = UmountCommand; + cmdArguments = string.Format("\"{0}\"", mount.MountedPath); + } else { + cmdFilename = SudoCommand; + cmdArguments = string.Format("\"{0}\" \"{1}\"", UmountCommand, mount.MountedPath); + } + + Logger.Debug( + "[{0}] Umount command [{1}], umount arguments [{2}].", + Name, + cmdFilename, + cmdArguments + ); + + if (ExecuteCommand(cmdFilename, cmdArguments)) { + + Logger.Info( + "[{0}] ISO unmount completed successfully.", + Name + ); + + } else { + + Logger.Info( + "[{0}] ISO unmount completed with errors.", + Name + ); + + } + + try { + + FileSystem.DeleteDirectory(mount.MountedPath, false); + + } catch (Exception ex) { + + Logger.Info( + "[{0}] Unhandled exception removing mount point, exception is [{1}].", + Name, + ex.Message + ); + + } + + } + + #endregion + + #region Internal Methods + + internal void OnUnmount(LinuxMount mount) + { + + UnmountISO(mount); + + } + + #endregion + + } + +} + diff --git a/Emby.IsoMounting/IsoMounter/LinuxMount.cs b/Emby.IsoMounting/IsoMounter/LinuxMount.cs new file mode 100644 index 0000000000..8d1f56e395 --- /dev/null +++ b/Emby.IsoMounting/IsoMounter/LinuxMount.cs @@ -0,0 +1,85 @@ +using System; +using MediaBrowser.Model.Diagnostics; +using MediaBrowser.Model.IO; +using MediaBrowser.Model.Logging; +using MediaBrowser.Model.System; + +namespace IsoMounter +{ + internal class LinuxMount : IIsoMount + { + + #region Private Fields + + private readonly LinuxIsoManager linuxIsoManager; + + #endregion + + #region Constructor(s) + + internal LinuxMount(LinuxIsoManager isoManager, string isoPath, string mountFolder) + { + + linuxIsoManager = isoManager; + + IsoPath = isoPath; + MountedPath = mountFolder; + + } + + #endregion + + #region Interface Implementation for IDisposable + + // Flag: Has Dispose already been called? + private bool disposed = false; + + public void Dispose() + { + + // Dispose of unmanaged resources. + Dispose(true); + + // Suppress finalization. + GC.SuppressFinalize(this); + + } + + protected virtual void Dispose(bool disposing) + { + + if (disposed) { + return; + } + + if (disposing) { + + // + // Free managed objects here. + // + + linuxIsoManager.OnUnmount(this); + + } + + // + // Free any unmanaged objects here. + // + + disposed = true; + + } + + #endregion + + #region Interface Implementation for IIsoMount + + public string IsoPath { get; private set; } + public string MountedPath { get; private set; } + + #endregion + + } + +} + diff --git a/Emby.IsoMounting/IsoMounter/Plugin.cs b/Emby.IsoMounting/IsoMounter/Plugin.cs new file mode 100644 index 0000000000..ea53175024 --- /dev/null +++ b/Emby.IsoMounting/IsoMounter/Plugin.cs @@ -0,0 +1,42 @@ +using MediaBrowser.Common.Configuration; +using MediaBrowser.Common.Plugins; +using MediaBrowser.Model.Serialization; +using System; +using IsoMounter.Configuration; + +namespace IsoMounter +{ + public class Plugin : BasePlugin + { + public Plugin(IApplicationPaths applicationPaths, IXmlSerializer xmlSerializer) : base(applicationPaths, xmlSerializer) + { + } + + private Guid _id = new Guid("4682DD4C-A675-4F1B-8E7C-79ADF137A8F8"); + public override Guid Id + { + get { return _id; } + } + + /// + /// Gets the name of the plugin + /// + /// The name. + public override string Name + { + get { return "Iso Mounter"; } + } + + /// + /// Gets the description. + /// + /// The description. + public override string Description + { + get + { + return "Mount and stream ISO contents"; + } + } + } +} diff --git a/Emby.IsoMounting/LICENSE b/Emby.IsoMounting/LICENSE new file mode 100644 index 0000000000..d7f1051397 --- /dev/null +++ b/Emby.IsoMounting/LICENSE @@ -0,0 +1,339 @@ +GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + {description} + Copyright (C) {year} {fullname} + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + {signature of Ty Coon}, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/Emby.IsoMounting/README.md b/Emby.IsoMounting/README.md new file mode 100644 index 0000000000..90cdc01baf --- /dev/null +++ b/Emby.IsoMounting/README.md @@ -0,0 +1,14 @@ +#MediaBrowser.IsoMounting.Linux +This implements two core interfaces, IIsoManager, and IIsoMount. +###IIsoManager +The manager class can be used to create a mount, and also determine if the mounter is capable of mounting a given file. +###IIsoMount +IIsoMount then represents a mount instance, which will be unmounted on disposal. +*** +This Linux version use sudo, mount and umount. + +You need to add this to your sudo file via visudo(change the username): + + Defaults:jsmith !requiretty + jsmith ALL=(root) NOPASSWD: /bin/mount + jsmith ALL=(root) NOPASSWD: /bin/umount diff --git a/Emby.XmlTv b/Emby.XmlTv deleted file mode 160000 index cffb51f543..0000000000 --- a/Emby.XmlTv +++ /dev/null @@ -1 +0,0 @@ -Subproject commit cffb51f5433d432b9d9d47a19ff10a3da34d5cd2 diff --git a/Emby.XmlTv/.gitattributes b/Emby.XmlTv/.gitattributes new file mode 100644 index 0000000000..1ff0c42304 --- /dev/null +++ b/Emby.XmlTv/.gitattributes @@ -0,0 +1,63 @@ +############################################################################### +# Set default behavior to automatically normalize line endings. +############################################################################### +* text=auto + +############################################################################### +# Set default behavior for command prompt diff. +# +# This is need for earlier builds of msysgit that does not have it on by +# default for csharp files. +# Note: This is only used by command line +############################################################################### +#*.cs diff=csharp + +############################################################################### +# Set the merge driver for project and solution files +# +# Merging from the command prompt will add diff markers to the files if there +# are conflicts (Merging from VS is not affected by the settings below, in VS +# the diff markers are never inserted). Diff markers may cause the following +# file extensions to fail to load in VS. An alternative would be to treat +# these files as binary and thus will always conflict and require user +# intervention with every merge. To do so, just uncomment the entries below +############################################################################### +#*.sln merge=binary +#*.csproj merge=binary +#*.vbproj merge=binary +#*.vcxproj merge=binary +#*.vcproj merge=binary +#*.dbproj merge=binary +#*.fsproj merge=binary +#*.lsproj merge=binary +#*.wixproj merge=binary +#*.modelproj merge=binary +#*.sqlproj merge=binary +#*.wwaproj merge=binary + +############################################################################### +# behavior for image files +# +# image files are treated as binary by default. +############################################################################### +#*.jpg binary +#*.png binary +#*.gif binary + +############################################################################### +# diff behavior for common document formats +# +# Convert binary document formats to text before diffing them. This feature +# is only available from the command line. Turn it on by uncommenting the +# entries below. +############################################################################### +#*.doc diff=astextplain +#*.DOC diff=astextplain +#*.docx diff=astextplain +#*.DOCX diff=astextplain +#*.dot diff=astextplain +#*.DOT diff=astextplain +#*.pdf diff=astextplain +#*.PDF diff=astextplain +#*.rtf diff=astextplain +#*.RTF diff=astextplain diff --git a/Emby.XmlTv/.gitignore b/Emby.XmlTv/.gitignore new file mode 100644 index 0000000000..b06e864a31 --- /dev/null +++ b/Emby.XmlTv/.gitignore @@ -0,0 +1,212 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. + +# User-specific files +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +build/ +bld/ +[Bb]in/ +[Oo]bj/ + +# Visual Studio 2015 cache/options directory +.vs/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUNIT +*.VisualState.xml +TestResult.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# DNX +project.lock.json +artifacts/ + +*_i.c +*_p.c +*_i.h +*.ilk +*.meta +*.obj +*.pch +*.pdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opensdf +*.sdf +*.cachefile + +# Visual Studio profiler +*.psess +*.vsp +*.vspx + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# JustCode is a .NET coding add-in +.JustCode + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# NCrunch +_NCrunch_* +.*crunch*.local.xml + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +## TODO: Comment the next line if you want to checkin your +## web deploy settings but do note that will include unencrypted +## passwords +#*.pubxml + +*.publishproj + +# NuGet Packages +*.nupkg +# The packages folder can be ignored because of Package Restore +**/packages/* +# except build/, which is used as an MSBuild target. +!**/packages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/packages/repositories.config + +# Windows Azure Build Output +csx/ +*.build.csdef + +# Windows Store app package directory +AppPackages/ + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ + +# Others +ClientBin/ +[Ss]tyle[Cc]op.* +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.pfx +*.publishsettings +node_modules/ +orleans.codegen.cs + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm + +# SQL Server files +*.mdf +*.ldf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings + +# Microsoft Fakes +FakesAssemblies/ + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# LightSwitch generated files +GeneratedArtifacts/ +_Pvt_Extensions/ +ModelManifest.xml diff --git a/Emby.XmlTv/Emby.XmlTv.Console/App.config b/Emby.XmlTv/Emby.XmlTv.Console/App.config new file mode 100644 index 0000000000..2d2a12d81b --- /dev/null +++ b/Emby.XmlTv/Emby.XmlTv.Console/App.config @@ -0,0 +1,6 @@ + + + + + + diff --git a/Emby.XmlTv/Emby.XmlTv.Console/Classes/EntityExtensions.cs b/Emby.XmlTv/Emby.XmlTv.Console/Classes/EntityExtensions.cs new file mode 100644 index 0000000000..37fcf0ecad --- /dev/null +++ b/Emby.XmlTv/Emby.XmlTv.Console/Classes/EntityExtensions.cs @@ -0,0 +1,58 @@ +using System; +using System.Linq; +using System.Text; + +using Emby.XmlTv.Entities; + +namespace Emby.XmlTv.Console.Classes +{ + public static class EntityExtensions + { + public static string GetHeader(this string text) + { + var channelHeaderString = " " + text; + + var builder = new StringBuilder(); + builder.AppendLine("".PadRight(5 + channelHeaderString.Length + 5, Char.Parse("*"))); + builder.AppendLine("".PadRight(5, Char.Parse("*")) + channelHeaderString + "".PadRight(5, Char.Parse("*"))); + builder.AppendLine("".PadRight(5 + channelHeaderString.Length + 5, Char.Parse("*"))); + + return builder.ToString(); + } + + public static string GetChannelDetail(this XmlTvChannel channel) + { + var builder = new StringBuilder(); + builder.AppendFormat("Id: {0}\r\n", channel.Id); + builder.AppendFormat("Display-Name: {0}\r\n", channel.DisplayName); + builder.AppendFormat("Url: {0}\r\n", channel.Url); + builder.AppendFormat("Icon: {0}\r\n", channel.Icon != null ? channel.Icon.ToString() : string.Empty); + builder.AppendLine("-------------------------------------------------------"); + + return builder.ToString(); + } + + public static string GetProgrammeDetail(this XmlTvProgram programme, XmlTvChannel channel) + { + var builder = new StringBuilder(); + builder.AppendFormat("Channel: {0} - {1}\r\n", channel.Id, channel.DisplayName); + builder.AppendFormat("Start Date: {0:G}\r\n", programme.StartDate); + builder.AppendFormat("End Date: {0:G}\r\n", programme.EndDate); + builder.AppendFormat("Name: {0}\r\n", programme.Title); + builder.AppendFormat("Episode Detail: {0}\r\n", programme.Episode); + builder.AppendFormat("Episode Title: {0}\r\n", programme.Episode.Title); + builder.AppendFormat("Description: {0}\r\n", programme.Description); + builder.AppendFormat("Categories: {0}\r\n", string.Join(", ", programme.Categories)); + builder.AppendFormat("Countries: {0}\r\n", string.Join(", ", programme.Countries)); + builder.AppendFormat("Credits: {0}\r\n", string.Join(", ", programme.Credits)); + builder.AppendFormat("Rating: {0}\r\n", programme.Rating); + builder.AppendFormat("Star Rating: {0}\r\n", programme.StarRating.HasValue ? programme.StarRating.Value.ToString() : string.Empty); + builder.AppendFormat("Previously Shown: {0:G}\r\n", programme.PreviouslyShown); + builder.AppendFormat("Copyright Date: {0:G}\r\n", programme.CopyrightDate); + builder.AppendFormat("Is Repeat: {0}\r\n", programme.IsPreviouslyShown); + builder.AppendFormat("Icon: {0}\r\n", programme.Icon != null ? programme.Icon.ToString() : string.Empty); + builder.AppendLine("-------------------------------------------------------"); + return builder.ToString(); + } + } +} diff --git a/Emby.XmlTv/Emby.XmlTv.Console/Emby.XmlTv.Console.csproj b/Emby.XmlTv/Emby.XmlTv.Console/Emby.XmlTv.Console.csproj new file mode 100644 index 0000000000..6ce4cff2ce --- /dev/null +++ b/Emby.XmlTv/Emby.XmlTv.Console/Emby.XmlTv.Console.csproj @@ -0,0 +1,22 @@ + + + + + + + + + + + + + {0d023565-5942-4d79-9098-a1b4b6665a40} + Emby.XmlTv + + + + netcoreapp2.1 + false + + + diff --git a/Emby.XmlTv/Emby.XmlTv.Console/Program.cs b/Emby.XmlTv/Emby.XmlTv.Console/Program.cs new file mode 100644 index 0000000000..c57c45297a --- /dev/null +++ b/Emby.XmlTv/Emby.XmlTv.Console/Program.cs @@ -0,0 +1,103 @@ +using System; +using System.Diagnostics; +using System.IO; +using System.Linq; +using System.Threading; +using System.Threading.Tasks; + +using Emby.XmlTv.Classes; +using Emby.XmlTv.Console.Classes; +using Emby.XmlTv.Entities; + +namespace Emby.XmlTv.Console +{ + public class Program + { + static void Main(string[] args) + { + var filename = @"C:\Temp\QLD.GoldCoast.xml"; + + if (args.Length == 1 && File.Exists(args[0])) + { + filename = args[0]; + } + + var timer = Stopwatch.StartNew(); + System.Console.WriteLine("Running XMLTv Parsing"); + + var resultsFile = String.Format("C:\\Temp\\{0}_Results_{1:HHmmss}.txt", + Path.GetFileNameWithoutExtension(filename), + DateTimeOffset.UtcNow); + + System.Console.Write("Enter the language required: "); + var lang = System.Console.ReadLine(); + + ReadSourceXmlTvFile(filename, resultsFile, lang).Wait(); + + System.Console.WriteLine("Completed in {0:g} - press any key to open the file...", timer.Elapsed); + System.Console.ReadKey(); + + Process.Start(resultsFile); + } + + public static async Task ReadSourceXmlTvFile(string filename, string resultsFile, string lang) + { + System.Console.WriteLine("Writing to file: {0}", resultsFile); + + using (var resultsFileStream = new StreamWriter(resultsFile) { AutoFlush = true }) + { + var reader = new XmlTvReader(filename, lang); + await ReadOutChannels(reader, resultsFileStream); + + resultsFileStream.Close(); + } + } + + public static async Task ReadOutChannels(XmlTvReader reader, StreamWriter resultsFileStream) + { + var channels = reader.GetChannels().Distinct().ToList(); + + resultsFileStream.Write(EntityExtensions.GetHeader("Channels")); + + foreach (var channel in channels) + { + System.Console.WriteLine("Retrieved Channel: {0} - {1}", channel.Id, channel.DisplayName); + resultsFileStream.Write(channel.GetChannelDetail()); + } + + var totalProgrammeCount = 0; + + resultsFileStream.Write("\r\n"); + foreach (var channel in channels) + { + System.Console.WriteLine("Processing Channel: {0}", channel.DisplayName); + + resultsFileStream.Write(EntityExtensions.GetHeader("Programs for " + channel.DisplayName)); + var channelProgrammeCount = await ReadOutChannelProgrammes(reader, channel, resultsFileStream); + + totalProgrammeCount += channelProgrammeCount; + await resultsFileStream.WriteLineAsync(String.Format("Total Programmes for {1}: {0}", channelProgrammeCount, channel.DisplayName)); + } + + await resultsFileStream.WriteLineAsync(String.Format("Total Programmes: {0}", totalProgrammeCount)); + } + + private static async Task ReadOutChannelProgrammes(XmlTvReader reader, XmlTvChannel channel, StreamWriter resultsFileStream) + { + //var startDate = new DateTime(2015, 11, 28); + //var endDate = new DateTime(2015, 11, 29); + var startDate = DateTimeOffset.MinValue; + var endDate = DateTimeOffset.MaxValue; + + var count = 0; + + foreach (var programme in reader.GetProgrammes(channel.Id, startDate, endDate, new CancellationToken()).Distinct()) + { + count++; + await resultsFileStream.WriteLineAsync(programme.GetProgrammeDetail(channel)); + } + + return count; + } + } +} \ No newline at end of file diff --git a/Emby.XmlTv/Emby.XmlTv.Console/Properties/AssemblyInfo.cs b/Emby.XmlTv/Emby.XmlTv.Console/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..cd1fcce685 --- /dev/null +++ b/Emby.XmlTv/Emby.XmlTv.Console/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("Emby.XmlTv.Console")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Emby.XmlTv.Console")] +[assembly: AssemblyCopyright("Copyright © 2015")] +[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("add1d993-6d74-480a-b1fc-7fd9fd05a769")] + +// 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/Emby.XmlTv/Emby.XmlTv.Test/Emby.XmlTv.Test.csproj b/Emby.XmlTv/Emby.XmlTv.Test/Emby.XmlTv.Test.csproj new file mode 100644 index 0000000000..a1d3878c77 --- /dev/null +++ b/Emby.XmlTv/Emby.XmlTv.Test/Emby.XmlTv.Test.csproj @@ -0,0 +1,123 @@ + + + + Debug + AnyCPU + {C8298223-2468-466C-9B06-FBF61926CECB} + Library + Properties + Emby.XmlTv.Test + Emby.XmlTv.Test + 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 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + False + + + + + + + + + + + + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + Designer + + + + + {0D023565-5942-4D79-9098-A1B4B6665A40} + Emby.XmlTv + + + + + + + False + + + False + + + False + + + False + + + + + + + + + + This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + netcoreapp2.1 + false + + diff --git a/Emby.XmlTv/Emby.XmlTv.Test/Properties/AssemblyInfo.cs b/Emby.XmlTv/Emby.XmlTv.Test/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..b6fc4c8e2b --- /dev/null +++ b/Emby.XmlTv/Emby.XmlTv.Test/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("Emby.XmlTv.Test")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Emby.XmlTv.Test")] +[assembly: AssemblyCopyright("Copyright © 2016")] +[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("c8298223-2468-466c-9b06-fbf61926cecb")] + +// 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/Emby.XmlTv/Emby.XmlTv.Test/XmlTvReaderDateTimeTests.cs b/Emby.XmlTv/Emby.XmlTv.Test/XmlTvReaderDateTimeTests.cs new file mode 100644 index 0000000000..dbbd352ee7 --- /dev/null +++ b/Emby.XmlTv/Emby.XmlTv.Test/XmlTvReaderDateTimeTests.cs @@ -0,0 +1,91 @@ +using System; +using System.IO; + +using Emby.XmlTv.Classes; + +using Microsoft.VisualStudio.TestTools.UnitTesting; + +namespace Emby.XmlTv.Test +{ + [TestClass] + public class XmlTvReaderDateTimeTests + { + [TestMethod] + [DeploymentItem("Xml Files\\MultilanguageData.xml")] + public void Should_HandlePartDates() + { + var testFile = Path.GetFullPath(@"MultilanguageData.xml"); + var reader = new XmlTvReader(testFile, "es"); + + Assert.AreEqual(Parse("01 Jan 2016 00:00:00"), reader.ParseDate("2016")); + Assert.AreEqual(Parse("01 Jan 2016 00:00:00"), reader.ParseDate("201601")); + Assert.AreEqual(Parse("01 Jan 2016 00:00:00"), reader.ParseDate("20160101")); + Assert.AreEqual(Parse("01 Jan 2016 12:00:00"), reader.ParseDate("2016010112")); + Assert.AreEqual(Parse("01 Jan 2016 12:34:00"), reader.ParseDate("201601011234")); + Assert.AreEqual(Parse("01 Jan 2016 12:34:56"), reader.ParseDate("20160101123456")); + } + [TestMethod] + [DeploymentItem("Xml Files\\MultilanguageData.xml")] + public void Should_HandleDateWithOffset() + { + var testFile = Path.GetFullPath(@"MultilanguageData.xml"); + var reader = new XmlTvReader(testFile, "es"); + + // parse variations on 1:00AM + Assert.AreEqual(Parse("01 Jan 2016 12:00:00"), reader.ParseDate("20160101120000 +0000")); + Assert.AreEqual(Parse("01 Jan 2016 02:00:00"), reader.ParseDate("20160101120000 +1000")); + Assert.AreEqual(Parse("01 Jan 2016 11:00:00"), reader.ParseDate("20160101120000 +0100")); + Assert.AreEqual(Parse("01 Jan 2016 11:50:00"), reader.ParseDate("20160101120000 +0010")); + Assert.AreEqual(Parse("01 Jan 2016 11:59:00"), reader.ParseDate("20160101120000 +0001")); + + Assert.AreEqual(Parse("01 Jan 2016 22:00:00"), reader.ParseDate("20160101120000 -1000")); + Assert.AreEqual(Parse("01 Jan 2016 13:00:00"), reader.ParseDate("20160101120000 -0100")); + Assert.AreEqual(Parse("01 Jan 2016 12:10:00"), reader.ParseDate("20160101120000 -0010")); + Assert.AreEqual(Parse("01 Jan 2016 12:01:00"), reader.ParseDate("20160101120000 -0001")); + } + + [TestMethod] + [DeploymentItem("Xml Files\\MultilanguageData.xml")] + public void Should_HandlePartDatesWithOffset() + { + var testFile = Path.GetFullPath(@"MultilanguageData.xml"); + var reader = new XmlTvReader(testFile, "es"); + + Assert.AreEqual(Parse("01 Jan 2016 01:00:00"), reader.ParseDate("2016 -0100")); + Assert.AreEqual(Parse("01 Jan 2016 01:00:00"), reader.ParseDate("201601 -0100")); + Assert.AreEqual(Parse("01 Jan 2016 01:00:00"), reader.ParseDate("20160101 -0100")); + Assert.AreEqual(Parse("01 Jan 2016 13:00:00"), reader.ParseDate("2016010112 -0100")); + Assert.AreEqual(Parse("01 Jan 2016 13:00:00"), reader.ParseDate("201601011200 -0100")); + Assert.AreEqual(Parse("01 Jan 2016 13:00:00"), reader.ParseDate("20160101120000 -0100")); + } + + [TestMethod] + [DeploymentItem("Xml Files\\MultilanguageData.xml")] + public void Should_HandleSpaces() + { + var testFile = Path.GetFullPath(@"MultilanguageData.xml"); + var reader = new XmlTvReader(testFile, "es"); + + // parse variations on 1:00AM + Assert.AreEqual(Parse("01 Jan 2016 12:00:00"), reader.ParseDate("20160101120000 +000")); + Assert.AreEqual(Parse("01 Jan 2016 12:00:00"), reader.ParseDate("20160101120000 +00")); + Assert.AreEqual(Parse("01 Jan 2016 12:00:00"), reader.ParseDate("20160101120000 +0")); + } + + [TestMethod] + [DeploymentItem("Xml Files\\MultilanguageData.xml")] + public void Should_HandleSpaces2() + { + var testFile = Path.GetFullPath(@"MultilanguageData.xml"); + var reader = new XmlTvReader(testFile, "es"); + + // parse variations on 1:00AM + Assert.AreEqual(Parse("01 Jan 2016 12:00:00"), reader.ParseDate("20160101120000 0")); + } + + private DateTimeOffset Parse(string value) + { + return new DateTimeOffset(DateTimeOffset.Parse(value).Ticks, TimeSpan.Zero); + } + } +} diff --git a/Emby.XmlTv/Emby.XmlTv.Test/XmlTvReaderLanguageTests.cs b/Emby.XmlTv/Emby.XmlTv.Test/XmlTvReaderLanguageTests.cs new file mode 100644 index 0000000000..489e16ee6d --- /dev/null +++ b/Emby.XmlTv/Emby.XmlTv.Test/XmlTvReaderLanguageTests.cs @@ -0,0 +1,182 @@ +using System; +using System.IO; +using System.Linq; +using System.Threading; + +using Emby.XmlTv.Classes; + +using Microsoft.VisualStudio.TestTools.UnitTesting; + +namespace Emby.XmlTv.Test +{ + [TestClass] + public class XmlTvReaderLanguageTests + { + /* + Homes Under the Hammer - Spanish + Homes Under the Hammer - Spanish 2 + Homes Under the Hammer - English + Homes Under the Hammer - English 2 + Homes Under the Hammer - Empty Language + Homes Under the Hammer - Empty Language 2 + Homes Under the Hammer - No Language + Homes Under the Hammer - No Language 2 + */ + + /* Expected Behaviour: + - Language = Null Homes Under the Hammer - No Language + - Language = "" Homes Under the Hammer - No Language + - Language = es Homes Under the Hammer - Spanish + - Language = en Homes Under the Hammer - English + */ + + [TestMethod] + [DeploymentItem("Xml Files\\MultilanguageData.xml")] + public void Should_Return_The_First_Matching_Language_ES() + { + var testFile = Path.GetFullPath(@"MultilanguageData.xml"); + var reader = new XmlTvReader(testFile, "es"); + var channel = reader.GetChannels().FirstOrDefault(); + Assert.IsNotNull(channel); + + var startDate = new DateTime(2015, 11, 26); + var cancellationToken = new CancellationToken(); + var programme = reader.GetProgrammes(channel.Id, startDate, startDate.AddDays(1), cancellationToken).FirstOrDefault(); + + Assert.IsNotNull(programme); + Assert.AreEqual("Homes Under the Hammer - Spanish", programme.Title); + Assert.AreEqual(1, programme.Categories.Count); + Assert.AreEqual("Property - Spanish", programme.Categories[0]); + } + + [TestMethod] + [DeploymentItem("Xml Files\\MultilanguageData.xml")] + public void Should_Return_The_First_Matching_Language_EN() + { + var testFile = Path.GetFullPath(@"MultilanguageData.xml"); + var reader = new XmlTvReader(testFile, "en"); + + var channel = reader.GetChannels().FirstOrDefault(); + Assert.IsNotNull(channel); + + var startDate = new DateTime(2015, 11, 26); + var cancellationToken = new CancellationToken(); + var programme = reader.GetProgrammes(channel.Id, startDate, startDate.AddDays(1), cancellationToken).FirstOrDefault(); + + Assert.IsNotNull(programme); + Assert.AreEqual("Homes Under the Hammer - English", programme.Title); + Assert.AreEqual(1, programme.Categories.Count); + Assert.AreEqual("Property - English", programme.Categories[0]); + } + + [TestMethod] + [DeploymentItem("Xml Files\\MultilanguageData.xml")] + public void Should_Return_The_First_Matching_With_No_Language() + { + var testFile = Path.GetFullPath(@"MultilanguageData.xml"); + var reader = new XmlTvReader(testFile, null); + + var channel = reader.GetChannels().FirstOrDefault(); + Assert.IsNotNull(channel); + + var startDate = new DateTime(2015, 11, 26); + var cancellationToken = new CancellationToken(); + var programme = reader.GetProgrammes(channel.Id, startDate, startDate.AddDays(1), cancellationToken).FirstOrDefault(); + + Assert.IsNotNull(programme); + Assert.AreEqual("Homes Under the Hammer - No Language", programme.Title); + Assert.AreEqual(1, programme.Categories.Count); + Assert.AreEqual("Property - No Language", programme.Categories[0]); + } + + [TestMethod] + [DeploymentItem("Xml Files\\MultilanguageData.xml")] + public void Should_Return_The_First_Matching_With_Empty_Language() + { + var testFile = Path.GetFullPath(@"MultilanguageData.xml"); + var reader = new XmlTvReader(testFile, String.Empty); + + var channel = reader.GetChannels().FirstOrDefault(); + Assert.IsNotNull(channel); + + var startDate = new DateTime(2015, 11, 26); + var cancellationToken = new CancellationToken(); + var programme = reader.GetProgrammes(channel.Id, startDate, startDate.AddDays(1), cancellationToken).FirstOrDefault(); + + Assert.IsNotNull(programme); + Assert.AreEqual("Homes Under the Hammer - Empty Language", programme.Title); + Assert.AreEqual(1, programme.Categories.Count); + Assert.AreEqual("Property - Empty Language", programme.Categories[0]); + } + + [TestMethod] + [DeploymentItem("Xml Files\\MultilanguageData.xml")] + public void Should_Return_The_First_When_NoMatchFound() + { + var testFile = Path.GetFullPath(@"MultilanguageData.xml"); + var reader = new XmlTvReader(testFile, "es"); // There are no titles or categories for spanish + + var channel = reader.GetChannels().FirstOrDefault(); + Assert.IsNotNull(channel); + + var startDate = new DateTime(2015, 11, 26); + var cancellationToken = new CancellationToken(); + var programme = reader.GetProgrammes(channel.Id, startDate, startDate.AddDays(1), cancellationToken).Skip(1).FirstOrDefault(); + + Assert.IsNotNull(programme); + Assert.AreEqual("Homes Under the Hammer - English", programme.Title); + + // Should return all categories + Assert.AreEqual(2, programme.Categories.Count); + Assert.IsTrue(programme.Categories.Contains("Property - English")); + Assert.IsTrue(programme.Categories.Contains("Property - Empty Language")); + } + + [TestMethod] + [DeploymentItem("Xml Files\\MultilanguageData.xml")] + public void Should_Return_The_First_When_NoLanguage() + { + var testFile = Path.GetFullPath(@"MultilanguageData.xml"); + var reader = new XmlTvReader(testFile, null); + + var channel = reader.GetChannels().FirstOrDefault(); + Assert.IsNotNull(channel); + + var startDate = new DateTime(2015, 11, 26); + var cancellationToken = new CancellationToken(); + var programme = reader.GetProgrammes(channel.Id, startDate, startDate.AddDays(1), cancellationToken).Skip(1).FirstOrDefault(); + + Assert.IsNotNull(programme); + Assert.AreEqual("Homes Under the Hammer - English", programme.Title); // Should return the first in the list + + // Should return all categories + Assert.AreEqual(2, programme.Categories.Count); + Assert.IsTrue(programme.Categories.Contains("Property - English")); + Assert.IsTrue(programme.Categories.Contains("Property - Empty Language")); + } + + [TestMethod] + [DeploymentItem("Xml Files\\MultilanguageData.xml")] + public void Should_Return_All_Languages() + { + var testFile = Path.GetFullPath(@"MultilanguageData.xml"); + var reader = new XmlTvReader(testFile); + var cancellationToken = new CancellationToken(); + + var results = reader.GetLanguages(cancellationToken); + Assert.IsNotNull(results); + + foreach (var result in results) + { + Console.WriteLine("{0} - {1}", result.Name, result.Relevance); + } + + Assert.AreEqual(2, results.Count); + Assert.AreEqual("en", results[0].Name); + Assert.AreEqual(11, results[0].Relevance); + Assert.AreEqual("es", results[1].Name); + Assert.AreEqual(3, results[1].Relevance); + } + + } +} diff --git a/Emby.XmlTv/Emby.XmlTv.Test/XmlTvReaderTests.cs b/Emby.XmlTv/Emby.XmlTv.Test/XmlTvReaderTests.cs new file mode 100644 index 0000000000..1485cf06c2 --- /dev/null +++ b/Emby.XmlTv/Emby.XmlTv.Test/XmlTvReaderTests.cs @@ -0,0 +1,219 @@ +using System; +using System.IO; +using System.Linq; +using System.Threading; + +using Emby.XmlTv.Classes; + +using Microsoft.VisualStudio.TestTools.UnitTesting; + +namespace Emby.XmlTv.Test +{ + [TestClass] + public class XmlTvReaderTests + { + [TestMethod] + [DeploymentItem("Xml Files\\UK_Data.xml")] + public void UK_DataTest_ChannelsTest() + { + var testFile = Path.GetFullPath(@"UK_Data.xml"); + var reader = new XmlTvReader(testFile); + + var channels = reader.GetChannels().ToList(); + Assert.AreEqual(5, channels.Count); + + // Check each channel + var channel = channels.SingleOrDefault(c => c.Id == "UK_RT_2667"); + Assert.IsNotNull(channel); + Assert.AreEqual("BBC1 HD", channel.DisplayName); + Assert.AreEqual("7.1", channel.Number); + Assert.IsNotNull(channel.Icon); + Assert.AreEqual("Logo_UK_RT_2667", channel.Icon.Source); + Assert.AreEqual(100, channel.Icon.Width); + Assert.AreEqual(200, channel.Icon.Height); + + channel = channels.SingleOrDefault(c => c.Id == "UK_RT_105"); + Assert.IsNotNull(channel); + Assert.AreEqual("BBC2", channel.DisplayName); + Assert.IsNotNull(channel.Icon); + Assert.AreEqual("Logo_UK_RT_105", channel.Icon.Source); + Assert.IsFalse(channel.Icon.Width.HasValue); + Assert.IsFalse(channel.Icon.Height.HasValue); + + channel = channels.SingleOrDefault(c => c.Id == "UK_RT_2118"); + Assert.IsNotNull(channel); + Assert.AreEqual("ITV1 HD", channel.DisplayName); + Assert.IsNotNull(channel.Icon); + Assert.AreEqual("Logo_UK_RT_2118", channel.Icon.Source); + Assert.AreEqual(100, channel.Icon.Width); + Assert.IsFalse(channel.Icon.Height.HasValue); + + channel = channels.SingleOrDefault(c => c.Id == "UK_RT_2056"); + Assert.IsNotNull(channel); + Assert.AreEqual("Channel 4 HD", channel.DisplayName); + Assert.IsNotNull(channel.Icon); + Assert.AreEqual("Logo_UK_RT_2056", channel.Icon.Source); + Assert.IsFalse(channel.Icon.Width.HasValue); + Assert.AreEqual(200, channel.Icon.Height); + + channel = channels.SingleOrDefault(c => c.Id == "UK_RT_134"); + Assert.IsNotNull(channel); + Assert.AreEqual("Channel 5", channel.DisplayName); + Assert.IsNull(channel.Icon); + } + + [TestMethod] + [DeploymentItem("Xml Files\\UK_Data.xml")] + public void UK_DataTest_GeneralTest() + { + var testFile = Path.GetFullPath(@"UK_Data.xml"); + var reader = new XmlTvReader(testFile, null); + + var channels = reader.GetChannels().ToList(); + Assert.AreEqual(5, channels.Count); + + // Pick a channel to check the data for + var channel = channels.SingleOrDefault(c => c.Id == "UK_RT_2056"); + Assert.IsNotNull(channel); + + var startDate = new DateTime(2015, 11, 26); + var cancellationToken = new CancellationToken(); + var programmes = reader.GetProgrammes(channel.Id, startDate, startDate.AddDays(1), cancellationToken).ToList(); + + Assert.AreEqual(27, programmes.Count); + var programme = programmes.SingleOrDefault(p => p.Title == "The Secret Life of"); + + Assert.IsNotNull(programme); + Assert.AreEqual(new DateTime(2015, 11, 26, 20, 0, 0), programme.StartDate); + Assert.AreEqual(new DateTime(2015, 11, 26, 21, 0, 0), programme.EndDate); + Assert.AreEqual("Cameras follow the youngsters' development after two weeks apart and time has made the heart grow fonder for Alfie and Emily, who are clearly happy to be back together. And although Alfie struggled to empathise with the rest of his peers before, a painting competition proves to be a turning point for him. George takes the children's rejection of his family recipe to heart, but goes on to triumph elsewhere, and romance is in the air when newcomer Sienna captures Arthur's heart.", programme.Description); + Assert.AreEqual("Documentary", programme.Categories.Single()); + Assert.IsNotNull(programme.Episode); + Assert.AreEqual("The Secret Life of 5 Year Olds", programme.Episode.Title); + Assert.AreEqual(1, programme.Episode.Series); + Assert.IsNull(programme.Episode.SeriesCount); + Assert.AreEqual(4, programme.Episode.Episode); + Assert.AreEqual(6, programme.Episode.EpisodeCount); + Assert.IsNotNull(programme.Premiere); + //Assert.AreEqual("First showing on national terrestrial TV", programme.Premiere.Details); + Assert.IsTrue(programme.IsNew); + } + + [TestMethod] + [DeploymentItem("Xml Files\\UK_Data.xml")] + public void UK_DataTest_MultipleTitles_SameLanguage_Should_ReturnFirstValue() + { + var testFile = Path.GetFullPath(@"UK_Data.xml"); + var reader = new XmlTvReader(testFile, null); + + /* + Homes Under the Hammer - Title 1 + Homes Under the Hammer - Title 2 + Homes Under the Hammer - Title 3 + */ + + var startDate = new DateTime(2015, 11, 26); + var cancellationToken = new CancellationToken(); + var programmes = reader.GetProgrammes("UK_RT_2667", startDate, startDate.AddDays(1), cancellationToken).ToList(); + var programme = programmes.SingleOrDefault(p => p.Title == "Homes Under the Hammer - Title 1"); + + Assert.IsNotNull(programme); + } + + [TestMethod] + [DeploymentItem("Xml Files\\UK_Data.xml")] + public void UK_DataTest_MultipleTitles_NoLanguage_Should_ReturnFirstValue() + { + var testFile = Path.GetFullPath(@"UK_Data.xml"); + var reader = new XmlTvReader(testFile, null); + + /* + Oxford Street Revealed - Title 1 + Oxford Street Revealed - Title 2 + Oxford Street Revealed - Title 3 + */ + + var startDate = new DateTime(2015, 11, 26); + var cancellationToken = new CancellationToken(); + var programmes = reader.GetProgrammes("UK_RT_2667", startDate, startDate.AddDays(1), cancellationToken).ToList(); + var programme = programmes.SingleOrDefault(p => p.Title == "Oxford Street Revealed - Title 1"); + + Assert.IsNotNull(programme); + } + + [TestMethod] + [DeploymentItem("Xml Files\\ES_MultiLanguageData.xml")] + public void ES_MultiLanguageDataTest() + { + var testFile = Path.GetFullPath(@"ES_MultiLanguageData.xml"); + var reader = new XmlTvReader(testFile, "es"); // Specify the spanish language explicitly + + var channels = reader.GetChannels().ToList(); + Assert.AreEqual(141, channels.Count); + + // Pick a channel to check the data for + var channel = channels.SingleOrDefault(c => c.Id == "Canal + HD" && c.DisplayName == "Canal + HD"); + Assert.IsNotNull(channel); + + var startDate = new DateTime(2016, 02, 18); + var cancellationToken = new CancellationToken(); + var programmes = reader.GetProgrammes(channel.Id, startDate, startDate.AddDays(1), cancellationToken).ToList(); + + Assert.AreEqual(22, programmes.Count); + var programme = programmes.SingleOrDefault(p => p.Title == "This is Comedy. Judd Apatow & Co."); + + /* + + This is Comedy. Judd Apatow & Co. + This is Comedy + El resurgir creativo de la comedia estadounidense en los últimos 15 años ha tenido un nombre indiscutible, Judd Apatow, y unos colaboradores indispensables, sus amigos (actores, cómicos, escritores) Jonah Hill, Steve Carrell, Paul Rudd, Seth Rogen, Lena Dunham... A través de extractos de sus filmes y de entrevistas a algunos los miembros de su 'banda' (Adam Sandler, Lena Dunham o Jason Segel), este documental muestra la carrera de un productor y director excepcional que ha sido capaz de llevar la risa a su máxima expresión + + Jacky Goldberg + + 2014 + Documentales + Sociedad + + Francia + + TV-G + + + 3/5 + + + */ + + Assert.IsNotNull(programme); + Assert.AreEqual(new DateTime(2016, 02, 18, 4, 51, 0), programme.StartDate); + Assert.AreEqual(new DateTime(2016, 02, 18, 5, 54, 0), programme.EndDate); + Assert.AreEqual("El resurgir creativo de la comedia estadounidense en los últimos 15 años ha tenido un nombre indiscutible, Judd Apatow, y unos colaboradores indispensables, sus amigos (actores, cómicos, escritores) Jonah Hill, Steve Carrell, Paul Rudd, Seth Rogen, Lena Dunham... A través de extractos de sus filmes y de entrevistas a algunos los miembros de su 'banda' (Adam Sandler, Lena Dunham o Jason Segel), este documental muestra la carrera de un productor y director excepcional que ha sido capaz de llevar la risa a su máxima expresión", programme.Description); + Assert.AreEqual(2, programme.Categories.Count); + Assert.AreEqual("Documentales", programme.Categories[0]); + Assert.AreEqual("Sociedad", programme.Categories[1]); + Assert.IsNotNull(programme.Episode); + Assert.IsNull(programme.Episode.Episode); + Assert.IsNull(programme.Episode.EpisodeCount); + Assert.IsNull(programme.Episode.Part); + Assert.IsNull(programme.Episode.PartCount); + Assert.IsNull(programme.Episode.Series); + Assert.IsNull(programme.Episode.SeriesCount); + Assert.IsNull(programme.Episode.Title); + } + + [TestMethod] + [DeploymentItem("Xml Files\\honeybee.xml")] + public void HoneybeeTest() + { + var testFile = Path.GetFullPath(@"honeybee.xml"); + var reader = new XmlTvReader(testFile, null); + + var channels = reader.GetChannels().ToList(); + Assert.AreEqual(16, channels.Count); + + var programs = reader.GetProgrammes("2013.honeybee.it", DateTime.UtcNow.AddYears(-1), + DateTime.UtcNow.AddYears(1), CancellationToken.None).ToList(); + Assert.AreEqual(297, programs.Count); + } + } +} diff --git a/Emby.XmlTv/Emby.XmlTv.sln b/Emby.XmlTv/Emby.XmlTv.sln new file mode 100644 index 0000000000..519cbfc9db --- /dev/null +++ b/Emby.XmlTv/Emby.XmlTv.sln @@ -0,0 +1,44 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.24720.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Emby.XmlTv.Console", "Emby.XmlTv.Console\Emby.XmlTv.Console.csproj", "{ADD1D993-6D74-480A-B1FC-7FD9FD05A769}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Emby.XmlTv", "Emby.XmlTv\Emby.XmlTv.csproj", "{0D023565-5942-4D79-9098-A1B4B6665A40}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{BB0FD191-A9D0-4CC9-A79E-ECBCF1275268}" + ProjectSection(SolutionItems) = preProject + .nuget\NuGet.Config = .nuget\NuGet.Config + .nuget\NuGet.exe = .nuget\NuGet.exe + .nuget\NuGet.targets = .nuget\NuGet.targets + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Files", "Solution Files", "{E9F625D5-979E-48E8-9987-F4BCADD79A41}" + ProjectSection(SolutionItems) = preProject + Nuget\Emby.XmlTv.nuspec = Nuget\Emby.XmlTv.nuspec + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {ADD1D993-6D74-480A-B1FC-7FD9FD05A769}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {ADD1D993-6D74-480A-B1FC-7FD9FD05A769}.Debug|Any CPU.Build.0 = Debug|Any CPU + {ADD1D993-6D74-480A-B1FC-7FD9FD05A769}.Release|Any CPU.ActiveCfg = Release|Any CPU + {ADD1D993-6D74-480A-B1FC-7FD9FD05A769}.Release|Any CPU.Build.0 = Release|Any CPU + {0D023565-5942-4D79-9098-A1B4B6665A40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0D023565-5942-4D79-9098-A1B4B6665A40}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0D023565-5942-4D79-9098-A1B4B6665A40}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0D023565-5942-4D79-9098-A1B4B6665A40}.Release|Any CPU.Build.0 = Release|Any CPU + {C8298223-2468-466C-9B06-FBF61926CECB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C8298223-2468-466C-9B06-FBF61926CECB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C8298223-2468-466C-9B06-FBF61926CECB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C8298223-2468-466C-9B06-FBF61926CECB}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Emby.XmlTv/Emby.XmlTv/Classes/XmlTvReader.cs b/Emby.XmlTv/Emby.XmlTv/Classes/XmlTvReader.cs new file mode 100644 index 0000000000..32535b69ef --- /dev/null +++ b/Emby.XmlTv/Emby.XmlTv/Classes/XmlTvReader.cs @@ -0,0 +1,1094 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Text.RegularExpressions; +using System.Threading; +using System.Xml; +using Emby.XmlTv.Entities; + +namespace Emby.XmlTv.Classes +{ + // Reads an XmlTv file + public class XmlTvReader + { + private readonly string _fileName; + private readonly string _language; + + /// + /// Initializes a new instance of the class. + /// + /// Name of the file. + /// The specific language to return. + public XmlTvReader(string fileName, string language = null) + { + _fileName = fileName; + + // Normalize null/string.empty + if (string.IsNullOrWhiteSpace(language)) + { + language = null; + } + _language = language; + } + + private XmlReader CreateXmlTextReader(string path) + { + XmlReaderSettings settings = new XmlReaderSettings(); + + // https://msdn.microsoft.com/en-us/library/system.xml.xmlreadersettings.xmlresolver(v=vs.110).aspx + // Looks like we don't need this anyway? + // Starting with the .NET Framework 4.5.2, this setting has a default value of null. + //settings.XmlResolver = null; + + settings.DtdProcessing = DtdProcessing.Ignore; + + settings.CheckCharacters = false; + settings.IgnoreProcessingInstructions = true; + settings.IgnoreComments = true; + //settings.ValidationType = ValidationType.None; + + return XmlReader.Create(path, settings); + } + + /// + /// Gets the list of channels present in the XML + /// + /// + public IEnumerable GetChannels() + { + var list = new List(); + + using (var reader = CreateXmlTextReader(_fileName)) + { + if (reader.ReadToDescendant("tv")) + { + if (reader.ReadToDescendant("channel")) + { + do + { + var channel = GetChannel(reader); + if (channel != null) + { + list.Add(channel); + } + } + while (reader.ReadToFollowing("channel")); + } + } + } + + return list; + } + + private XmlTvChannel GetChannel(XmlReader reader) + { + var id = reader.GetAttribute("id"); + + if (string.IsNullOrEmpty(id)) + { + //Logger.Error("No id found for channel row"); + // Log.Error(" channel#{0} doesnt contain an id", iChannel); + return null; + } + + var result = new XmlTvChannel() { Id = id }; + + using (var xmlChannel = reader.ReadSubtree()) + { + xmlChannel.MoveToContent(); + xmlChannel.Read(); + + // Read out the data for each node and process individually + while (!xmlChannel.EOF && xmlChannel.ReadState == ReadState.Interactive) + { + if (xmlChannel.NodeType == XmlNodeType.Element) + { + switch (xmlChannel.Name) + { + case "display-name": + ProcessNode(xmlChannel, s => result.DisplayName = s, _language, s => SetChannelNumber(result, s)); + break; + case "url": + result.Url = xmlChannel.ReadElementContentAsString(); + break; + case "icon": + result.Icon = ProcessIconNode(xmlChannel); + xmlChannel.Skip(); + break; + default: + xmlChannel.Skip(); // unknown, skip entire node + break; + } + } + else + { + xmlChannel.Read(); + } + } + } + + if (string.IsNullOrEmpty(result.DisplayName)) + { + //Logger.Error("No display-name found for channel {0}", id); + return null; + } + + return result; + } + + private void SetChannelNumber(XmlTvChannel channel, string value) + { + value = value.Replace("-", "."); + double number; + if (double.TryParse(value, NumberStyles.Any, CultureInfo.InvariantCulture, out number)) + { + channel.Number = value; + } + } + + /// + /// Gets the programmes for a specified channel + /// + /// The channel id. + /// The UTC start date. + /// The UTC end date. + /// A cancellation token. + /// + public IEnumerable GetProgrammes( + string channelId, + DateTimeOffset startDateUtc, + DateTimeOffset endDateUtc, + CancellationToken cancellationToken) + { + var list = new List(); + + using (var reader = CreateXmlTextReader(_fileName)) + { + if (reader.ReadToDescendant("tv")) + { + if (reader.ReadToDescendant("programme")) + { + do + { + if (cancellationToken.IsCancellationRequested) + { + continue; // Break out + } + + var programme = GetProgramme(reader, channelId, startDateUtc, endDateUtc); + if (programme != null) + { + list.Add(programme); + } + } + while (reader.ReadToFollowing("programme")); + } + } + } + + return list; + } + + public XmlTvProgram GetProgramme(XmlReader reader, string channelId, DateTimeOffset startDateUtc, DateTimeOffset endDateUtc) + { + var result = new XmlTvProgram(); + + PopulateHeader(reader, result); + + using (var xmlProg = reader.ReadSubtree()) + { + // First up, validate that this is the correct channel, and programme is within the time we are expecting + if (!string.Equals(result.ChannelId, channelId, StringComparison.OrdinalIgnoreCase)) + { + return null; + } + + if (result.EndDate < startDateUtc || result.StartDate >= endDateUtc) + { + return null; + } + + xmlProg.MoveToContent(); + xmlProg.Read(); + + // Loop through each element + while (!xmlProg.EOF && xmlProg.ReadState == ReadState.Interactive) + { + if (xmlProg.NodeType == XmlNodeType.Element) + { + switch (xmlProg.Name) + { + case "title": + ProcessTitleNode(xmlProg, result); + break; + case "category": + ProcessCategory(xmlProg, result); + break; + case "country": + ProcessCountry(xmlProg, result); + break; + case "desc": + ProcessDescription(xmlProg, result); + break; + case "sub-title": + ProcessSubTitle(xmlProg, result); + break; + case "new": + ProcessNew(xmlProg, result); + break; + case "previously-shown": + ProcessPreviouslyShown(xmlProg, result); + break; + case "quality": + ProcessQuality(xmlProg, result); + break; + case "episode-num": + ProcessEpisodeNum(xmlProg, result); + break; + case "date": // Copyright date + ProcessCopyrightDate(xmlProg, result); + break; + case "star-rating": // Community Rating + ProcessStarRating(xmlProg, result); + break; + case "rating": // Certification Rating + ProcessRating(xmlProg, result); + break; + case "credits": + if (xmlProg.IsEmptyElement) + { + xmlProg.Skip(); + } + else + { + using (var subtree = xmlProg.ReadSubtree()) + { + ProcessCredits(subtree, result); + } + } + break; + case "icon": + result.Icon = ProcessIconNode(xmlProg); + xmlProg.Skip(); + break; + case "premiere": + result.Premiere = new XmlTvPremiere(); + // This was causing data after the premiere node to not be read. Reactivate this and debug if the premiere details are ever needed. + //ProcessPremiereNode(xmlProg, result); + xmlProg.Skip(); + break; + default: + // unknown, skip entire node + xmlProg.Skip(); + break; + } + } + else + { + xmlProg.Read(); + } + } + } + return result; + } + + /// + /// Gets the list of supported languages in the XML + /// + /// + public List GetLanguages(CancellationToken cancellationToken) + { + var results = new Dictionary(); + + //Loop through and parse out all elements and then lang= attributes + //Logger.Info("Loading file {0}", _fileName); + using (var reader = CreateXmlTextReader(_fileName)) + { + while (reader.Read()) + { + if (cancellationToken.IsCancellationRequested) + { + continue; // Break out + } + + if (reader.NodeType == XmlNodeType.Element) + { + var language = reader.GetAttribute("lang"); + if (!String.IsNullOrEmpty(language)) + { + if (!results.ContainsKey(language)) + { + results[language] = 0; + } + results[language]++; + } + } + } + } + + return + results.Keys.Select(k => new XmlTvLanguage() { Name = k, Relevance = results[k] }) + .OrderByDescending(l => l.Relevance) + .ToList(); + } + + private void ProcessCopyrightDate(XmlReader xmlProg, XmlTvProgram result) + { + var startValue = xmlProg.ReadElementContentAsString(); + if (string.IsNullOrEmpty(startValue)) + { + // Log.Error(" programme#{0} doesnt contain a start date", iChannel); + result.CopyrightDate = null; + } + else + { + var copyrightDate = ParseDate(startValue); + if (copyrightDate != null) + { + result.CopyrightDate = copyrightDate; + } + } + } + + public void ProcessCredits(XmlReader creditsXml, XmlTvProgram result) + { + creditsXml.MoveToContent(); + creditsXml.Read(); + + // Loop through each element + while (!creditsXml.EOF && creditsXml.ReadState == ReadState.Interactive) + { + if (creditsXml.NodeType == XmlNodeType.Element) + { + XmlTvCredit credit = null; + switch (creditsXml.Name) + { + case "director": + credit = new XmlTvCredit() { Type = XmlTvCreditType.Director }; + break; + case "actor": + credit = new XmlTvCredit() { Type = XmlTvCreditType.Actor }; + break; + case "writer": + credit = new XmlTvCredit() { Type = XmlTvCreditType.Writer }; + break; + case "adapter": + credit = new XmlTvCredit() { Type = XmlTvCreditType.Adapter }; + break; + case "producer": + credit = new XmlTvCredit() { Type = XmlTvCreditType.Producer }; + break; + case "composer": + credit = new XmlTvCredit() { Type = XmlTvCreditType.Composer }; + break; + case "editor": + credit = new XmlTvCredit() { Type = XmlTvCreditType.Editor }; + break; + case "presenter": + credit = new XmlTvCredit() { Type = XmlTvCreditType.Presenter }; + break; + case "commentator": + credit = new XmlTvCredit() { Type = XmlTvCreditType.Commentator }; + break; + case "guest": + credit = new XmlTvCredit() { Type = XmlTvCreditType.Guest }; + break; + } + + if (credit != null) + { + credit.Name = creditsXml.ReadElementContentAsString(); + result.Credits.Add(credit); + } + else + { + creditsXml.Skip(); + } + } + else + creditsXml.Read(); + } + } + + public void ProcessStarRating(XmlReader reader, XmlTvProgram result) + { + /* + + 3/3 + + */ + + reader.ReadToDescendant("value"); + if (reader.Name == "value") + { + var textValue = reader.ReadElementContentAsString(); + if (textValue.Contains("/")) + { + var components = textValue.Split('/'); + float value; + if (float.TryParse(components[0], out value)) + { + result.StarRating = value; + } + } + } + else + { + reader.Skip(); + } + } + + public void ProcessRating(XmlReader reader, XmlTvProgram result) + { + /* + + TV-G + + */ + + var system = reader.GetAttribute("system"); + + reader.ReadToDescendant("value"); + if (reader.Name == "value") + { + result.Rating = new XmlTvRating() + { + System = system, + Value = reader.ReadElementContentAsString() + }; + } + else + { + reader.Skip(); + } + } + + public void ProcessEpisodeNum(XmlReader reader, XmlTvProgram result) + { + /* + EP00003026.0666 + 2706 + .26/0. + */ + + var episodeSystem = reader.GetAttribute("system"); + switch (episodeSystem) + { + case "dd_progid": + ParseEpisodeDataForProgramId(reader, result); + break; + case "icetv": + result.ProviderIds["icetv"] = reader.ReadElementContentAsString(); + break; + case "xmltv_ns": + ParseEpisodeDataForXmlTvNs(reader, result); + break; + case "onscreen": + ParseEpisodeDataForOnScreen(reader, result); + break; + case "thetvdb.com": + ParseTvdbSystem(reader, result); + break; + case "imdb.com": + ParseImdbSystem(reader, result); + break; + case "themoviedb.org": + ParseMovieDbSystem(reader, result); + break; + case "SxxExx": + // TODO + // S03E12 + reader.Skip(); + break; + default: // Handles empty string and nulls + reader.Skip(); + break; + } + } + + public void ParseMovieDbSystem(XmlReader reader, XmlTvProgram result) + { + // series/248841 + // episode/4749206 + + var value = reader.ReadElementContentAsString(); + var parts = value.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries); + + if (string.Equals(parts[0], "series", StringComparison.OrdinalIgnoreCase)) + { + result.SeriesProviderIds["tmdb"] = parts[1]; + } + + else if (parts.Length == 1 || string.Equals(parts[0], "episode", StringComparison.OrdinalIgnoreCase)) + { + result.ProviderIds["tmdb"] = parts.Last(); + } + } + + public void ParseImdbSystem(XmlReader reader, XmlTvProgram result) + { + // series/tt1837576 + // episode/tt3288596 + + var value = reader.ReadElementContentAsString(); + if (string.IsNullOrWhiteSpace(value)) + { + return; + } + var parts = value.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries); + + if (parts.Length != 2) + { + return; + } + + if (string.Equals(parts[0], "series", StringComparison.OrdinalIgnoreCase)) + { + result.SeriesProviderIds["imdb"] = parts[1]; + } + + else if (string.Equals(parts[0], "episode", StringComparison.OrdinalIgnoreCase)) + { + result.ProviderIds["imdb"] = parts[1]; + } + } + + public void ParseTvdbSystem(XmlReader reader, XmlTvProgram result) + { + // series/248841 + // episode/4749206 + + var value = reader.ReadElementContentAsString(); + var parts = value.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries); + + if (parts.Length != 2) + { + return; + } + + if (string.Equals(parts[0], "series", StringComparison.OrdinalIgnoreCase)) + { + result.SeriesProviderIds["tvdb"] = parts[1]; + } + + else if (string.Equals(parts[0], "episode", StringComparison.OrdinalIgnoreCase)) + { + result.ProviderIds["tvdb"] = parts[1]; + } + } + + public void ParseEpisodeDataForOnScreen(XmlReader reader, XmlTvProgram result) + { + //// example: 'Episode #FFEE' + //serEpNum = ConvertHTMLToAnsi(nodeEpisodeNum); + //int num1 = serEpNum.IndexOf("#", 0); + //if (num1 < 0) num1 = 0; + //episodeNum = CorrectEpisodeNum(serEpNum.Substring(num1, serEpNum.Length - num1), 0); + + var value = reader.ReadElementContentAsString(); + // value = HttpUtility.HtmlDecode(value); + value = value.Replace(" ", ""); + + var hashIndex = value.IndexOf("#", StringComparison.Ordinal); + if (hashIndex > -1) + { + // Take everything from the hash to the end. + //TODO: This could be textual - how do we populate an Int32 + // result.EpisodeNumber + } + } + + public void ParseEpisodeDataForProgramId(XmlReader reader, XmlTvProgram result) + { + var value = reader.ReadElementContentAsString(); + if (!string.IsNullOrWhiteSpace(value)) + { + result.ProgramId = value; + } + } + + public void ParseEpisodeDataForXmlTvNs(XmlReader reader, XmlTvProgram result) + { + var value = reader.ReadElementContentAsString(); + + value = value.Replace(" ", ""); + + // Episode details + var components = value.Split(new[] { "." }, StringSplitOptions.None); + + int parsedInt; + + if (!string.IsNullOrEmpty(components[0])) + { + // Handle either "5/12" or "5" + var seriesComponents = components[0].Split(new[] { "/" }, StringSplitOptions.None); + + // handle the zero basing! + if (int.TryParse(seriesComponents[0], out parsedInt)) + { + result.Episode.Series = parsedInt + 1; + if (seriesComponents.Length == 2) + { + if (int.TryParse(seriesComponents[1], out parsedInt)) + { + result.Episode.SeriesCount = parsedInt; + } + } + } + } + + if (components.Length >= 2) + { + if (!string.IsNullOrEmpty(components[1])) + { + // Handle either "5/12" or "5" + var episodeComponents = components[1].Split(new[] { "/" }, StringSplitOptions.None); + + // handle the zero basing! + if (int.TryParse(episodeComponents[0], out parsedInt)) + { + result.Episode.Episode = parsedInt + 1; + if (episodeComponents.Count() == 2) + { + if (int.TryParse(episodeComponents[1], out parsedInt)) + { + result.Episode.EpisodeCount = parsedInt; + } + } + } + } + } + + if (components.Length >= 3) + { + if (!string.IsNullOrEmpty(components[2])) + { + // Handle either "5/12" or "5" + var partComponents = components[2].Split(new[] { "/" }, StringSplitOptions.None); + + // handle the zero basing! + if (int.TryParse(partComponents[0], out parsedInt)) + { + result.Episode.Part = parsedInt + 1; + if (partComponents.Count() == 2) + { + if (int.TryParse(partComponents[1], out parsedInt)) + { + result.Episode.PartCount = parsedInt; + } + } + } + } + } + } + + public void ProcessQuality(XmlReader reader, XmlTvProgram result) + { + result.Quality = reader.ReadElementContentAsString(); + } + + public void ProcessPreviouslyShown(XmlReader reader, XmlTvProgram result) + { + // + var value = reader.GetAttribute("start"); + if (!string.IsNullOrEmpty(value)) + { + // TODO: this may not be correct = validate it + result.PreviouslyShown = ParseDate(value); + if (result.PreviouslyShown != result.StartDate) + { + result.IsPreviouslyShown = true; + } + } + else + { + result.IsPreviouslyShown = true; + } + + reader.Skip(); // Move on + } + + public void ProcessNew(XmlReader reader, XmlTvProgram result) + { + result.IsNew = true; + reader.Skip(); // Move on + } + + public void ProcessCategory(XmlReader reader, XmlTvProgram result) + { + /* + News + */ + + result.Categories = result.Categories ?? new List(); + ProcessMultipleNodes(reader, s => result.Categories.Add(s), _language); + + //result.Categories.Add(reader.ReadElementContentAsString()); + } + public void ProcessCountry(XmlReader reader, XmlTvProgram result) + { + /* + Canadá + EE.UU + */ + + result.Countries = result.Countries ?? new List(); + ProcessNode(reader, s => result.Countries.Add(s), _language); + } + + public void ProcessSubTitle(XmlReader reader, XmlTvProgram result) + { + /* + Gino's Italian Escape - Islands in the Sun: Southern Sardinia Celebrate the Sea + 8782 + */ + ProcessNode(reader, s => result.Episode.Title = s, _language); + } + + public void ProcessDescription(XmlReader reader, XmlTvProgram result) + { + ProcessNode(reader, s => result.Description = s, _language); + } + + public void ProcessTitleNode(XmlReader reader, XmlTvProgram result) + { + // Gino's Italian Escape + ProcessNode(reader, s => result.Title = s, _language); + } + + public void ProcessPremiereNode(XmlReader reader, XmlTvProgram result) + { + // Gino's Italian Escape + ProcessNode(reader, + s => + { + if (result.Premiere == null) + { + result.Premiere = new XmlTvPremiere() { Details = s }; + } + else + { + result.Premiere.Details = s; + } + }, _language); + } + + public XmlTvIcon ProcessIconNode(XmlReader reader) + { + var result = new XmlTvIcon(); + var isPopulated = false; + + var source = reader.GetAttribute("src"); + if (!String.IsNullOrEmpty(source)) + { + result.Source = source; + isPopulated = true; + } + + var widthString = reader.GetAttribute("width"); + var width = 0; + if (!String.IsNullOrEmpty(widthString) && Int32.TryParse(widthString, out width)) + { + result.Width = width; + isPopulated = true; + } + + var heightString = reader.GetAttribute("height"); + var height = 0; + if (!String.IsNullOrEmpty(heightString) && Int32.TryParse(heightString, out height)) + { + result.Height = height; + isPopulated = true; + } + + return isPopulated ? result : null; + } + + + //public void ProcessNodeWithLanguage(XmlReader reader, Action setter) + //{ + // var currentElementName = reader.Name; + // var result = string.Empty; + // var resultCandidate = reader.ReadElementContentAsString(); + // var exactMatchFound = false; + + // while (reader.Name == currentElementName) + // { + // var language = reader.GetAttribute("lang"); + // resultCandidate = reader.ReadElementContentAsString(); + + // if (language == _language && !exactMatchFound) + // { + // result = resultCandidate; + // } + + // reader.Skip(); + // } + + // result = String.IsNullOrEmpty(result) ? resultCandidate : result; + // setter(result); + //} + + public void ProcessNode(XmlReader reader, Action setter, string languageRequired = null, Action allOccurrencesSetter = null) + { + /* + Homes Under the Hammer - Spanish + Homes Under the Hammer - Spanish 2 + Homes Under the Hammer - English + Homes Under the Hammer - English 2 + Homes Under the Hammer - Empty Language + Homes Under the Hammer - Empty Language 2 + Homes Under the Hammer - No Language + Homes Under the Hammer - No Language 2 + */ + + /* Expected Behaviour: + - Language = Null Homes Under the Hammer - No Language + - Language = "" Homes Under the Hammer - No Language + - Language = es Homes Under the Hammer - Spanish + - Language = en Homes Under the Hammer - English + */ + + var results = new List>(); + + // We will always use the first value - so that if there are no matches we can return something + var currentElementName = reader.Name; + + var lang = reader.HasAttributes ? reader.GetAttribute("lang") : null; + var currentValue = reader.ReadElementContentAsString(); + results.Add(new Tuple(currentValue, lang)); + + if (allOccurrencesSetter != null) + { + allOccurrencesSetter(currentValue); + } + + while (!reader.EOF && reader.ReadState == ReadState.Interactive) + { + if (reader.NodeType == XmlNodeType.Element) + { + if (reader.Name == currentElementName) + { + lang = reader.HasAttributes ? reader.GetAttribute("lang") : null; + currentValue = reader.ReadElementContentAsString(); + + if (allOccurrencesSetter != null) + { + allOccurrencesSetter(currentValue); + } + + results.Add(new Tuple(currentValue, lang)); + } + else + { + break; + } + } + else + { + reader.Read(); + } + } + + if (languageRequired != null) + { + foreach (var result in results) + { + if (string.Equals(languageRequired, result.Item2, StringComparison.OrdinalIgnoreCase)) + { + setter(result.Item1); + return; + } + } + } + + foreach (var result in results) + { + if (string.IsNullOrWhiteSpace(result.Item2)) + { + setter(result.Item1); + return; + } + } + + foreach (var result in results) + { + setter(result.Item1); + return; + } + } + + public void ProcessMultipleNodes(XmlReader reader, Action setter, string languageRequired = null) + { + /* + Property - English + Property - English 2 + Property - Spanish + Property - Spanish 2 + Property - Empty Language + Property - Empty Language 2 + Property - No Language + Property - No Language 2 + */ + + /* Expected Behaviour: + - Language = Null Property - No Language / Property - No Language 2 + - Language = "" Property - Empty Language / Property - Empty Language 2 + - Language = es Property - Spanish / Property - Spanish 2 + - Language = en Property - English / Property - English 2 + */ + + var currentElementName = reader.Name; + var values = new[] { new { Language = reader.GetAttribute("lang"), Value = reader.ReadElementContentAsString() } }.ToList(); + + while (reader.Read()) + { + if (reader.NodeType == XmlNodeType.Element && reader.Name != currentElementName) + { + break; + } + + if (reader.NodeType == XmlNodeType.Element && reader.Name == currentElementName) + { + values.Add(new { Language = reader.GetAttribute("lang"), Value = reader.ReadElementContentAsString() }); + } + } + + if (values.Count(v => v.Language == languageRequired) > 0) + { + values.RemoveAll(v => v.Language != languageRequired); + } + + // ENumerate and return all the matches + foreach (var result in values) + { + setter(result.Value); + } + } + + public void ProcessMultipleNodesWithLanguage(XmlReader reader, Action setter) + { + var currentElementName = reader.Name; + while (reader.Name == currentElementName) + { + var language = reader.GetAttribute("lang"); + if (String.IsNullOrEmpty(_language) || String.IsNullOrEmpty(language) || language == _language) + { + setter(reader.ReadElementContentAsString()); + } + reader.Skip(); + } + } + + private void PopulateHeader(XmlReader reader, XmlTvProgram result) + { + result.ChannelId = reader.GetAttribute("channel"); + + var startValue = reader.GetAttribute("start"); + if (string.IsNullOrEmpty(startValue)) + { + // Log.Error(" programme#{0} doesnt contain a start date", iChannel); + result.StartDate = DateTimeOffset.MinValue; + } + else + { + result.StartDate = ParseDate(startValue).GetValueOrDefault(); + } + + + var endValue = reader.GetAttribute("stop"); + if (string.IsNullOrEmpty(endValue)) + { + // Log.Error(" programme#{0} doesnt contain an end date", iChannel); + result.EndDate = DateTimeOffset.MinValue; + } + else + { + result.EndDate = ParseDate(endValue).GetValueOrDefault(); + } + } + + public static Regex _regDateWithOffset = new Regex(@"^(?[0-9]{4,14})(\s(?[+-]*[0-9]{1,4}))?$"); + + public DateTimeOffset? ParseDate(string dateValue) + { + /* + All dates and times in this DTD follow the same format, loosely based + on ISO 8601. They can be 'YYYYMMDDhhmmss' or some initial + substring, for example if you only know the year and month you can + have 'YYYYMM'. You can also append a timezone to the end; if no + explicit timezone is given, UTC is assumed. Examples: + '200007281733 BST', '200209', '19880523083000 +0300'. (BST == +0100.) + */ + + DateTimeOffset? result = null; + + if (!string.IsNullOrEmpty(dateValue)) + { + var completeDate = "20000101000000"; + var dateComponent = string.Empty; + var dateOffset = "+00:00"; + + var match = _regDateWithOffset.Match(dateValue); + if (match.Success) + { + dateComponent = match.Groups["dateDigits"].Value; + if (!String.IsNullOrEmpty(match.Groups["dateOffset"].Value)) + { + dateOffset = match.Groups["dateOffset"].Value; // Add in the colon to ease parsing later + if (dateOffset.Length == 5) + { + dateOffset = dateOffset.Insert(3, ":"); // Add in the colon to ease parsing later + } + else + { + dateOffset = "+00:00"; + } + } + } + + // Pad out the date component part to 14 characaters so 2016061509 becomes 20160615090000 + if (dateComponent.Length < 14) + { + dateComponent = dateComponent + completeDate.Substring(dateComponent.Length, completeDate.Length - dateComponent.Length); + } + + var standardDate = String.Format("{0} {1}", dateComponent, dateOffset); + DateTimeOffset parsedDateTime; + if (DateTimeOffset.TryParseExact(standardDate, "yyyyMMddHHmmss zzz", CultureInfo.CurrentCulture, DateTimeStyles.None, out parsedDateTime)) + { + return parsedDateTime.ToUniversalTime(); + } + else + { + //Logger.Warn("Unable to parse the date {0} from standardised form {1}", dateValue, standardDate); + } + } + + return result; + } + + public string StandardiseDate(string value) + { + var completeDate = "20000101000000"; + var dateComponent = string.Empty; + var dateOffset = "+0000"; + + var match = _regDateWithOffset.Match(value); + if (match.Success) + { + dateComponent = match.Groups["dateDigits"].Value; + dateOffset = match.Groups["dateOffset"].Value; + } + + // Pad out the date component part to 14 characaters so 2016061509 becomes 20160615090000 + if (dateComponent.Length < 14) + { + dateComponent = dateComponent + completeDate.Substring(dateComponent.Length, completeDate.Length - dateComponent.Length); + } + + return String.Format("{0} {1}", dateComponent, dateOffset); + } + } +} \ No newline at end of file diff --git a/Emby.XmlTv/Emby.XmlTv/Emby.XmlTv.csproj b/Emby.XmlTv/Emby.XmlTv/Emby.XmlTv.csproj new file mode 100644 index 0000000000..60183534e0 --- /dev/null +++ b/Emby.XmlTv/Emby.XmlTv/Emby.XmlTv.csproj @@ -0,0 +1,9 @@ + + + + + netcoreapp2.1 + false + + + diff --git a/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvChannel.cs b/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvChannel.cs new file mode 100644 index 0000000000..632a9945f4 --- /dev/null +++ b/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvChannel.cs @@ -0,0 +1,50 @@ +using System; +using System.Text; + +namespace Emby.XmlTv.Entities +{ + public class XmlTvChannel : IEquatable + { + public String Id { get; set; } + public String DisplayName { get; set; } + public String Number { get; set; } + public string Url { get; set; } + public XmlTvIcon Icon { get; set; } + + public bool Equals(XmlTvChannel other) + { + // If both are null, or both are same instance, return true. + if (ReferenceEquals(this, other)) + { + return true; + } + + // If the other is null then return false + if (other == null) + { + return false; + } + + // Return true if the fields match: + return Id == other.Id; + } + + public override int GetHashCode() + { + return (Id.GetHashCode() * 17); + } + + public override string ToString() + { + var builder = new StringBuilder(); + builder.AppendFormat("{0} - {1} ", Id, DisplayName); + + if (!string.IsNullOrEmpty(Url)) + { + builder.AppendFormat(" ({0})", Url); + } + + return builder.ToString(); + } + } +} \ No newline at end of file diff --git a/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvCredit.cs b/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvCredit.cs new file mode 100644 index 0000000000..af9c82d3f0 --- /dev/null +++ b/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvCredit.cs @@ -0,0 +1,15 @@ +using System; + +namespace Emby.XmlTv.Entities +{ + public class XmlTvCredit + { + public XmlTvCreditType Type { get; set; } + public string Name { get; set; } + + public override string ToString() + { + return String.Format("{0} - ({1})", Name, Type); + } + } +} diff --git a/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvCreditType.cs b/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvCreditType.cs new file mode 100644 index 0000000000..e54f243462 --- /dev/null +++ b/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvCreditType.cs @@ -0,0 +1,17 @@ +namespace Emby.XmlTv.Entities +{ + public enum XmlTvCreditType + { + NotSpecified = 0, + Director, + Actor, + Writer, + Adapter, + Producer, + Composer, + Editor, + Presenter, + Commentator, + Guest + } +} \ No newline at end of file diff --git a/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvEpisode.cs b/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvEpisode.cs new file mode 100644 index 0000000000..afcfb909ee --- /dev/null +++ b/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvEpisode.cs @@ -0,0 +1,53 @@ +using System; +using System.Text; + +namespace Emby.XmlTv.Entities +{ + public class XmlTvEpisode + { + public int? Series { get; set; } + public int? SeriesCount { get; set; } + public int? Episode { get; set; } + public int? EpisodeCount { get; set; } + public string Title { get; set; } + public int? Part { get; set; } + public int? PartCount { get; set; } + + public override string ToString() + { + var builder = new StringBuilder(); + if (Series.HasValue || SeriesCount.HasValue) + { + builder.AppendFormat("Series {0}", Series.HasValue ? Series.Value.ToString() : "?"); + if (SeriesCount.HasValue) + { + builder.AppendFormat(" of {0}", SeriesCount); + } + } + + if (Episode.HasValue || EpisodeCount.HasValue) + { + builder.Append(builder.Length > 0 ? ", " : String.Empty); + builder.AppendFormat("Episode {0}", Episode.HasValue ? Episode.Value.ToString() : "?"); + if (EpisodeCount.HasValue) + { + builder.AppendFormat(" of {0}", EpisodeCount); + } + } + + if (Part.HasValue || PartCount.HasValue) + { + builder.Append(builder.Length > 0 ? ", " : String.Empty); + builder.AppendFormat("Part {0}", Part.HasValue ? Part.Value.ToString() : "?"); + if (PartCount.HasValue) + { + builder.AppendFormat(" of {0}", PartCount); + } + } + + return builder.ToString(); + } + } + + +} diff --git a/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvIcon.cs b/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvIcon.cs new file mode 100644 index 0000000000..d0a91cabf3 --- /dev/null +++ b/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvIcon.cs @@ -0,0 +1,28 @@ +using System; +using System.Text; + +namespace Emby.XmlTv.Entities +{ + public class XmlTvIcon + { + public String Source { get; set; } + public Int32? Width { get; set; } + public Int32? Height { get; set; } + + public override string ToString() + { + var builder = new StringBuilder(); + builder.AppendFormat("Source: {0}", Source); + if (Width.HasValue) + { + builder.AppendFormat(", Width: {0}", Width); + } + if (Height.HasValue) + { + builder.AppendFormat(", Height: {0}", Height); + } + + return builder.ToString(); + } + } +} diff --git a/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvLanguage.cs b/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvLanguage.cs new file mode 100644 index 0000000000..41c4cedb87 --- /dev/null +++ b/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvLanguage.cs @@ -0,0 +1,17 @@ +using System; + +namespace Emby.XmlTv.Entities +{ + public class XmlTvLanguage + { + /// + /// The name. + /// + public String Name { get; set; } + + /// + /// The relevance (number of occurances) of the language, can be used to order (desc) + /// + public Int32 Relevance { get; set; } + } +} diff --git a/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvPremiere.cs b/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvPremiere.cs new file mode 100644 index 0000000000..6b7e490552 --- /dev/null +++ b/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvPremiere.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Emby.XmlTv.Entities +{ + public class XmlTvPremiere + { + /* + + First showing on national terrestrial TV + + */ + + public string Details { get; set; } + } +} diff --git a/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvProgram.cs b/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvProgram.cs new file mode 100644 index 0000000000..b5aa6cf7a9 --- /dev/null +++ b/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvProgram.cs @@ -0,0 +1,93 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Emby.XmlTv.Entities +{ + public class XmlTvProgram : IEquatable + { + public string ChannelId { get; set; } + + public DateTimeOffset StartDate { get; set; } + + public DateTimeOffset EndDate { get; set; } + + public string Title { get; set; } + + public string Description { get; set; } + public string ProgramId { get; set; } + public string Quality { get; set; } + + public List Categories { get; set; } + + public List Countries { get; set; } + + public DateTimeOffset? PreviouslyShown { get; set; } + + public bool IsPreviouslyShown { get; set; } + public bool IsNew { get; set; } + + public DateTimeOffset? CopyrightDate { get; set; } + + public XmlTvEpisode Episode { get; set; } + + public List Credits { get; set; } + + public XmlTvRating Rating { get; set; } + + public float? StarRating { get; set; } + + public XmlTvIcon Icon { get; set; } + + public XmlTvPremiere Premiere { get; set; } + + public Dictionary ProviderIds { get; set; } + public Dictionary SeriesProviderIds { get; set; } + + public XmlTvProgram() + { + Credits = new List(); + Categories = new List(); + Countries = new List(); + Episode = new XmlTvEpisode(); + + ProviderIds = new Dictionary(StringComparer.OrdinalIgnoreCase); + SeriesProviderIds = new Dictionary(StringComparer.OrdinalIgnoreCase); + } + + public bool Equals(XmlTvProgram other) + { + // If both are null, or both are same instance, return true. + if (ReferenceEquals(this, other)) + { + return true; + } + + // If the other is null then return false + if (other == null) + { + return false; + } + + // Return true if the fields match: + return ChannelId == other.ChannelId && + StartDate == other.StartDate && + EndDate == other.EndDate; + } + + public override int GetHashCode() + { + return (ChannelId.GetHashCode() * 17) + (StartDate.GetHashCode() * 17) + (EndDate.GetHashCode() * 17); + } + + public override string ToString() + { + var builder = new StringBuilder(); + builder.AppendFormat("ChannelId: \t\t{0}\r\n", ChannelId); + builder.AppendFormat("Title: \t\t{0}\r\n", Title); + builder.AppendFormat("StartDate: \t\t{0}\r\n", StartDate); + builder.AppendFormat("EndDate: \t\t{0}\r\n", EndDate); + return builder.ToString(); + } + } +} diff --git a/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvRating.cs b/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvRating.cs new file mode 100644 index 0000000000..e55e70701d --- /dev/null +++ b/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvRating.cs @@ -0,0 +1,41 @@ +using System; +using System.Text; + +namespace Emby.XmlTv.Entities +{ + /// + /// Describes the rating (certification) applied to a program + /// + /// Example XML: + /// + public class XmlTvRating + { + /// + /// The literal name of the rating system + /// + /// MPAA + public String System { get; set; } + + /// + /// Describes the rating using the system specificed + /// + /// TV-14 + public string Value { get; set; } + + public override string ToString() + { + var builder = new StringBuilder(); + if (!String.IsNullOrEmpty(Value)) + { + builder.Append(Value); + } + + if (!String.IsNullOrEmpty(System)) + { + builder.AppendFormat(" ({0})", System); + } + + return builder.ToString(); + } + } +} diff --git a/Emby.XmlTv/Emby.XmlTv/Properties/AssemblyInfo.cs b/Emby.XmlTv/Emby.XmlTv/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..f33433c93d --- /dev/null +++ b/Emby.XmlTv/Emby.XmlTv/Properties/AssemblyInfo.cs @@ -0,0 +1,32 @@ +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("XmlTv")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("XmlTv")] +[assembly: AssemblyCopyright("Copyright © 2015")] +[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)] + +// 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")] diff --git a/Emby.XmlTv/Emby.XmlTv/XmlTvSchema.dtd b/Emby.XmlTv/Emby.XmlTv/XmlTvSchema.dtd new file mode 100644 index 0000000000..f723eadc0e --- /dev/null +++ b/Emby.XmlTv/Emby.XmlTv/XmlTvSchema.dtd @@ -0,0 +1,575 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Emby.XmlTv/License.txt b/Emby.XmlTv/License.txt new file mode 100644 index 0000000000..3c4f73ddb2 --- /dev/null +++ b/Emby.XmlTv/License.txt @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2016 Alex Stevens + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/Emby.XmlTv/Nuget/Emby.XmlTv.nuspec b/Emby.XmlTv/Nuget/Emby.XmlTv.nuspec new file mode 100644 index 0000000000..06d2905487 --- /dev/null +++ b/Emby.XmlTv/Nuget/Emby.XmlTv.nuspec @@ -0,0 +1,20 @@ + + + + Emby.XmlTv + 1.0.19 + Emby.XmlTv + Emby Team + ebr,Luke,scottisafool + https://github.com/MediaBrowser/Emby.XmlTv + http://www.mb3admin.com/images/mb3icons1-1.png + false + An XmlTv parsing library. + Copyright © Emby 2013 + + + + + + + \ No newline at end of file diff --git a/Emby.XmlTv/README.md b/Emby.XmlTv/README.md new file mode 100644 index 0000000000..86e777bb29 --- /dev/null +++ b/Emby.XmlTv/README.md @@ -0,0 +1 @@ +# Emby.XmlTv diff --git a/ImageMagickSharp b/ImageMagickSharp deleted file mode 160000 index 27aff39870..0000000000 --- a/ImageMagickSharp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 27aff3987068a952125154da454c351cb62a5321