diff --git a/source/ChanSort.Loader.GlobalClone/ChanSort.Loader.GlobalClone.csproj b/source/ChanSort.Loader.GlobalClone/ChanSort.Loader.GlobalClone.csproj deleted file mode 100644 index cf9c77e..0000000 --- a/source/ChanSort.Loader.GlobalClone/ChanSort.Loader.GlobalClone.csproj +++ /dev/null @@ -1,136 +0,0 @@ - - - - - Debug - AnyCPU - {5361C8CB-F737-4709-AF8C-E1F0456F3C5B} - Library - Properties - ChanSort.Loader.GlobalClone - ChanSort.Loader.GlobalClone - v4.8 - 512 - - - - x86 - true - full - false - ..\Debug\ - DEBUG;TRACE - prompt - 4 - false - latest - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - latest - - - true - ..\Debug\ - DEBUG;TRACE - full - x86 - prompt - MinimumRecommendedRules.ruleset - false - latest - - - ..\Release\ - TRACE - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - false - latest - - - - - - - ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll - - - - - - - - - - - - - - - - - - - - Resources.de.resx - True - True - - - True - True - Resources.resx - - - - - {dccffa08-472b-4d17-bb90-8f513fc01392} - ChanSort.Api - - - - - - - - - ResXFileCodeGenerator - Resources.de.Designer.cs - Designer - - - - - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - - - - - - - - - \ No newline at end of file diff --git a/source/ChanSort.Loader.GlobalClone/GcSerializerPlugin.cs b/source/ChanSort.Loader.GlobalClone/GcSerializerPlugin.cs deleted file mode 100644 index 9235d4b..0000000 --- a/source/ChanSort.Loader.GlobalClone/GcSerializerPlugin.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.IO; -using System.Text; -using ChanSort.Api; - -namespace ChanSort.Loader.GlobalClone -{ - public class GcSerializerPlugin : ISerializerPlugin - { - public string DllName { get; set; } - public string PluginName => "LG GlobalClone"; - public string FileFilter => "*Clone*.tll;xx*.xml;xx*.tll"; - - public SerializerBase CreateSerializer(string inputFile) - { - // files with 200 .... contain all the actual channel data in JSON format inside a element - var content = File.ReadAllText(inputFile, Encoding.UTF8); - if (content.Contains("")) - return new GcJsonSerializer(inputFile, content); - - return new GcXmlSerializer(inputFile); - } - } -} diff --git a/source/ChanSort.Loader.GlobalClone/GlobalClone00001.xml b/source/ChanSort.Loader.GlobalClone/GlobalClone00001.xml deleted file mode 100644 index 6afd362..0000000 --- a/source/ChanSort.Loader.GlobalClone/GlobalClone00001.xml +++ /dev/null @@ -1,6427 +0,0 @@ - - - - -42LB731V-ZE - -100 -000 -400 - -DTV_DVB -ROU -EU - - - - -0 - -255 -255 -255 -255 -127 -0 -0 -0 - -0 -39 - -0 -1 -2 -3 -4 -5 -6 -7 -8 -9 -10 -11 -12 -13 -14 -15 -16 -17 -18 -19 -20 -21 -22 -23 -24 -25 -26 -27 -28 -29 -30 -31 -32 -33 -34 -35 -36 -37 -38 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 - - - - -0 -0 -8 -0 -65 -1 -1 -1 -0 -0 -108 -109 -1 -0 -0 -0 - - -1 -4 -0 -0 -65 -1 -1 -1 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -2 -4 -8 -1 -65 -1 -1 -1 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -3 -5 -0 -0 -65 -1 -1 -1 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -4 -7 -0 -1 -65 -1 -1 -1 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -5 -7 -0 -0 -65 -1 -1 -1 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -6 -8 -0 -0 -65 -1 -1 -1 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -7 -9 -0 -1 -65 -1 -1 -1 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -8 -10 -0 -1 -65 -1 -1 -1 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -9 -13 -0 -1 -65 -1 -1 -1 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -10 -16 -0 -1 -65 -1 -1 -1 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -11 -19 -2 -1 -65 -1 -1 -1 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -12 -23 -5 -1 -65 -1 -1 -1 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -13 -26 -0 -1 -65 -1 -1 -1 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -14 -28 -2 -1 -65 -1 -1 -1 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -15 -30 -0 -0 -65 -1 -1 -1 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -16 -33 -0 -1 -65 -1 -1 -1 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -17 -36 -0 -1 -65 -1 -1 -1 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -18 -39 -0 -1 -65 -1 -1 -1 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -19 -40 -0 -1 -65 -1 -1 -1 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -20 -42 -0 -1 -65 -1 -1 -1 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -21 -68 -5 -1 -65 -1 -1 -1 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -22 -105 -5 -1 -65 -1 -1 -1 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -23 -90 -0 -1 -65 -1 -1 -1 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -24 -75 -0 -1 -65 -1 -1 -1 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -25 -140 -0 -1 -65 -1 -1 -1 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -26 -85 -0 -1 -65 -1 -1 -1 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -27 -96 -5 -1 -65 -1 -1 -1 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -28 -60 -0 -1 -65 -1 -1 -1 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -29 -56 -0 -1 -65 -1 -1 -1 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -30 -7 -3 -0 -65 -1 -1 -1 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -31 -33 -5 -0 -65 -1 -1 -1 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -32 -50 -0 -0 -65 -1 -1 -1 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -33 -57 -0 -1 -65 -1 -1 -1 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -34 -160 -0 -1 -65 -1 -1 -1 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -35 -0 -1 -1 -65 -1 -1 -1 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -36 -0 -2 -1 -65 -1 -1 -1 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -37 -0 -3 -1 -65 -1 -1 -1 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -38 -0 -4 -1 -65 -1 -1 -1 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -0 -0 -0 -0 -0 -0 -0 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -0 -0 -0 -0 -0 -0 -0 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -0 -0 -0 -0 -0 -0 -0 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -0 -0 -0 -0 -0 -0 -0 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -0 -0 -0 -0 -0 -0 -0 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -0 -0 -0 -0 -0 -0 -0 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -0 -0 -0 -0 -0 -0 -0 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -0 -0 -0 -0 -0 -0 -0 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -0 -0 -0 -0 -0 -0 -0 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -0 -0 -0 -0 -0 -0 -0 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -0 -0 -0 -0 -0 -0 -0 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -0 -0 -0 -0 -0 -0 -0 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -0 -0 -0 -0 -0 -0 -0 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -0 -0 -0 -0 -0 -0 -0 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -0 -0 -0 -0 -0 -0 -0 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -0 -0 -0 -0 -0 -0 -0 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -0 -0 -0 -0 -0 -0 -0 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -0 -0 -0 -0 -0 -0 -0 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -0 -0 -0 -0 -0 -0 -0 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -0 -0 -0 -0 -0 -0 -0 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -0 -0 -0 -0 -0 -0 -0 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -0 -0 -0 -0 -0 -0 -0 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -0 -0 -0 -0 -0 -0 -0 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -0 -0 -0 -0 -0 -0 -0 -0 -65535 -65535 -0 -0 -0 -0 -0 - - -0 -0 -0 -0 -0 -0 -0 -0 -65535 -65535 -0 -0 -0 -0 -0 - - - - - -0 - -1 -0 -0 -0 -0 - - - -1 - -1 -0 -0 -2 -0 -0 -0 -0 -0 -0 - -0 -9750 -10600 -1 -1 -0 -0 -0 -0 -1 -0 -0 -0 -0 -0 -0 -0 -1210 -0 -0 -0 - - -102 - -0 -11247 -0 -24500 -0 -0 - - -1 -10872 -0 -24500 -0 -0 - - -9 -10716 -1 -24500 -0 -0 - - -10 -10747 -0 -25000 -1 -0 - - -11 -10747 -1 -25000 -1 -0 - - -12 -10778 -0 -25000 -1 -0 - - -13 -10778 -1 -24500 -0 -0 - - -14 -10809 -0 -24500 -0 -0 - - -15 -10809 -1 -24500 -0 -0 - - -16 -10841 -0 -24500 -0 -0 - - -17 -10841 -1 -24500 -0 -0 - - -18 -10872 -1 -24500 -0 -0 - - -19 -10903 -0 -25000 -1 -0 - - -20 -10903 -1 -25000 -1 -0 - - -21 -10934 -0 -24500 -0 -0 - - -22 -10934 -1 -25000 -1 -0 - - -23 -10962 -1 -1550 -0 -0 - - -24 -11038 -1 -2200 -1 -0 - - -25 -11042 -1 -1500 -1 -0 - - -26 -11048 -1 -3100 -0 -0 - - -27 -11080 -1 -1100 -0 -0 - - -28 -11104 -1 -3360 -1 -0 - - -29 -11172 -0 -6111 -0 -0 - - -30 -11188 -0 -1005 -1 -0 - - -31 -11189 -0 -1005 -1 -0 - - -32 -11216 -0 -24500 -0 -0 - - -33 -11229 -1 -24500 -0 -0 - - -34 -11261 -1 -24500 -0 -0 - - -35 -11278 -0 -24500 -0 -0 - - -36 -11293 -1 -24500 -0 -0 - - -37 -11309 -0 -24500 -0 -0 - - -38 -11325 -1 -24500 -0 -0 - - -39 -11341 -0 -24500 -0 -0 - - -40 -11357 -1 -24500 -0 -0 - - -41 -11372 -0 -24500 -0 -0 - - -42 -11389 -1 -24500 -0 -0 - - -43 -11403 -0 -24500 -0 -0 - - -44 -11421 -1 -24500 -0 -0 - - -45 -11463 -0 -6111 -0 -0 - - -46 -11471 -0 -6111 -0 -0 - - -47 -11481 -0 -6111 -0 -0 - - -48 -11491 -0 -6111 -0 -0 - - -49 -11497 -0 -3333 -0 -0 - - -50 -11502 -0 -3200 -0 -0 - - -51 -11509 -0 -6111 -0 -0 - - -52 -11518 -0 -4000 -0 -0 - - -53 -11525 -0 -6111 -0 -0 - - -54 -11533 -0 -3600 -1 -0 - - -55 -11540 -0 -4936 -1 -0 - - -56 -11544 -0 -3472 -0 -0 - - -57 -11548 -0 -3472 -0 -0 - - -58 -11553 -0 -3472 -0 -0 - - -59 -11558 -0 -6111 -0 -0 - - -60 -11593 -0 -5632 -0 -0 - - -61 -11605 -0 -15000 -1 -0 - - -62 -11608 -1 -5655 -0 -0 - - -63 -11614 -0 -5632 -0 -0 - - -64 -11628 -0 -6666 -0 -0 - - -65 -11642 -0 -15000 -1 -0 - - -66 -11643 -1 -3333 -0 -0 - - -67 -11660 -0 -15000 -1 -0 - - -68 -11682 -0 -3333 -0 -0 - - -69 -11687 -0 -3333 -0 -0 - - -70 -11727 -0 -28000 -0 -0 - - -71 -11747 -1 -28000 -0 -0 - - -72 -11766 -0 -28000 -0 -0 - - -73 -11785 -1 -30000 -1 -0 - - -74 -11804 -0 -28000 -0 -0 - - -75 -11843 -0 -30000 -1 -0 - - -76 -11862 -1 -28000 -0 -0 - - -77 -11881 -0 -30000 -1 -0 - - -78 -11900 -1 -28000 -0 -0 - - -79 -11919 -0 -28000 -0 -0 - - -80 -11938 -1 -28000 -0 -0 - - -81 -11977 -1 -28000 -0 -0 - - -82 -11996 -0 -28000 -0 -0 - - -83 -12015 -1 -30000 -1 -0 - - -84 -12034 -0 -28000 -0 -0 - - -85 -12073 -0 -28000 -0 -0 - - -86 -12092 -1 -30000 -1 -0 - - -87 -12188 -0 -28000 -0 -0 - - -88 -12226 -0 -27500 -0 -0 - - -89 -12265 -0 -28000 -0 -0 - - -90 -12303 -0 -27500 -1 -0 - - -91 -12380 -0 -28000 -0 -0 - - -92 -12418 -0 -28000 -0 -0 - - -93 -12456 -0 -28000 -0 -0 - - -94 -12513 -0 -5200 -0 -0 - - -95 -12519 -0 -3684 -0 -0 - - -96 -12527 -1 -27500 -0 -0 - - -97 -12528 -0 -4750 -0 -0 - - -98 -12563 -1 -27500 -0 -0 - - -99 -12563 -0 -27500 -0 -0 - - -100 -12607 -1 -27500 -0 -0 - - -101 -12607 -0 -27500 -0 -0 - - -102 -12643 -1 -27500 -0 -0 - - -103 -12643 -0 -27500 -0 -0 - - -104 -12687 -1 -27500 -0 -0 - - -105 -12687 -0 -27500 -0 -0 - - -106 -12718 -0 -18400 -0 -0 - - -107 -12723 -1 -27500 -0 -0 - - -108 -12735 -0 -8800 -0 -0 - - - - - - - - - -1 -2245 - S 02 -2 -1 -0 -0 -0 -0 -0 -1 - - -2 -2385 - S 03 -2 -1 -0 -0 -0 -0 -0 -1 - - -3 -2525 - S 04 -2 -1 -0 -0 -0 -0 -0 -1 - - -4 -2665 - S 05 -2 -1 -0 -0 -0 -0 -0 -1 - - -5 -2805 - S 06 -2 -1 -0 -0 -0 -0 -0 -1 - - -6 -3085 - S 08 -2 -1 -0 -0 -0 -0 -0 -1 - - -7 -3225 - S 09 -2 -1 -0 -0 -0 -0 -0 -1 - - -8 -3365 - S 10 -2 -1 -0 -0 -0 -0 -0 -1 - - -9 -3505 - C 05 -2 -1 -0 -0 -0 -0 -0 -0 - - -10 -3645 - C 06 -2 -1 -0 -0 -0 -0 -0 -0 - - -11 -3785 - C 07 -2 -1 -0 -0 -0 -0 -0 -0 - - -12 -3925 - C 08 -2 -1 -0 -0 -0 -0 -0 -0 - - -13 -4065 - C 09 -2 -1 -0 -0 -0 -0 -0 -0 - - - - -1 -0 -1 -230 -10 -25 -33 -3 -1 -452497381 -306000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -545652204844 -6 -TVR HD -6 -0 -0 -0 - - -2 -0 -1 -230 -10 -143 -33 -3 -1 -452497381 -306000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -444947492053706f72742031204844 -15 -DIGI Sport 1 HD -15 -0 -0 -0 - - -3 -0 -1 -230 -10 -275 -33 -3 -1 -452497381 -306000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -4e61742047656f204844 -10 -Nat Geo HD -10 -0 -0 -0 - - -4 -0 -1 -201 -10 -30 -34 -3 -1 -452562917 -314000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -50524f205456 -6 -PRO TV -6 -0 -0 -0 - - -5 -0 -1 -201 -10 -110 -34 -3 -1 -452562917 -314000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -5245414c495441544541205456 -13 -REALITATEA TV -13 -0 -0 -0 - - -6 -0 -1 -201 -10 -200 -34 -3 -1 -452562917 -314000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -41636173615456 -7 -AcasaTV -7 -0 -0 -0 - - -7 -0 -1 -201 -10 -330 -34 -3 -1 -452562917 -314000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -4e617447656f2057696c64 -11 -NatGeo Wild -11 -0 -0 -0 - - -8 -0 -1 -201 -10 -340 -34 -3 -1 -452562917 -314000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -50726f43696e656d61 -9 -ProCinema -9 -0 -0 -0 - - -9 -0 -1 -201 -10 -420 -34 -3 -1 -452562917 -314000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -4d545620526f6d616e6961 -11 -MTV Romania -11 -0 -0 -0 - - -10 -0 -1 -201 -10 -500 -34 -3 -1 -452562917 -314000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -5461726166205456 -8 -Taraf TV -8 -0 -0 -0 - - -11 -0 -1 -201 -10 -515 -34 -3 -1 -452562917 -314000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -4449474920323420437261696f7661 -15 -DIGI 24 Craiova -15 -0 -0 -0 - - -12 -0 -1 -201 -10 -530 -34 -3 -1 -452562917 -314000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -4d6f6e6579204368616e6e656c -13 -Money Channel -13 -0 -0 -0 - - -13 -0 -1 -202 -10 -80 -35 -3 -1 -452431845 -322000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -4e6174696f6e616c205456 -11 -National TV -11 -0 -0 -0 - - -14 -0 -1 -202 -10 -130 -35 -3 -1 -452431845 -322000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -545652204e657773 -8 -TVR News -8 -0 -0 -0 - - -15 -0 -1 -202 -10 -190 -35 -3 -1 -452431845 -322000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -4575726f73706f72742032 -11 -Eurosport 2 -11 -0 -0 -0 - - -16 -0 -1 -202 -10 -260 -35 -3 -1 -452431845 -322000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -486973746f7279204368616e6e656c -15 -History Channel -15 -0 -0 -0 - - -17 -0 -1 -202 -10 -410 -35 -3 -1 -452431845 -322000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -4469736e6579204368616e6e656c -14 -Disney Channel -14 -0 -0 -0 - - -18 -0 -1 -202 -10 -450 -35 -3 -1 -452431845 -322000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -484954204d55534943 -9 -HIT MUSIC -9 -0 -0 -0 - - -19 -0 -1 -202 -10 -480 -35 -3 -1 -452431845 -322000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -4661766f726974205456 -10 -Favorit TV -10 -0 -0 -0 - - -20 -0 -1 -202 -10 -490 -35 -3 -1 -452431845 -322000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -45746e6f -4 -Etno -4 -0 -0 -0 - - -21 -0 -1 -202 -10 -525 -35 -3 -1 -452431845 -322000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -54564820322e30 -7 -TVH 2.0 -7 -0 -0 -0 - - -22 -0 -1 -202 -10 -600 -35 -3 -1 -452431845 -322000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -5472696e69746173 -8 -Trinitas -8 -0 -0 -0 - - -23 -0 -1 -232 -10 -210 -36 -3 -1 -452571109 -330000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -46696c6d2043616665 -9 -Film Cafe -9 -0 -0 -0 - - -24 -0 -1 -232 -10 -343 -36 -3 -1 -452571109 -330000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -4469676946494c4d204844 -11 -DigiFILM HD -11 -0 -0 -0 - - -25 -0 -1 -232 -10 -370 -36 -3 -1 -452571109 -330000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -41584e205768697465 -9 -AXN White -9 -0 -0 -0 - - -26 -0 -1 -232 -10 -380 -36 -3 -1 -452571109 -330000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -4e69636b656c6f64656f6e -11 -Nickelodeon -11 -0 -0 -0 - - -27 -0 -1 -232 -10 -460 -36 -3 -1 -452571109 -330000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -4d455a5a4f -5 -MEZZO -5 -0 -0 -0 - - -28 -0 -1 -232 -10 -609 -36 -3 -1 -452571109 -330000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -434e4e -3 -CNN -3 -0 -0 -0 - - -29 -0 -1 -232 -10 -643 -36 -3 -1 -452571109 -330000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -53757065724f4e45204844 -11 -SuperONE HD -11 -0 -0 -0 - - -30 -0 -1 -232 -10 -652 -36 -3 -1 -452571109 -330000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -48424f204844 -6 -HBO HD -6 -0 -0 -0 - - -31 -0 -1 -231 -10 -32 -37 -3 -1 -452505573 -338000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -50524f205456204844 -9 -PRO TV HD -9 -0 -0 -0 - - -32 -0 -1 -231 -10 -162 -37 -3 -1 -452505573 -338000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -53706f72742e726f204844 -11 -Sport.ro HD -11 -0 -0 -0 - - -33 -0 -1 -231 -10 -205 -37 -3 -1 -452505573 -338000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -41636173615456204844 -10 -AcasaTV HD -10 -0 -0 -0 - - -34 -0 -1 -231 -10 -331 -37 -3 -1 -452505573 -338000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -4e61742047656f2057696c64204844 -15 -Nat Geo Wild HD -15 -0 -0 -0 - - -35 -0 -1 -231 -10 -518 -37 -3 -1 -452505573 -338000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -4e6173756c205456 -8 -Nasul TV -8 -0 -0 -0 - - -36 -0 -1 -231 -10 -526 -37 -3 -1 -452505573 -338000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -496e65646974205456 -9 -Inedit TV -9 -0 -0 -0 - - -37 -0 -1 -211 -10 -281 -38 -3 -1 -452431845 -346000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -4449474920574f524c44204844 -13 -DIGI WORLD HD -13 -0 -0 -0 - - -38 -0 -1 -211 -10 -291 -38 -3 -1 -452431845 -346000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -44494749204c696665204844 -12 -DIGI Life HD -12 -0 -0 -0 - - -39 -0 -1 -211 -10 -311 -38 -3 -1 -452431845 -346000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -4449474920414e494d414c20574f524c44204844 -20 -DIGI ANIMAL WORLD HD -20 -0 -0 -0 - - -40 -0 -1 -211 -10 -327 -38 -3 -1 -452431845 -346000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -42424320456e7465727461696e6d656e7420 -18 -BBC Entertainment -18 -0 -0 -0 - - -41 -0 -1 -101 -10 -90 -39 -3 -1 -452497381 -354000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -44494749203234204844 -10 -DIGI 24 HD -10 -0 -0 -0 - - -42 -0 -1 -101 -10 -215 -39 -3 -1 -452497381 -354000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -4163617361545620476f6c64 -12 -AcasaTV Gold -12 -0 -0 -0 - - -43 -0 -1 -101 -10 -280 -39 -3 -1 -452497381 -354000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -4449474920574f524c44 -10 -DIGI WORLD -10 -0 -0 -0 - - -44 -0 -1 -101 -10 -350 -39 -3 -1 -452497381 -354000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -4469766120556e6976657273616c -14 -Diva Universal -14 -0 -0 -0 - - -45 -0 -1 -101 -10 -360 -39 -3 -1 -452497381 -354000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -41584e -3 -AXN -3 -0 -0 -0 - - -46 -0 -1 -101 -10 -390 -39 -3 -1 -452497381 -354000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -4d696e696d6178 -7 -Minimax -7 -0 -0 -0 - - -47 -0 -1 -101 -10 -412 -39 -3 -1 -452497381 -354000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -4469736e6579204a52 -9 -Disney JR -9 -0 -0 -0 - - -48 -0 -1 -101 -10 -430 -39 -3 -1 -452497381 -354000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -555456 -3 -UTV -3 -0 -0 -0 - - -49 -0 -1 -101 -10 -470 -39 -3 -1 -452497381 -354000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -4d75736963204368616e6e656c20526f -16 -Music Channel Ro -16 -0 -0 -0 - - -50 -0 -1 -102 -10 -60 -40 -3 -1 -452497381 -362000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -5052494d41205456 -8 -PRIMA TV -8 -0 -0 -0 - - -51 -0 -1 -102 -10 -70 -40 -3 -1 -452497381 -362000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -4231 -2 -B1 -2 -0 -0 -0 - - -52 -0 -1 -102 -10 -100 -40 -3 -1 -452497381 -362000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -44494749203234 -7 -DIGI 24 -7 -0 -0 -0 - - -53 -0 -1 -102 -10 -150 -40 -3 -1 -452497381 -362000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -444947492053706f72742032 -12 -DIGI Sport 2 -12 -0 -0 -0 - - -54 -0 -1 -102 -10 -270 -40 -3 -1 -452497381 -362000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -4e61742047656f -7 -Nat Geo -7 -0 -0 -0 - - -55 -0 -1 -102 -10 -290 -40 -3 -1 -452497381 -362000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -44494749204c696665 -9 -DIGI Life -9 -0 -0 -0 - - -56 -0 -1 -102 -10 -418 -40 -3 -1 -452497381 -362000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -4d6567616d6178202f2053706f727431 -16 -Megamax / Sport1 -16 -0 -0 -0 - - -57 -0 -1 -102 -10 -440 -40 -3 -1 -452497381 -362000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -4b495353205456 -7 -KISS TV -7 -0 -0 -0 - - -58 -0 -1 -103 -10 -10 -41 -3 -1 -452497381 -370000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -5456522031 -5 -TVR 1 -5 -0 -0 -0 - - -59 -0 -1 -103 -10 -20 -41 -3 -1 -452497381 -370000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -5456522032 -5 -TVR 2 -5 -0 -0 -0 - - -60 -0 -1 -103 -10 -170 -41 -3 -1 -452497381 -370000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -446967692053706f72742033 -12 -Digi Sport 3 -12 -0 -0 -0 - - -61 -0 -1 -103 -10 -230 -41 -3 -1 -452497381 -370000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -545650617072696b61 -9 -TVPaprika -9 -0 -0 -0 - - -62 -0 -1 -103 -10 -300 -41 -3 -1 -452497381 -370000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -566961736174204e6174757265 -13 -Viasat Nature -13 -0 -0 -0 - - -63 -0 -1 -103 -10 -310 -41 -3 -1 -452497381 -370000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -4449474920414e494d414c20574f524c44 -17 -DIGI ANIMAL WORLD -17 -0 -0 -0 - - -64 -0 -1 -103 -10 -320 -41 -3 -1 -452497381 -370000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -54726176656c -6 -Travel -6 -0 -0 -0 - - -65 -0 -1 -103 -10 -512 -41 -3 -1 -452497381 -370000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -44494749203234204f7261646561 -14 -DIGI 24 Oradea -14 -0 -0 -0 - - -66 -0 -1 -103 -10 -514 -41 -3 -1 -452497381 -370000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -444947492032342054696d69736f617261 -17 -DIGI 24 Timisoara -17 -0 -0 -0 - - -67 -0 -1 -251 -10 -342 -42 -3 -1 -452497381 -378000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -4469676946494c4d -8 -DigiFILM -8 -0 -0 -0 - - -68 -0 -1 -251 -10 -607 -42 -3 -1 -452497381 -378000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -50565456 -4 -PVTV -4 -0 -0 -0 - - -69 -0 -1 -251 -10 -610 -42 -3 -1 -452497381 -378000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -545635204d4f4e4445 -9 -TV5 MONDE -9 -0 -0 -0 - - -70 -0 -1 -251 -10 -620 -42 -3 -1 -452497381 -378000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -058652544c872054656c65766973696f6e -17 - -17 -0 -0 -0 - - -71 -0 -1 -251 -10 -640 -42 -3 -1 -452497381 -378000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -0553757065724f4e45 -9 - -9 -0 -0 -0 - - -72 -0 -1 -251 -10 -650 -42 -3 -1 -452497381 -378000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -48424f20526f6d616e6961 -11 -HBO Romania -11 -0 -0 -0 - - -73 -0 -1 -251 -10 -660 -42 -3 -1 -452497381 -378000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -48424f20436f6d656479 -10 -HBO Comedy -10 -0 -0 -0 - - -74 -0 -1 -251 -10 -670 -42 -3 -1 -452497381 -378000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -43696e656d6178 -7 -Cinemax -7 -0 -0 -0 - - -75 -0 -1 -104 -10 -333 -43 -3 -1 -452497381 -386000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -566961736174204578706c6f726572 -15 -Viasat Explorer -15 -0 -0 -0 - - -76 -0 -1 -104 -10 -335 -43 -3 -1 -452497381 -386000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -56696173617420486973746f7279 -14 -Viasat History -14 -0 -0 -0 - - -77 -0 -1 -104 -10 -355 -43 -3 -1 -452497381 -386000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -545631303030 -6 -TV1000 -6 -0 -0 -0 - - -78 -0 -1 -104 -10 -357 -43 -3 -1 -452497381 -386000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -556e6976657273616c204368616e6e656c -17 -Universal Channel -17 -0 -0 -0 - - -79 -0 -1 -104 -10 -415 -43 -3 -1 -452497381 -386000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -426f6f6d6572616e67 -9 -Boomerang -9 -0 -0 -0 - - -80 -0 -1 -104 -10 -516 -43 -3 -1 -452497381 -386000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -4449474920323420427261736f76 -14 -DIGI 24 Brasov -14 -0 -0 -0 - - -81 -0 -1 -104 -10 -533 -43 -3 -1 -452497381 -386000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -5456522033 -5 -TVR 3 -5 -0 -0 -0 - - -82 -0 -1 -104 -10 -606 -43 -3 -1 -452497381 -386000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -46697368696e6720616e642048756e74696e67 -19 -Fishing and Hunting -19 -0 -0 -0 - - -83 -0 -1 -104 -10 -629 -43 -3 -1 -452497381 -386000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -42424320576f726c64204e657773 -14 -BBC World News -14 -0 -0 -0 - - -84 -0 -1 -104 -10 -632 -43 -3 -1 -452497381 -386000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -5a55205456 -5 -ZU TV -5 -0 -0 -0 - - -85 -0 -1 -206 -10 -125 -44 -3 -1 -452497381 -394000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -526f6d616e69615456 -9 -RomaniaTV -9 -0 -0 -0 - - -86 -0 -1 -206 -10 -324 -44 -3 -1 -452497381 -394000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -424243204b6e6f776c65646765 -13 -BBC Knowledge -13 -0 -0 -0 - - -87 -0 -1 -206 -10 -417 -44 -3 -1 -452497381 -394000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -4475636b205456 -7 -Duck TV -7 -0 -0 -0 - - -88 -0 -1 -206 -10 -495 -44 -3 -1 -452497381 -394000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -486f7261205456 -7 -Hora TV -7 -0 -0 -0 - - -89 -0 -1 -206 -10 -501 -44 -3 -1 -452497381 -394000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -4147524f205456 -7 -AGRO TV -7 -0 -0 -0 - - -90 -0 -1 -206 -10 -505 -44 -3 -1 -452497381 -394000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -4469676920323420436c756a -12 -Digi 24 Cluj -12 -0 -0 -0 - - -91 -0 -1 -206 -10 -511 -44 -3 -1 -452497381 -394000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -5456204e657074756e -9 -TV Neptun -9 -0 -0 -0 - - -92 -0 -1 -206 -10 -537 -44 -3 -1 -452497381 -394000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -4e6174696f6e616c20323420506c7573 -16 -National 24 Plus -16 -0 -0 -0 - - -93 -0 -1 -206 -10 -602 -44 -3 -1 -452497381 -394000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -53706572616e74615456 -10 -SperantaTV -10 -0 -0 -0 - - -94 -0 -1 -206 -10 -615 -44 -3 -1 -452497381 -394000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -5261692031 -5 -Rai 1 -5 -0 -0 -0 - - -95 -0 -1 -207 -10 -371 -45 -3 -1 -452431845 -402000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -41584e20426c61636b -9 -AXN Black -9 -0 -0 -0 - - -96 -0 -1 -207 -10 -374 -45 -3 -1 -452431845 -402000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -436f6d6564792043656e7472616c204578747261 -20 -Comedy Central Extra -20 -0 -0 -0 - - -97 -0 -1 -207 -10 -435 -45 -3 -1 -452431845 -402000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -555456204844 -6 -UTV HD -6 -0 -0 -0 - - -98 -0 -1 -207 -10 -455 -45 -3 -1 -452431845 -402000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -56483120526f6d616e6961 -11 -VH1 Romania -11 -0 -0 -0 - - -99 -0 -1 -207 -10 -563 -45 -3 -1 -452431845 -402000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -4d32 -2 -M2 -2 -0 -0 -0 - - -100 -0 -1 -207 -10 -595 -45 -3 -1 -452431845 -402000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -4d616779617220415456 -10 -Magyar ATV -10 -0 -0 -0 - - -101 -0 -1 -207 -10 -634 -45 -3 -1 -452431845 -402000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -46617368696f6e205456 -10 -Fashion TV -10 -0 -0 -0 - - -102 -0 -1 -207 -10 -635 -45 -3 -1 -452431845 -402000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -53555045522052544c -9 -SUPER RTL -9 -0 -0 -0 - - -103 -0 -1 -207 -10 -638 -45 -3 -1 -452431845 -402000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -0543435456204e657773 -10 - -10 -0 -0 -0 - - -104 -0 -1 -209 -10 -750 -48 -3 -1 -452497381 -426000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -36205456 -4 -6 TV -4 -0 -0 -0 - - -105 -0 -1 -209 -10 -751 -48 -3 -1 -452497381 -426000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -54562043697479 -7 -TV City -7 -0 -0 -0 - - -106 -0 -1 -209 -10 -752 -48 -3 -1 -452497381 -426000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -65537472616461205456 -10 -eStrada TV -10 -0 -0 -0 - - -107 -0 -1 -212 -10 -181 -49 -3 -1 -452505573 -434000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -4575726f73706f7274204844 -12 -Eurosport HD -12 -0 -0 -0 - - -108 -0 -1 -212 -10 -191 -49 -3 -1 -452505573 -434000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -4575726f73706f72742032204844 -14 -Eurosport 2 HD -14 -0 -0 -0 - - -109 -0 -1 -212 -10 -262 -49 -3 -1 -452505573 -434000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -486973746f7279204844 -10 -History HD -10 -0 -0 -0 - - -110 -0 -1 -212 -10 -301 -49 -3 -1 -452505573 -434000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -05566961736174204e61747572652f486973746f7279204844 -25 - -25 -0 -0 -0 - - -111 -0 -1 -212 -10 -321 -49 -3 -1 -452505573 -434000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -54726176656c204368616e6e656c204844 -17 -Travel Channel HD -17 -0 -0 -0 - - -112 -0 -1 -233 -10 -153 -52 -3 -1 -452562917 -458000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -444947492053706f72742032204844 -15 -DIGI Sport 2 HD -15 -0 -0 -0 - - -113 -0 -1 -233 -10 -235 -52 -3 -1 -452562917 -458000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -4c6f6f6b205456 -7 -Look TV -7 -0 -0 -0 - - -114 -0 -1 -233 -10 -240 -52 -3 -1 -452562917 -458000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -5472616e73696c76616e6961204c495645 -17 -Transilvania LIVE -17 -0 -0 -0 - - -115 -0 -1 -233 -10 -241 -52 -3 -1 -452562917 -458000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -416e74656e61205374617273 -12 -Antena Stars -12 -0 -0 -0 - - -116 -0 -1 -233 -10 -503 -52 -3 -1 -452562917 -458000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -4449474920323420436f6e7374616e7461 -17 -DIGI 24 Constanta -17 -0 -0 -0 - - -117 -0 -1 -233 -10 -507 -52 -3 -1 -452562917 -458000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -444947492032342049617369 -12 -DIGI 24 Iasi -12 -0 -0 -0 - - -118 -0 -1 -203 -10 -140 -53 -3 -1 -452497381 -466000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -446967692053706f72742031 -12 -Digi Sport 1 -12 -0 -0 -0 - - -119 -0 -1 -203 -10 -336 -53 -3 -1 -452497381 -466000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -54726176656c204d6978 -10 -Travel Mix -10 -0 -0 -0 - - -120 -0 -1 -203 -10 -400 -53 -3 -1 -452497381 -466000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -436172746f6f6e204e6574776f726b -15 -Cartoon Network -15 -0 -0 -0 - - -121 -0 -1 -203 -10 -617 -53 -3 -1 -452497381 -466000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -5261692033 -5 -Rai 3 -5 -0 -0 -0 - - -122 -0 -1 -203 -10 -622 -53 -3 -1 -452497381 -466000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -50726f53696562656e -9 -ProSieben -9 -0 -0 -0 - - -123 -0 -1 -204 -10 -40 -54 -3 -1 -452366309 -474000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -416e74656e612031 -8 -Antena 1 -8 -0 -0 -0 - - -124 -0 -1 -204 -10 -50 -54 -3 -1 -452366309 -474000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -4b616e616c2044 -7 -Kanal D -7 -0 -0 -0 - - -125 -0 -1 -204 -10 -120 -54 -3 -1 -452366309 -474000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -416e74656e612033 -8 -Antena 3 -8 -0 -0 -0 - - -126 -0 -1 -204 -10 -160 -54 -3 -1 -452366309 -474000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -53706f72742e726f -8 -Sport.ro -8 -0 -0 -0 - - -127 -0 -1 -204 -10 -180 -54 -3 -1 -452366309 -474000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -4575726f73706f7274 -9 -Eurosport -9 -0 -0 -0 - - -128 -0 -1 -204 -10 -220 -54 -3 -1 -452366309 -474000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -4575666f726961204c6966657374796c65 -17 -Euforia Lifestyle -17 -0 -0 -0 - - -129 -0 -1 -204 -10 -540 -54 -3 -1 -452366309 -474000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -44756e61 -4 -Duna -4 -0 -0 -0 - - -130 -0 -1 -204 -10 -598 -54 -3 -1 -452366309 -474000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -4e6f7461205456 -7 -Nota TV -7 -0 -0 -0 - - -16385 -0 -1 -201 -10 -2499 -34 -3 -2 -452562917 -314000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -4b69737320464d -7 -Kiss FM -7 -0 -0 -0 - - -16386 -0 -1 -201 -10 -2502 -34 -3 -2 -452562917 -314000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -526164696f203231 -8 -Radio 21 -8 -0 -0 -0 - - -16387 -0 -1 -102 -10 -2500 -40 -3 -2 -452497381 -362000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -4575726f706120464d -9 -Europa FM -9 -0 -0 -0 - - -16388 -0 -1 -251 -10 -2505 -42 -3 -2 -452497381 -378000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -526164696f205a55 -8 -Radio ZU -8 -0 -0 -0 - - -16389 -0 -1 -251 -10 -2510 -42 -3 -2 -452497381 -378000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -526164696f204d6172696120524f -14 -Radio Maria RO -14 -0 -0 -0 - - -16390 -0 -1 -251 -10 -2515 -42 -3 -2 -452497381 -378000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -53706f727420546f74616c -11 -Sport Total -11 -0 -0 -0 - - -16391 -0 -1 -206 -10 -2512 -44 -3 -2 -452497381 -394000 -28 -1 -0 -0 -0 -0 -0 -0 -0 -0 -50726f20464d -6 -Pro FM -6 -0 -0 -0 - - - - - - -0 -off -100 -0 -normal -normal -on -on -on -on -off -off -off -on -on -on -on -on -on -on -on -on -on -on -1 -1 -stand_by -off -off -off -Auto -off -off -off -off -1105 -off - - - diff --git a/source/ChanSort.Loader.GlobalClone/Properties/AssemblyInfo.cs b/source/ChanSort.Loader.GlobalClone/Properties/AssemblyInfo.cs deleted file mode 100644 index 6d5234e..0000000 --- a/source/ChanSort.Loader.GlobalClone/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -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("ChanSort.Loader.GlobalClone")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("ChanSort.Loader.GlobalClone")] -[assembly: AssemblyCopyright("Copyright © 2014")] -[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("7c411d93-c493-49e0-af8a-520d759af994")] - -// 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/source/ChanSort.Loader.GlobalClone/Resources.Designer.cs b/source/ChanSort.Loader.GlobalClone/Resources.Designer.cs deleted file mode 100644 index 87fd294..0000000 --- a/source/ChanSort.Loader.GlobalClone/Resources.Designer.cs +++ /dev/null @@ -1,108 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace ChanSort.Loader.GlobalClone { - using System; - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ChanSort.Loader.GlobalClone.Resources", typeof(Resources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - - /// - /// Looks up a localized string similar to LG predefined / empty channel list. - /// - internal static string GcSerializer_ReadChannelLists_NoChannelsCap { - get { - return ResourceManager.GetString("GcSerializer_ReadChannelLists_NoChannelsCap", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to This channel list does not contain any channels. - ///Most likely a predefined channel list was selected during the TV's setup, which cannot be edited and exports an empty list. - /// - ///Please run a new channel search on the TV and when asked for a Provider, select a neutral option (none, other, ...). - ///When possible, select Blind Scan and unselect Network Search to scan the whole frequency range. - ///. - /// - internal static string GcSerializer_ReadChannelLists_NoChannelsMsg { - get { - return ResourceManager.GetString("GcSerializer_ReadChannelLists_NoChannelsMsg", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Your TV will only import the GlobalClone file when there are no files named xx*.TLL in the same directory. - ///Do you want ChanSort to rename the conflicting files?. - /// - internal static string GcSerializer_ReadModelInfo_ModelWarning { - get { - return ResourceManager.GetString("GcSerializer_ReadModelInfo_ModelWarning", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to ATTENTION: - ///Please make sure that your webOS based TV is using a recent firmware version (LB600 and higher: 4.41.32, UB: 4.51.44). - ///Older LG firmware for webOS based TV models does not handle the import of channel lists properly and randomly reorders channels. - ///(If your firmware is newer, you can ignore is message.). - /// - internal static string GcSerializer_webOsFirmwareWarning { - get { - return ResourceManager.GetString("GcSerializer_webOsFirmwareWarning", resourceCulture); - } - } - } -} diff --git a/source/ChanSort.Loader.GlobalClone/Resources.cs.resx b/source/ChanSort.Loader.GlobalClone/Resources.cs.resx deleted file mode 100644 index ae5757b..0000000 --- a/source/ChanSort.Loader.GlobalClone/Resources.cs.resx +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Váš televizor bude schopen importovat soubor GlobalClone pouze v případě, že se ve stejném adresáři nenachází žádné soubory s názvem xx*.TLL. -Chcete, aby ChanSort konfliktní soubory přejmenoval? - - - POZOR: -Zkontrolujte, zda váš televizor se systémem webOS používá nejnovější verzi firmwaru (LB600 a vyšší: 4.41.32, UB: 4.51.44). -Starší verze firmwaru LG pro modely televizorů se systémem webOS nedokáže správně importovat seznam kanálů a náhodně mění pořadí kanálů. - - \ No newline at end of file diff --git a/source/ChanSort.Loader.GlobalClone/Resources.de.Designer.cs b/source/ChanSort.Loader.GlobalClone/Resources.de.Designer.cs deleted file mode 100644 index e69de29..0000000 diff --git a/source/ChanSort.Loader.GlobalClone/Resources.de.resx b/source/ChanSort.Loader.GlobalClone/Resources.de.resx deleted file mode 100644 index e86ff74..0000000 --- a/source/ChanSort.Loader.GlobalClone/Resources.de.resx +++ /dev/null @@ -1,130 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Ihr TV Gerät importiert die GlobalClone Datei nur dann, wenn keine Dateien mit Namen xx*.TLL auf dem USB-Stick sind. -Soll ChanSort die störenden Dateien jetzt umbenennen? - - - HINWEIS: -Bitte stellen Sie sicher, dass auf Ihrem webOS basierenden Gerät eine aktuelle Firmware installiert ist (LB600 und höher: 4.41.32, UB: 4.51.44). -Ältere Versionen können Senderlisten nicht korrekt einlesen und verändern diese willkürlich im laufenden Betrieb. -(Sie können diese Meldung ignorieren, wenn Ihre Firmwareversion aktueller ist.) - - \ No newline at end of file diff --git a/source/ChanSort.Loader.GlobalClone/Resources.es.resx b/source/ChanSort.Loader.GlobalClone/Resources.es.resx deleted file mode 100644 index fea0be3..0000000 --- a/source/ChanSort.Loader.GlobalClone/Resources.es.resx +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Su TV solo es capaz de importar el archivo GlobalClone si en la carpeta solo existe un único archivo TLL. ¿Desea que ChanSort renombre los archivos conflictivos? - - - Por favor asegúrese que su TV basada en webOS esté usando una versión de firmware reciente (LB600 y superior: 4.41.32, UB: 4.51.44). -Los viejos firmwares de los modelos de TV basados en webOS no importan bien las listas de canales y reordenan los canales aleatoriamente. -(Si su firmware es reciente, puede ignorar este mensaje.) - - \ No newline at end of file diff --git a/source/ChanSort.Loader.GlobalClone/Resources.hu.resx b/source/ChanSort.Loader.GlobalClone/Resources.hu.resx deleted file mode 100644 index 2cacb01..0000000 --- a/source/ChanSort.Loader.GlobalClone/Resources.hu.resx +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - A tévé csak akkor importálja a GlobalClone fájlt, ha ugyanabban a könyvtárban nincsenek xx*.TLL nevű fájlok. -Szeretné, hogy a ChanSort átnevezze a problémás fájlokat? - - - FIGYELEM: -Győződjön meg arról, hogy webOS alapú tévéje legújabb firmware verziót használ (LB600 és újabb: 4.41.32, UB: 4.51.44). -A régebbi LG firmware webOS alapú TV-modelleknél nem kezeli megfelelően a csatornák listájának importálását és véletlenszerűen rendezi át a csatornákat - - \ No newline at end of file diff --git a/source/ChanSort.Loader.GlobalClone/Resources.pl.resx b/source/ChanSort.Loader.GlobalClone/Resources.pl.resx deleted file mode 100644 index 76c712c..0000000 --- a/source/ChanSort.Loader.GlobalClone/Resources.pl.resx +++ /dev/null @@ -1,130 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Telewizor zaimportuje plik GlobalClone tylko wtedy, gdy w tym samym katalogu nie ma plików o nazwie xx* .TLL. -Czy chcesz, aby ChanSort zmienił nazwę plików powodujących konflikt? - - - UWAGA: -Upewnij się, że telewizor z systemem webOS korzysta z najnowszej wersji oprogramowania układowego (LB600 i nowsze: 4.41.32, UB: 4.51.44). -Starsze oprogramowanie LG dla modeli telewizorów opartych na webOS nie obsługuje importu list kanałów i losowo zmienia kolejność kanałów. -(Jeśli oprogramowanie układowe jest nowsze, możesz zignorować wiadomość.) - - \ No newline at end of file diff --git a/source/ChanSort.Loader.GlobalClone/Resources.pt.resx b/source/ChanSort.Loader.GlobalClone/Resources.pt.resx deleted file mode 100644 index d58980a..0000000 --- a/source/ChanSort.Loader.GlobalClone/Resources.pt.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/source/ChanSort.Loader.GlobalClone/Resources.resx b/source/ChanSort.Loader.GlobalClone/Resources.resx deleted file mode 100644 index 95bc44c..0000000 --- a/source/ChanSort.Loader.GlobalClone/Resources.resx +++ /dev/null @@ -1,121 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 1.3 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Your TV will only import the GlobalClone file when there are no files named xx*.TLL in the same directory. -Do you want ChanSort to rename the conflicting files? - - - ATTENTION: -Please make sure that your webOS based TV is using a recent firmware version (LB600 and higher: 4.41.32, UB: 4.51.44). -Older LG firmware for webOS based TV models does not handle the import of channel lists properly and randomly reorders channels. -(If your firmware is newer, you can ignore is message.) - - - LG predefined / empty channel list - - - This channel list does not contain any channels. -Most likely a predefined channel list was selected during the TV's setup, which cannot be edited and exports an empty list. - -Please run a new channel search on the TV and when asked for a Provider, select a neutral option (none, other, ...). -When possible, select Blind Scan and unselect Network Search to scan the whole frequency range. - - - \ No newline at end of file diff --git a/source/ChanSort.Loader.GlobalClone/Resources.ro.resx b/source/ChanSort.Loader.GlobalClone/Resources.ro.resx deleted file mode 100644 index 1bf518f..0000000 --- a/source/ChanSort.Loader.GlobalClone/Resources.ro.resx +++ /dev/null @@ -1,130 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Televizorul dvs. va importa numai fișierul GlobalClone atunci când nu există fișiere numite xx * .TLL în același director. -Vrei ca ChanSort să redenumească fișierele în conflict? - - - ATENŢIE: -Asigurați-vă că televizorul bazat pe webOS utilizează o versiune recentă de firmware (LB600 și mai mare: 4.41.32, UB: 4.51.44). -Firmware-ul LG mai vechi pentru modelele TV bazate pe webOS nu gestionează importul listelor de canale în mod corespunzător și redirecționează aleatoriu canalele. -(Dacă firmware-ul este mai nou, puteți ignora mesajul.) - - \ No newline at end of file diff --git a/source/ChanSort.Loader.GlobalClone/Resources.ru.resx b/source/ChanSort.Loader.GlobalClone/Resources.ru.resx deleted file mode 100644 index d58980a..0000000 --- a/source/ChanSort.Loader.GlobalClone/Resources.ru.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/source/ChanSort.Loader.GlobalClone/Resources.tr.resx b/source/ChanSort.Loader.GlobalClone/Resources.tr.resx deleted file mode 100644 index d7ec548..0000000 --- a/source/ChanSort.Loader.GlobalClone/Resources.tr.resx +++ /dev/null @@ -1,130 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - TV'niz yalnızca aynı dizinde xx * .TLL adında dosya olmadığında GlobalClone dosyasını içe aktarır. -ChanSort'un çakışan dosyaları yeniden adlandırmasını istiyor musunuz? - - - DİKKAT: -Lütfen webOS tabanlı TV'nizin aşağıdaki ürün yazılım sürümünü kullandığından emin olun (LB600 ve üstü: 4.41.32, UB: 4.51.44). -WebOS tabanlı TV modelleri için eski LG ürün yazılımı, kanal listelerinin içe aktarılmasını düzgün bir şekilde gerçekleştirmez ve kanalları yeniden sıralar. -(Ürün yazılımınız daha yeniyse, mesajı görmezden gelebilirsiniz.) - - \ No newline at end of file diff --git a/source/ChanSort.Loader.GlobalClone/readme.txt b/source/ChanSort.Loader.GlobalClone/readme.txt deleted file mode 100644 index e1d29ae..0000000 --- a/source/ChanSort.Loader.GlobalClone/readme.txt +++ /dev/null @@ -1,13 +0,0 @@ -This module allows loading of LG's GlobalClone*.TLL files. -There seem to be different versions of this XML file format, depending on Series, Model and/or firmware version. - -2013 LA-Series, 2014 LB55xx and LB56xx: - is binary data inside an UTF8 envelope. Once decoded, this data is correct. -Some higher numbered models seem to exclusively support the GlobalClone and no longer have a binary TLL file, -while lower numbered models export both files and can only load the binary file. - is not included in these models - -2014 LB6xxx and higher: - is a readable text, but sometimes left empty and misses all local characters - may be present, depending on firmware. It contains a hex-encoded DVB encoded channel name with correct data. - diff --git a/source/ChanSort.Loader.Grundig/ChanSort.Loader.Grundig.csproj b/source/ChanSort.Loader.Grundig/ChanSort.Loader.Grundig.csproj index b30266b..7a3e29f 100644 --- a/source/ChanSort.Loader.Grundig/ChanSort.Loader.Grundig.csproj +++ b/source/ChanSort.Loader.Grundig/ChanSort.Loader.Grundig.csproj @@ -64,7 +64,7 @@ - + diff --git a/source/ChanSort.Loader.Grundig/Channel.cs b/source/ChanSort.Loader.Grundig/Channel.cs index 1070608..146968d 100644 --- a/source/ChanSort.Loader.Grundig/Channel.cs +++ b/source/ChanSort.Loader.Grundig/Channel.cs @@ -6,9 +6,6 @@ namespace ChanSort.Loader.Grundig internal class Channel : ChannelInfo { public readonly XmlNode Node; - public string RawName; - public string RawSatellite; - public int Format; internal Channel(SignalSource source, int order, int rowId, XmlNode node) { diff --git a/source/ChanSort.Loader.Grundig/SerializerPlugin.cs b/source/ChanSort.Loader.Grundig/GrundigPlugin.cs similarity index 70% rename from source/ChanSort.Loader.Grundig/SerializerPlugin.cs rename to source/ChanSort.Loader.Grundig/GrundigPlugin.cs index cdc2f67..9aec73f 100644 --- a/source/ChanSort.Loader.Grundig/SerializerPlugin.cs +++ b/source/ChanSort.Loader.Grundig/GrundigPlugin.cs @@ -2,10 +2,10 @@ namespace ChanSort.Loader.Grundig { - public class SerializerPlugin : ISerializerPlugin + public class GrundigPlugin : ISerializerPlugin { public string DllName { get; set; } - public string PluginName => "Grundig dvb?_config.xml"; + public string PluginName => "Grundig (dvb*_config.xml)"; public string FileFilter => "*.xml"; public SerializerBase CreateSerializer(string inputFile) diff --git a/source/ChanSort.Loader.Grundig/Serializer.cs b/source/ChanSort.Loader.Grundig/Serializer.cs index b4b84ce..74c08a6 100644 --- a/source/ChanSort.Loader.Grundig/Serializer.cs +++ b/source/ChanSort.Loader.Grundig/Serializer.cs @@ -70,7 +70,7 @@ namespace ChanSort.Loader.Grundig this.LoadFile(fullPath); } if (this.fileDataList.Count == 0) - throw new FileLoadException("No XML files found in folder structure"); + throw new FileLoadException("No dvb*_config.xml files found in folder structure"); } #endregion diff --git a/source/ChanSort.Loader.Hisense/ChanSort.Loader.Hisense.csproj b/source/ChanSort.Loader.Hisense/ChanSort.Loader.Hisense.csproj index a050c33..de06a9e 100644 --- a/source/ChanSort.Loader.Hisense/ChanSort.Loader.Hisense.csproj +++ b/source/ChanSort.Loader.Hisense/ChanSort.Loader.Hisense.csproj @@ -73,15 +73,16 @@ - + - - + Resources.resx True True + + @@ -109,6 +110,7 @@ + - \ No newline at end of file diff --git a/source/ChanSort.Loader.Hisense2017/HisDbSerializerPlugin.cs b/source/ChanSort.Loader.Hisense2017/HisDbSerializerPlugin.cs deleted file mode 100644 index fee22de..0000000 --- a/source/ChanSort.Loader.Hisense2017/HisDbSerializerPlugin.cs +++ /dev/null @@ -1,16 +0,0 @@ -using ChanSort.Api; - -namespace ChanSort.Loader.Hisense2017 -{ - public class HisDbSerializerPlugin : ISerializerPlugin - { - public string DllName { get; set; } - public string PluginName => "Hisense servicelist.db"; - public string FileFilter => "*.db"; - - public SerializerBase CreateSerializer(string inputFile) - { - return new HisDbSerializer(inputFile); - } - } -} \ No newline at end of file diff --git a/source/ChanSort.Loader.Hisense2017/Properties/AssemblyInfo.cs b/source/ChanSort.Loader.Hisense2017/Properties/AssemblyInfo.cs deleted file mode 100644 index 8df14bb..0000000 --- a/source/ChanSort.Loader.Hisense2017/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -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("ChanSort.Loader.Hisense")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("ChanSort.Loader.Hisense")] -[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("d093e7ee-d3ad-4e7b-af82-c6918ca017fb")] - -// 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/source/ChanSort.Loader.Hisense2017/Resources.Designer.cs b/source/ChanSort.Loader.Hisense2017/Resources.Designer.cs deleted file mode 100644 index 94e73e3..0000000 --- a/source/ChanSort.Loader.Hisense2017/Resources.Designer.cs +++ /dev/null @@ -1,83 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace ChanSort.Loader.Hisense2017 { - using System; - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ChanSort.Loader.Hisense2017.Resources", typeof(Resources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - - /// - /// Looks up a localized string similar to No channels found. - /// - internal static string Load_NoChannelsCaption { - get { - return ResourceManager.GetString("Load_NoChannelsCaption", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to This channel list file does not contain any data. - ///Most likely a predefined channel list was selected during the TV's intial setup. Such lists do not get exported and cannot be edited on the TV or on your PC. - ///To get a list that can be edited on your PC you have to reset your TV to factory defaults and select the option 'Other' during the satellite channel setup.. - /// - internal static string Load_NoChannelsMsg { - get { - return ResourceManager.GetString("Load_NoChannelsMsg", resourceCulture); - } - } - } -} diff --git a/source/ChanSort.Loader.Hisense2017/Resources.cs.resx b/source/ChanSort.Loader.Hisense2017/Resources.cs.resx deleted file mode 100644 index d58980a..0000000 --- a/source/ChanSort.Loader.Hisense2017/Resources.cs.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/source/ChanSort.Loader.Hisense2017/Resources.de.resx b/source/ChanSort.Loader.Hisense2017/Resources.de.resx deleted file mode 100644 index f5aade9..0000000 --- a/source/ChanSort.Loader.Hisense2017/Resources.de.resx +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Diese Senderliste enthält keine Daten. -Vermutlich wurde bei der Ersteinrichtung des Geräte eine vordefinierte Liste gewählt. Solche Listen können nicht exportiert und weder am TV noch am PC bearbeitet werden. -Um eine bearbeitbare Liste zu erhalten, müssen Sie ihr Gerät auf Werkseinstellungen zurücksetzen und beim Sat-Suchlauf die Option 'Andere' auswählen. - - - Keine Sender gefunden - - \ No newline at end of file diff --git a/source/ChanSort.Loader.Hisense2017/Resources.es.resx b/source/ChanSort.Loader.Hisense2017/Resources.es.resx deleted file mode 100644 index c8de08e..0000000 --- a/source/ChanSort.Loader.Hisense2017/Resources.es.resx +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Esta lista de canales no contiene datos. -Lo más probable es que seleccionase una lista predefinida de canales durante los ajustes iniciales de su TV. Estas listas no pueden ser exportadas ni editadas en su TV o PC. -Para obtener una lista que pueda ser editada en su PC deberá reiniciar su TV a los valores de fábrica y seleccionar la opción 'Otros' durante los ajustes de canales de satélite. - - - No se han encontrado canales - - \ No newline at end of file diff --git a/source/ChanSort.Loader.Hisense2017/Resources.hu.resx b/source/ChanSort.Loader.Hisense2017/Resources.hu.resx deleted file mode 100644 index 05a2492..0000000 --- a/source/ChanSort.Loader.Hisense2017/Resources.hu.resx +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Ez a csatorna lista fájl nem tartalmaz adatokat. -Valószínűleg egy előre definiált csatorna lista lett kiválasztva a TV legelső beállításakor. Az ilyen listák nem kerülnek exportálásra és nem szerkeszthetők a TV-n vagy a számítógépen. -A PC-n szerkeszthető lista megszerzéséhez vissza kell állítania a TV-készüléket gyári alapállapotra és a műholdas csatorna beállítása során ki kell választania az „Egyéb” opciót. - - - Nem található csatorna - - \ No newline at end of file diff --git a/source/ChanSort.Loader.Hisense2017/Resources.pl.resx b/source/ChanSort.Loader.Hisense2017/Resources.pl.resx deleted file mode 100644 index 420cd36..0000000 --- a/source/ChanSort.Loader.Hisense2017/Resources.pl.resx +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Ten plik listy kanałów nie zawiera żadnych danych. -Najprawdopodobniej podczas wstępnej konfiguracji telewizora wybrano wstępnie zdefiniowaną listę kanałów. Takie listy nie są eksportowane i nie można ich edytować w telewizorze ani na komputerze. -Aby uzyskać listę, którą można edytować na komputerze, musisz zresetować telewizor do ustawień fabrycznych i wybrać opcję „Inne” podczas konfiguracji kanału satelitarnego. - - - Nie znaleziono kanałów - - \ No newline at end of file diff --git a/source/ChanSort.Loader.Hisense2017/Resources.pt.resx b/source/ChanSort.Loader.Hisense2017/Resources.pt.resx deleted file mode 100644 index d58980a..0000000 --- a/source/ChanSort.Loader.Hisense2017/Resources.pt.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/source/ChanSort.Loader.Hisense2017/Resources.resx b/source/ChanSort.Loader.Hisense2017/Resources.resx deleted file mode 100644 index 957e1f2..0000000 --- a/source/ChanSort.Loader.Hisense2017/Resources.resx +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - This channel list file does not contain any data. -Most likely a predefined channel list was selected during the TV's intial setup. Such lists do not get exported and cannot be edited on the TV or on your PC. -To get a list that can be edited on your PC you have to reset your TV to factory defaults and select the option 'Other' during the satellite channel setup. - - - No channels found - - \ No newline at end of file diff --git a/source/ChanSort.Loader.Hisense2017/Resources.ro.resx b/source/ChanSort.Loader.Hisense2017/Resources.ro.resx deleted file mode 100644 index e039d36..0000000 --- a/source/ChanSort.Loader.Hisense2017/Resources.ro.resx +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Acest fișier din lista de canale nu conține date. -Cel mai probabil, o listă de canale predefinită a fost selectată în timpul configurației inițiale a televizorului. Astfel de liste nu sunt exportate și nu pot fi editate pe televizor sau pe PC. -Pentru a obține o listă care poate fi editată pe PC, trebuie să resetați televizorul la valorile implicite din fabrică și să selectați opțiunea "Altele" în timpul configurației canalelor de satelit. - - - Nu au fost găsite canale - - \ No newline at end of file diff --git a/source/ChanSort.Loader.Hisense2017/Resources.tr.resx b/source/ChanSort.Loader.Hisense2017/Resources.tr.resx deleted file mode 100644 index 5e3552c..0000000 --- a/source/ChanSort.Loader.Hisense2017/Resources.tr.resx +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Bu kanal listesi dosyası veri içermiyor. -Büyük olasılıkla TV'nin ilk kurulumu sırasında önceden tanımlanmış bir kanal listesi seçildi. Bu tür listeler dışa aktarılmaz ve TV'de veya PC'nizde düzenlenemez. -PC'nizde düzenlenebilecek bir liste almak için TV'nizi fabrika varsayılanlarına sıfırlamanız ve uydu kanalı kurulumu sırasında 'Diğer' seçeneğini seçmeniz gerekir. - - - Kanal bulunamadı - - \ No newline at end of file diff --git a/source/ChanSort.Loader.LG/AnalogChannel.cs b/source/ChanSort.Loader.LG/Binary/AnalogChannel.cs similarity index 93% rename from source/ChanSort.Loader.LG/AnalogChannel.cs rename to source/ChanSort.Loader.LG/Binary/AnalogChannel.cs index 1f4acd2..01f2e64 100644 --- a/source/ChanSort.Loader.LG/AnalogChannel.cs +++ b/source/ChanSort.Loader.LG/Binary/AnalogChannel.cs @@ -1,6 +1,6 @@ using ChanSort.Api; -namespace ChanSort.Loader.LG +namespace ChanSort.Loader.LG.Binary { public class AnalogChannel : TllChannelBase { diff --git a/source/ChanSort.Loader.LG/DtvChannel.cs b/source/ChanSort.Loader.LG/Binary/DtvChannel.cs similarity index 96% rename from source/ChanSort.Loader.LG/DtvChannel.cs rename to source/ChanSort.Loader.LG/Binary/DtvChannel.cs index 024db4a..67eb5cc 100644 --- a/source/ChanSort.Loader.LG/DtvChannel.cs +++ b/source/ChanSort.Loader.LG/Binary/DtvChannel.cs @@ -1,6 +1,6 @@ using ChanSort.Api; -namespace ChanSort.Loader.LG +namespace ChanSort.Loader.LG.Binary { public class DtvChannel : TllChannelBase { diff --git a/source/ChanSort.Loader.LG/DvbsDataLayout.cs b/source/ChanSort.Loader.LG/Binary/DvbsDataLayout.cs similarity index 98% rename from source/ChanSort.Loader.LG/DvbsDataLayout.cs rename to source/ChanSort.Loader.LG/Binary/DvbsDataLayout.cs index 9f27309..8f3e360 100644 --- a/source/ChanSort.Loader.LG/DvbsDataLayout.cs +++ b/source/ChanSort.Loader.LG/Binary/DvbsDataLayout.cs @@ -1,4 +1,4 @@ -namespace ChanSort.Loader.LG +namespace ChanSort.Loader.LG.Binary { public class DvbsDataLayout { diff --git a/source/ChanSort.Loader.LG/FirmwareData.cs b/source/ChanSort.Loader.LG/Binary/FirmwareData.cs similarity index 98% rename from source/ChanSort.Loader.LG/FirmwareData.cs rename to source/ChanSort.Loader.LG/Binary/FirmwareData.cs index b6fdfaa..fa9bd52 100644 --- a/source/ChanSort.Loader.LG/FirmwareData.cs +++ b/source/ChanSort.Loader.LG/Binary/FirmwareData.cs @@ -1,6 +1,6 @@ using ChanSort.Api; -namespace ChanSort.Loader.LG +namespace ChanSort.Loader.LG.Binary { public class FirmwareData : DataMapping { diff --git a/source/ChanSort.Loader.LG/LnbConfig.cs b/source/ChanSort.Loader.LG/Binary/LnbConfig.cs similarity index 91% rename from source/ChanSort.Loader.LG/LnbConfig.cs rename to source/ChanSort.Loader.LG/Binary/LnbConfig.cs index 179056f..afa1503 100644 --- a/source/ChanSort.Loader.LG/LnbConfig.cs +++ b/source/ChanSort.Loader.LG/Binary/LnbConfig.cs @@ -1,6 +1,6 @@ using ChanSort.Api; -namespace ChanSort.Loader.LG +namespace ChanSort.Loader.LG.Binary { internal class LnbConfig : Api.LnbConfig { diff --git a/source/ChanSort.Loader.LG/SatChannel.cs b/source/ChanSort.Loader.LG/Binary/SatChannel.cs similarity index 96% rename from source/ChanSort.Loader.LG/SatChannel.cs rename to source/ChanSort.Loader.LG/Binary/SatChannel.cs index 091549e..7361a6b 100644 --- a/source/ChanSort.Loader.LG/SatChannel.cs +++ b/source/ChanSort.Loader.LG/Binary/SatChannel.cs @@ -1,6 +1,6 @@ using ChanSort.Api; -namespace ChanSort.Loader.LG +namespace ChanSort.Loader.LG.Binary { class SatChannel : TllChannelBase { diff --git a/source/ChanSort.Loader.LG/SatChannelListHeader.cs b/source/ChanSort.Loader.LG/Binary/SatChannelListHeader.cs similarity index 96% rename from source/ChanSort.Loader.LG/SatChannelListHeader.cs rename to source/ChanSort.Loader.LG/Binary/SatChannelListHeader.cs index 417cf5d..6fa0c99 100644 --- a/source/ChanSort.Loader.LG/SatChannelListHeader.cs +++ b/source/ChanSort.Loader.LG/Binary/SatChannelListHeader.cs @@ -1,7 +1,7 @@ using System; using ChanSort.Api; -namespace ChanSort.Loader.LG +namespace ChanSort.Loader.LG.Binary { internal class SatChannelListHeader { diff --git a/source/ChanSort.Loader.LG/SatTransponder.cs b/source/ChanSort.Loader.LG/Binary/SatTransponder.cs similarity index 98% rename from source/ChanSort.Loader.LG/SatTransponder.cs rename to source/ChanSort.Loader.LG/Binary/SatTransponder.cs index 16ce41a..47a64f8 100644 --- a/source/ChanSort.Loader.LG/SatTransponder.cs +++ b/source/ChanSort.Loader.LG/Binary/SatTransponder.cs @@ -1,6 +1,6 @@ using ChanSort.Api; -namespace ChanSort.Loader.LG +namespace ChanSort.Loader.LG.Binary { internal class SatTransponder : Transponder { diff --git a/source/ChanSort.Loader.LG/TllChannelBase.cs b/source/ChanSort.Loader.LG/Binary/TllChannelBase.cs similarity index 99% rename from source/ChanSort.Loader.LG/TllChannelBase.cs rename to source/ChanSort.Loader.LG/Binary/TllChannelBase.cs index 3673f4a..5ed3bce 100644 --- a/source/ChanSort.Loader.LG/TllChannelBase.cs +++ b/source/ChanSort.Loader.LG/Binary/TllChannelBase.cs @@ -1,6 +1,6 @@ using ChanSort.Api; -namespace ChanSort.Loader.LG +namespace ChanSort.Loader.LG.Binary { public class TllChannelBase : ChannelInfo { diff --git a/source/ChanSort.Loader.LG/TllFileSerializer.cs b/source/ChanSort.Loader.LG/Binary/TllFileSerializer.cs similarity index 99% rename from source/ChanSort.Loader.LG/TllFileSerializer.cs rename to source/ChanSort.Loader.LG/Binary/TllFileSerializer.cs index 6100cc1..a073ce8 100644 --- a/source/ChanSort.Loader.LG/TllFileSerializer.cs +++ b/source/ChanSort.Loader.LG/Binary/TllFileSerializer.cs @@ -8,7 +8,7 @@ using System.Text; using System.Windows.Forms; using ChanSort.Api; -namespace ChanSort.Loader.LG +namespace ChanSort.Loader.LG.Binary { public partial class TllFileSerializer : SerializerBase { diff --git a/source/ChanSort.Loader.LG/TllFileSerializer.sql.cs b/source/ChanSort.Loader.LG/Binary/TllFileSerializer.sql.cs similarity index 99% rename from source/ChanSort.Loader.LG/TllFileSerializer.sql.cs rename to source/ChanSort.Loader.LG/Binary/TllFileSerializer.sql.cs index 939b199..3a28a53 100644 --- a/source/ChanSort.Loader.LG/TllFileSerializer.sql.cs +++ b/source/ChanSort.Loader.LG/Binary/TllFileSerializer.sql.cs @@ -5,7 +5,7 @@ using System.Data.SqlClient; using System.Text; using ChanSort.Api; -namespace ChanSort.Loader.LG +namespace ChanSort.Loader.LG.Binary { /// /// For research purposes this class writes DVB-S channel information into a database diff --git a/source/ChanSort.Loader.LG/TvSettingsForm.Designer.cs b/source/ChanSort.Loader.LG/Binary/TvSettingsForm.Designer.cs similarity index 99% rename from source/ChanSort.Loader.LG/TvSettingsForm.Designer.cs rename to source/ChanSort.Loader.LG/Binary/TvSettingsForm.Designer.cs index fbea31c..fe0f948 100644 --- a/source/ChanSort.Loader.LG/TvSettingsForm.Designer.cs +++ b/source/ChanSort.Loader.LG/Binary/TvSettingsForm.Designer.cs @@ -1,4 +1,4 @@ -namespace ChanSort.Loader.LG +namespace ChanSort.Loader.LG.Binary { partial class TvSettingsForm { diff --git a/source/ChanSort.Loader.LG/TvSettingsForm.cs b/source/ChanSort.Loader.LG/Binary/TvSettingsForm.cs similarity index 98% rename from source/ChanSort.Loader.LG/TvSettingsForm.cs rename to source/ChanSort.Loader.LG/Binary/TvSettingsForm.cs index 6d12e6b..53d5593 100644 --- a/source/ChanSort.Loader.LG/TvSettingsForm.cs +++ b/source/ChanSort.Loader.LG/Binary/TvSettingsForm.cs @@ -2,7 +2,7 @@ using DevExpress.XtraEditors; using DevExpress.XtraEditors.Controls; -namespace ChanSort.Loader.LG +namespace ChanSort.Loader.LG.Binary { public partial class TvSettingsForm : XtraForm { diff --git a/source/ChanSort.Loader.LG/TvSettingsForm.cs.resx b/source/ChanSort.Loader.LG/Binary/TvSettingsForm.cs.resx similarity index 100% rename from source/ChanSort.Loader.LG/TvSettingsForm.cs.resx rename to source/ChanSort.Loader.LG/Binary/TvSettingsForm.cs.resx diff --git a/source/ChanSort.Loader.LG/TvSettingsForm.de.resx b/source/ChanSort.Loader.LG/Binary/TvSettingsForm.de.resx similarity index 100% rename from source/ChanSort.Loader.LG/TvSettingsForm.de.resx rename to source/ChanSort.Loader.LG/Binary/TvSettingsForm.de.resx diff --git a/source/ChanSort.Loader.LG/TvSettingsForm.es.resx b/source/ChanSort.Loader.LG/Binary/TvSettingsForm.es.resx similarity index 100% rename from source/ChanSort.Loader.LG/TvSettingsForm.es.resx rename to source/ChanSort.Loader.LG/Binary/TvSettingsForm.es.resx diff --git a/source/ChanSort.Loader.LG/TvSettingsForm.hu.resx b/source/ChanSort.Loader.LG/Binary/TvSettingsForm.hu.resx similarity index 100% rename from source/ChanSort.Loader.LG/TvSettingsForm.hu.resx rename to source/ChanSort.Loader.LG/Binary/TvSettingsForm.hu.resx diff --git a/source/ChanSort.Loader.LG/TvSettingsForm.pl.resx b/source/ChanSort.Loader.LG/Binary/TvSettingsForm.pl.resx similarity index 100% rename from source/ChanSort.Loader.LG/TvSettingsForm.pl.resx rename to source/ChanSort.Loader.LG/Binary/TvSettingsForm.pl.resx diff --git a/source/ChanSort.Loader.LG/TvSettingsForm.pt.resx b/source/ChanSort.Loader.LG/Binary/TvSettingsForm.pt.resx similarity index 100% rename from source/ChanSort.Loader.LG/TvSettingsForm.pt.resx rename to source/ChanSort.Loader.LG/Binary/TvSettingsForm.pt.resx diff --git a/source/ChanSort.Loader.LG/TvSettingsForm.resx b/source/ChanSort.Loader.LG/Binary/TvSettingsForm.resx similarity index 100% rename from source/ChanSort.Loader.LG/TvSettingsForm.resx rename to source/ChanSort.Loader.LG/Binary/TvSettingsForm.resx diff --git a/source/ChanSort.Loader.LG/TvSettingsForm.ro.resx b/source/ChanSort.Loader.LG/Binary/TvSettingsForm.ro.resx similarity index 100% rename from source/ChanSort.Loader.LG/TvSettingsForm.ro.resx rename to source/ChanSort.Loader.LG/Binary/TvSettingsForm.ro.resx diff --git a/source/ChanSort.Loader.LG/TvSettingsForm.ru.resx b/source/ChanSort.Loader.LG/Binary/TvSettingsForm.ru.resx similarity index 100% rename from source/ChanSort.Loader.LG/TvSettingsForm.ru.resx rename to source/ChanSort.Loader.LG/Binary/TvSettingsForm.ru.resx diff --git a/source/ChanSort.Loader.LG/TvSettingsForm.tr.resx b/source/ChanSort.Loader.LG/Binary/TvSettingsForm.tr.resx similarity index 100% rename from source/ChanSort.Loader.LG/TvSettingsForm.tr.resx rename to source/ChanSort.Loader.LG/Binary/TvSettingsForm.tr.resx diff --git a/source/ChanSort.Loader.LG/ChanSort.Loader.LG.csproj b/source/ChanSort.Loader.LG/ChanSort.Loader.LG.csproj index a9d5f8a..a17a753 100644 --- a/source/ChanSort.Loader.LG/ChanSort.Loader.LG.csproj +++ b/source/ChanSort.Loader.LG/ChanSort.Loader.LG.csproj @@ -25,6 +25,7 @@ 4 true false + latest pdbonly @@ -34,6 +35,7 @@ prompt 4 false + latest true @@ -47,6 +49,7 @@ true true false + latest ..\Release\ @@ -58,12 +61,16 @@ false true false + latest + + ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll + @@ -74,11 +81,15 @@ - - - - - + + + + + + + + + Form @@ -86,27 +97,21 @@ PresetProgramNrDialog.cs - - True - True - Resource.de.resx - True True Resource.resx - - - - - - - - + + + + + + + Form - + TvSettingsForm.cs @@ -172,39 +177,42 @@ - + TvSettingsForm.cs - + TvSettingsForm.cs Designer - + TvSettingsForm.cs - + TvSettingsForm.cs - + TvSettingsForm.cs - + TvSettingsForm.cs - + TvSettingsForm.cs Designer - + TvSettingsForm.cs - + TvSettingsForm.cs - + TvSettingsForm.cs + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 1.3 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/source/ChanSort.Loader.Samsung/Resource.resx b/source/ChanSort.Loader.Samsung/Resource.resx deleted file mode 100644 index 4fdb1b6..0000000 --- a/source/ChanSort.Loader.Samsung/Resource.resx +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 1.3 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/source/ChanSort.Loader.Samsung/SamsungPlugin.cs b/source/ChanSort.Loader.Samsung/SamsungPlugin.cs new file mode 100644 index 0000000..2ee34dd --- /dev/null +++ b/source/ChanSort.Loader.Samsung/SamsungPlugin.cs @@ -0,0 +1,24 @@ +using System.IO; +using ChanSort.Api; +using ChanSort.Loader.Samsung.Scm; +using ChanSort.Loader.Samsung.Zip; + +namespace ChanSort.Loader.Samsung +{ + public class SamsungPlugin : ISerializerPlugin + { + public string DllName { get; set; } + public string PluginName => "Samsung (*.scm, *.zip)"; + public string FileFilter => "*.scm;*.zip"; + + public SerializerBase CreateSerializer(string inputFile) + { + var ext = Path.GetExtension(inputFile).ToLowerInvariant(); + if (ext == ".scm") + return new ScmSerializer(inputFile); + if (ext == ".zip") + return new DbSerializer(inputFile); + return null; + } + } +} diff --git a/source/ChanSort.Loader.Samsung/AnalogChannel.cs b/source/ChanSort.Loader.Samsung/Scm/AnalogChannel.cs similarity index 96% rename from source/ChanSort.Loader.Samsung/AnalogChannel.cs rename to source/ChanSort.Loader.Samsung/Scm/AnalogChannel.cs index 46db84b..296ba3b 100644 --- a/source/ChanSort.Loader.Samsung/AnalogChannel.cs +++ b/source/ChanSort.Loader.Samsung/Scm/AnalogChannel.cs @@ -1,6 +1,6 @@ using ChanSort.Api; -namespace ChanSort.Loader.Samsung +namespace ChanSort.Loader.Samsung.Scm { internal class AnalogChannel : ScmChannelBase { diff --git a/source/ChanSort.Loader.Samsung/DigitalChannel.cs b/source/ChanSort.Loader.Samsung/Scm/DigitalChannel.cs similarity index 97% rename from source/ChanSort.Loader.Samsung/DigitalChannel.cs rename to source/ChanSort.Loader.Samsung/Scm/DigitalChannel.cs index 4149cee..d8e19ec 100644 --- a/source/ChanSort.Loader.Samsung/DigitalChannel.cs +++ b/source/ChanSort.Loader.Samsung/Scm/DigitalChannel.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using ChanSort.Api; -namespace ChanSort.Loader.Samsung +namespace ChanSort.Loader.Samsung.Scm { public class DigitalChannel : ScmChannelBase { diff --git a/source/ChanSort.Loader.Samsung/ModelConstants.cs b/source/ChanSort.Loader.Samsung/Scm/ModelConstants.cs similarity index 98% rename from source/ChanSort.Loader.Samsung/ModelConstants.cs rename to source/ChanSort.Loader.Samsung/Scm/ModelConstants.cs index 8620c22..3159cad 100644 --- a/source/ChanSort.Loader.Samsung/ModelConstants.cs +++ b/source/ChanSort.Loader.Samsung/Scm/ModelConstants.cs @@ -1,6 +1,6 @@ using ChanSort.Api; -namespace ChanSort.Loader.Samsung +namespace ChanSort.Loader.Samsung.Scm { public enum FavoritesIndexMode { diff --git a/source/ChanSort.Loader.Samsung/SatChannel.cs b/source/ChanSort.Loader.Samsung/Scm/SatChannel.cs similarity index 97% rename from source/ChanSort.Loader.Samsung/SatChannel.cs rename to source/ChanSort.Loader.Samsung/Scm/SatChannel.cs index 8bb21cc..97a6c35 100644 --- a/source/ChanSort.Loader.Samsung/SatChannel.cs +++ b/source/ChanSort.Loader.Samsung/Scm/SatChannel.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using ChanSort.Api; -namespace ChanSort.Loader.Samsung +namespace ChanSort.Loader.Samsung.Scm { class SatChannel : ScmChannelBase { diff --git a/source/ChanSort.Loader.Samsung/SatelliteMapping.cs b/source/ChanSort.Loader.Samsung/Scm/SatelliteMapping.cs similarity index 95% rename from source/ChanSort.Loader.Samsung/SatelliteMapping.cs rename to source/ChanSort.Loader.Samsung/Scm/SatelliteMapping.cs index 49055a7..a6063ea 100644 --- a/source/ChanSort.Loader.Samsung/SatelliteMapping.cs +++ b/source/ChanSort.Loader.Samsung/Scm/SatelliteMapping.cs @@ -1,7 +1,7 @@ using System; using System.Text; -namespace ChanSort.Loader.Samsung +namespace ChanSort.Loader.Samsung.Scm { internal class SatelliteMapping { diff --git a/source/ChanSort.Loader.Samsung/ScmChannelBase.cs b/source/ChanSort.Loader.Samsung/Scm/ScmChannelBase.cs similarity index 99% rename from source/ChanSort.Loader.Samsung/ScmChannelBase.cs rename to source/ChanSort.Loader.Samsung/Scm/ScmChannelBase.cs index 5eaf1bd..cedf362 100644 --- a/source/ChanSort.Loader.Samsung/ScmChannelBase.cs +++ b/source/ChanSort.Loader.Samsung/Scm/ScmChannelBase.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using ChanSort.Api; -namespace ChanSort.Loader.Samsung +namespace ChanSort.Loader.Samsung.Scm { public class ScmChannelBase : ChannelInfo { diff --git a/source/ChanSort.Loader.Samsung/ScmSerializer.cs b/source/ChanSort.Loader.Samsung/Scm/ScmSerializer.cs similarity index 99% rename from source/ChanSort.Loader.Samsung/ScmSerializer.cs rename to source/ChanSort.Loader.Samsung/Scm/ScmSerializer.cs index 9a853dc..6107961 100644 --- a/source/ChanSort.Loader.Samsung/ScmSerializer.cs +++ b/source/ChanSort.Loader.Samsung/Scm/ScmSerializer.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Text; using ChanSort.Api; -namespace ChanSort.Loader.Samsung +namespace ChanSort.Loader.Samsung.Scm { internal class ScmSerializer : SerializerBase { diff --git a/source/ChanSort.Loader.Samsung/ScmSerializerPlugin.cs b/source/ChanSort.Loader.Samsung/ScmSerializerPlugin.cs deleted file mode 100644 index c5ff788..0000000 --- a/source/ChanSort.Loader.Samsung/ScmSerializerPlugin.cs +++ /dev/null @@ -1,16 +0,0 @@ -using ChanSort.Api; - -namespace ChanSort.Loader.Samsung -{ - public class ScmSerializerPlugin : ISerializerPlugin - { - public string DllName { get; set; } - public string PluginName { get { return "Samsung B-H series"; } } - public string FileFilter { get { return "*.scm"; } } - - public SerializerBase CreateSerializer(string inputFile) - { - return new ScmSerializer(inputFile); - } - } -} diff --git a/source/ChanSort.Loader.SamsungJ/DbChannel.cs b/source/ChanSort.Loader.Samsung/Zip/DbChannel.cs similarity index 98% rename from source/ChanSort.Loader.SamsungJ/DbChannel.cs rename to source/ChanSort.Loader.Samsung/Zip/DbChannel.cs index ccbc3ae..97bf4c3 100644 --- a/source/ChanSort.Loader.SamsungJ/DbChannel.cs +++ b/source/ChanSort.Loader.Samsung/Zip/DbChannel.cs @@ -2,7 +2,7 @@ using System.Data.SQLite; using ChanSort.Api; -namespace ChanSort.Loader.SamsungJ +namespace ChanSort.Loader.Samsung.Zip { internal class DbChannel : ChannelInfo { diff --git a/source/ChanSort.Loader.SamsungJ/DbSerializer.cs b/source/ChanSort.Loader.Samsung/Zip/DbSerializer.cs similarity index 99% rename from source/ChanSort.Loader.SamsungJ/DbSerializer.cs rename to source/ChanSort.Loader.Samsung/Zip/DbSerializer.cs index 26dd6c7..9633541 100644 --- a/source/ChanSort.Loader.SamsungJ/DbSerializer.cs +++ b/source/ChanSort.Loader.Samsung/Zip/DbSerializer.cs @@ -4,11 +4,10 @@ using System.Data; using System.Data.SQLite; using System.IO; using System.Linq; -using System.Runtime.CompilerServices; using System.Text; using ChanSort.Api; -namespace ChanSort.Loader.SamsungJ +namespace ChanSort.Loader.Samsung.Zip { /// /// Loader for Samsung J/K/M/N/R/Q series .zip files (2015 - 2020) diff --git a/source/ChanSort.Loader.SamsungJ/Utf16InsideUtf8EnvelopeEncoding.cs b/source/ChanSort.Loader.Samsung/Zip/Utf16InsideUtf8EnvelopeEncoding.cs similarity index 99% rename from source/ChanSort.Loader.SamsungJ/Utf16InsideUtf8EnvelopeEncoding.cs rename to source/ChanSort.Loader.Samsung/Zip/Utf16InsideUtf8EnvelopeEncoding.cs index 23d22ad..cb267c7 100644 --- a/source/ChanSort.Loader.SamsungJ/Utf16InsideUtf8EnvelopeEncoding.cs +++ b/source/ChanSort.Loader.Samsung/Zip/Utf16InsideUtf8EnvelopeEncoding.cs @@ -1,7 +1,7 @@ using System.IO; using System.Text; -namespace ChanSort.Loader.SamsungJ +namespace ChanSort.Loader.Samsung.Zip { // Samsung 1242 format does not store UTF16 characters directly, but instead wraps 16 data bits inside a UTF-8 lead + continuation byte sequence. // A 3 byte UTF-8 sequence is used to encode 16 bits of utf-16 big endian input: 1110aaaa 10bbbbcc 10ccdddd represents the 16bit big endian integer ccccddddaaaabbbb, i.e. 0xE4, 0x84, 0x80 => 0x00, 0x41 => "A" in UTF-16 BE diff --git a/source/ChanSort.Loader.SamsungJ/ChanSort.Loader.SamsungJ.csproj b/source/ChanSort.Loader.SamsungJ/ChanSort.Loader.SamsungJ.csproj deleted file mode 100644 index 3462992..0000000 --- a/source/ChanSort.Loader.SamsungJ/ChanSort.Loader.SamsungJ.csproj +++ /dev/null @@ -1,94 +0,0 @@ - - - - - Debug - AnyCPU - {33897002-0537-49A4-B963-A18D17311B3D} - Library - Properties - ChanSort.Loader.SamsungJ - ChanSort.Loader.SamsungJ - v4.8 - 512 - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - latest - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - latest - - - true - ..\Debug\ - DEBUG;TRACE - full - x86 - prompt - MinimumRecommendedRules.ruleset - false - latest - - - ..\Release\ - TRACE - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - false - latest - - - - - - ..\DLL\System.Data.SQLite.dll - - - - - - - - - - - - - - - - - - {dccffa08-472b-4d17-bb90-8f513fc01392} - ChanSort.Api - - - - - \ No newline at end of file diff --git a/source/ChanSort.Loader.SamsungJ/DbSerializerPlugin.cs b/source/ChanSort.Loader.SamsungJ/DbSerializerPlugin.cs deleted file mode 100644 index a1ddb0b..0000000 --- a/source/ChanSort.Loader.SamsungJ/DbSerializerPlugin.cs +++ /dev/null @@ -1,16 +0,0 @@ -using ChanSort.Api; - -namespace ChanSort.Loader.SamsungJ -{ - public class DbSerializerPlugin : ISerializerPlugin - { - public string DllName { get; set; } - public string PluginName => "Samsung J-K series"; - public string FileFilter => "*.zip"; // "channel_list_t*.zip"; - - public SerializerBase CreateSerializer(string inputFile) - { - return new DbSerializer(inputFile); - } - } -} diff --git a/source/ChanSort.Loader.SamsungJ/Properties/AssemblyInfo.cs b/source/ChanSort.Loader.SamsungJ/Properties/AssemblyInfo.cs deleted file mode 100644 index 3b54e92..0000000 --- a/source/ChanSort.Loader.SamsungJ/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -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("ChanSort.Loader.SamsungJ")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("ChanSort.Loader.SamsungJ")] -[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("2e9d8977-acba-492f-92d9-d070d4e43a87")] - -// 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/source/ChanSort.Loader.SilvaSchneider/ChanSort.Loader.SilvaSchneider.csproj b/source/ChanSort.Loader.SatcoDX/ChanSort.Loader.SatcoDX.csproj similarity index 94% rename from source/ChanSort.Loader.SilvaSchneider/ChanSort.Loader.SilvaSchneider.csproj rename to source/ChanSort.Loader.SatcoDX/ChanSort.Loader.SatcoDX.csproj index 2c27933..fc82764 100644 --- a/source/ChanSort.Loader.SilvaSchneider/ChanSort.Loader.SilvaSchneider.csproj +++ b/source/ChanSort.Loader.SatcoDX/ChanSort.Loader.SatcoDX.csproj @@ -7,8 +7,8 @@ {E6279FF8-362A-41E6-AC0D-D0861D43F01C} Library Properties - ChanSort.Loader.SilvaSchneider - ChanSort.Loader.SilvaSchneider + ChanSort.Loader.SatcoDX + ChanSort.Loader.SatcoDX v4.8 512 @@ -64,9 +64,9 @@ - + - + diff --git a/source/ChanSort.Loader.SilvaSchneider/Channels.cs b/source/ChanSort.Loader.SatcoDX/Channel.cs similarity index 64% rename from source/ChanSort.Loader.SilvaSchneider/Channels.cs rename to source/ChanSort.Loader.SatcoDX/Channel.cs index f8d64da..d0e66dc 100644 --- a/source/ChanSort.Loader.SilvaSchneider/Channels.cs +++ b/source/ChanSort.Loader.SatcoDX/Channel.cs @@ -3,16 +3,16 @@ using System.Globalization; using System.IO; using ChanSort.Api; -namespace ChanSort.Loader.SilvaSchneider +namespace ChanSort.Loader.SatcoDX { - internal class Channels : ChannelInfo + internal class Channel : ChannelInfo { public int FileOffset { get; } public int Length { get; } #region ctor() - internal Channels(int pos, string line, byte[] data, int start, int length, DvbStringDecoder decoder) + internal Channel(int pos, string line, byte[] data, int start, int length, DvbStringDecoder decoder) { this.FileOffset = start; this.Length = length; @@ -24,17 +24,24 @@ namespace ChanSort.Loader.SilvaSchneider if (line.Length < 106) throw new FileLoadException("Unrecognized channel format"); + // 10-27: satellite name this.Satellite = line.Substring(10, 18); + // 28: channel type var type = line[28]; this.SignalSource = SignalSource.Digital | SignalSource.Sat | (type == 'T' ? SignalSource.Tv : type == 'R' ? SignalSource.Radio : 0); - this.ServiceType = type == 'T' ? 1 : type == 'R' ? 2 : 0; // 1=SD-TV, 2=Radio + this.ServiceTypeName = type == 'T' ? "TV" : type == 'R' ? "Radio" : type == 'D' ? "Data" : "Other"; - if (int.TryParse(line.Substring(34, 5), out var mhz)) - this.FreqInMhz = mhz; + // 29-32: broadcast system - this.Polarity = line[39] == '1' ? 'H' : 'V'; + // 33-41: frequency in kHz + if (int.TryParse(line.Substring(33, 9), out var khz)) + this.FreqInMhz = (decimal)khz / 1000; + // 42: polarity + this.Polarity = line[42] == '1' ? 'H' : 'V'; + + // 43-50 + (115-126 or 115-131): channel name byte[] nameBytes = new byte[8+17]; var nameLen2 = Math.Min(length - 115, 17); // version 103 has 12 extra bytes for channel name, version 105 has 17 Array.Copy(data, start + 43, nameBytes, 0, 8); @@ -43,20 +50,36 @@ namespace ChanSort.Loader.SilvaSchneider this.Name = longName.TrimEnd(); this.ShortName = shortName.TrimEnd(); + // 51-54: sat position var spos = line.Substring(51, 4).TrimStart('0'); this.SatPosition = spos.Substring(0, spos.Length - 1) + CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator + spos.Substring(spos.Length - 1); + // 69-73: symbol rate if (int.TryParse(line.Substring(69, 5), out var symrate)) this.SymbolRate = symrate; + // 74: FEC 0=-, 1=1/2, 2=2/3, 3=3/4, 5=5/6, 7=7/8 + + // 75-78: vpid or ____ + // 79-82: apid or ____ + // 83-86: pcrpid or ____ + + // 87-91: sid if (int.TryParse(line.Substring(87, 5), out var sid)) this.ServiceId = sid; + // 92-96: nid / onid if (int.TryParse(line.Substring(92, 5), out var onid)) this.OriginalNetworkId = onid; + // 97-101: tsid if (int.TryParse(line.Substring(97, 5), out var tsid)) this.TransportStreamId = tsid; + + // 102-104: language + // 106-107: country code + // 108-110: language code + // 111-114: crypto code } #endregion diff --git a/source/ChanSort.Loader.SilvaSchneider/Properties/AssemblyInfo.cs b/source/ChanSort.Loader.SatcoDX/Properties/AssemblyInfo.cs similarity index 100% rename from source/ChanSort.Loader.SilvaSchneider/Properties/AssemblyInfo.cs rename to source/ChanSort.Loader.SatcoDX/Properties/AssemblyInfo.cs diff --git a/source/ChanSort.Loader.SatcoDX/SatcoDxPlugin.cs b/source/ChanSort.Loader.SatcoDX/SatcoDxPlugin.cs new file mode 100644 index 0000000..419c1e5 --- /dev/null +++ b/source/ChanSort.Loader.SatcoDX/SatcoDxPlugin.cs @@ -0,0 +1,16 @@ +using ChanSort.Api; + +namespace ChanSort.Loader.SatcoDX +{ + public class SatcoDxPlugin : ISerializerPlugin + { + public string DllName { get; set; } + public string PluginName => "ITT/Medion/Nabo/ok./Peaq/Schaub-Lorenz/Silva-Schneider/Telefunken"; + public string FileFilter => "*.sdx"; + + public SerializerBase CreateSerializer(string inputFile) + { + return new Serializer(inputFile); + } + } +} diff --git a/source/ChanSort.Loader.SilvaSchneider/Serializer.cs b/source/ChanSort.Loader.SatcoDX/Serializer.cs similarity index 90% rename from source/ChanSort.Loader.SilvaSchneider/Serializer.cs rename to source/ChanSort.Loader.SatcoDX/Serializer.cs index cb61388..4d41691 100644 --- a/source/ChanSort.Loader.SilvaSchneider/Serializer.cs +++ b/source/ChanSort.Loader.SatcoDX/Serializer.cs @@ -3,7 +3,7 @@ using System.IO; using System.Text; using ChanSort.Api; -namespace ChanSort.Loader.SilvaSchneider +namespace ChanSort.Loader.SatcoDX { internal class Serializer : SerializerBase { @@ -36,6 +36,8 @@ namespace ChanSort.Loader.SilvaSchneider list.VisibleColumnFieldNames.Remove("Hidden"); list.VisibleColumnFieldNames.Remove("Encrypted"); list.VisibleColumnFieldNames.Remove("Favorites"); + list.VisibleColumnFieldNames.Remove("ServiceType"); + list.VisibleColumnFieldNames.Add("ServiceTypeName"); } } @@ -55,7 +57,7 @@ namespace ChanSort.Loader.SilvaSchneider if (nextPos - prevPos == 0) continue; string line = Encoding.ASCII.GetString(content, prevPos, nextPos-prevPos); - ChannelInfo channel = new Channels(pos, line, content, prevPos, nextPos-prevPos, decoder); + ChannelInfo channel = new Channel(pos, line, content, prevPos, nextPos-prevPos, decoder); this.DataRoot.AddChannel(this.allChannels, channel); pos++; prevPos = nextPos + 1; @@ -81,7 +83,7 @@ namespace ChanSort.Loader.SilvaSchneider // when a reference list was applied, the list may contain proxy entries for deleted channels, which must be ignored if (channel.IsProxy || channel.IsDeleted) continue; - if (channel is Channels realChannel) + if (channel is Channel realChannel) file.Write(this.content, realChannel.FileOffset, realChannel.Length + 1); } } diff --git a/source/ChanSort.Loader.SilvaSchneider/SerializerPlugin.cs b/source/ChanSort.Loader.SilvaSchneider/SerializerPlugin.cs deleted file mode 100644 index 43fcb5c..0000000 --- a/source/ChanSort.Loader.SilvaSchneider/SerializerPlugin.cs +++ /dev/null @@ -1,16 +0,0 @@ -using ChanSort.Api; - -namespace ChanSort.Loader.SilvaSchneider -{ - public class SerializerPlugin : ISerializerPlugin - { - public string DllName { get; set; } - public string PluginName { get { return "ITT/Medion/Nabo/ok./Peaq/Schaub-Lorenz/Silva-Schneider/Telefunken"; } } - public string FileFilter { get { return "*.sdx"; } } - - public SerializerBase CreateSerializer(string inputFile) - { - return new Serializer(inputFile); - } - } -} diff --git a/source/ChanSort.Loader.Sony/ChanSort.Loader.Sony.csproj b/source/ChanSort.Loader.Sony/ChanSort.Loader.Sony.csproj index 81d4322..1371e8e 100644 --- a/source/ChanSort.Loader.Sony/ChanSort.Loader.Sony.csproj +++ b/source/ChanSort.Loader.Sony/ChanSort.Loader.Sony.csproj @@ -66,7 +66,7 @@ - + diff --git a/source/ChanSort.Loader.Sony/SerializerPlugin.cs b/source/ChanSort.Loader.Sony/SonyPlugin.cs similarity index 72% rename from source/ChanSort.Loader.Sony/SerializerPlugin.cs rename to source/ChanSort.Loader.Sony/SonyPlugin.cs index 8f9861c..7be50b1 100644 --- a/source/ChanSort.Loader.Sony/SerializerPlugin.cs +++ b/source/ChanSort.Loader.Sony/SonyPlugin.cs @@ -2,10 +2,10 @@ namespace ChanSort.Loader.Sony { - public class SerializerPlugin : ISerializerPlugin + public class SonyPlugin : ISerializerPlugin { public string DllName { get; set; } - public string PluginName => "Sony sdb.xml"; + public string PluginName => "Sony (sdb.xml)"; public string FileFilter => "*.xml"; public SerializerBase CreateSerializer(string inputFile) diff --git a/source/ChanSort.Loader.Toshiba/ToshibaPlugin.cs b/source/ChanSort.Loader.Toshiba/ToshibaPlugin.cs index b2262e7..f8e132b 100644 --- a/source/ChanSort.Loader.Toshiba/ToshibaPlugin.cs +++ b/source/ChanSort.Loader.Toshiba/ToshibaPlugin.cs @@ -6,7 +6,7 @@ namespace ChanSort.Loader.Toshiba public class ToshibaPlugin : ISerializerPlugin { public string DllName { get; set; } - public string PluginName => "Toshiba"; + public string PluginName => "Toshiba (*.zip, settingsDB.db)"; public string FileFilter => "*.zip;*.db"; public SerializerBase CreateSerializer(string inputFile) diff --git a/source/ChanSort.Loader.VDR/ChanSort.Loader.VDR.csproj b/source/ChanSort.Loader.VDR/ChanSort.Loader.VDR.csproj index 0fcfb29..9934b59 100644 --- a/source/ChanSort.Loader.VDR/ChanSort.Loader.VDR.csproj +++ b/source/ChanSort.Loader.VDR/ChanSort.Loader.VDR.csproj @@ -66,7 +66,7 @@ - + diff --git a/source/ChanSort.Loader.VDR/SerializerPlugin.cs b/source/ChanSort.Loader.VDR/VdrPlugin.cs similarity index 55% rename from source/ChanSort.Loader.VDR/SerializerPlugin.cs rename to source/ChanSort.Loader.VDR/VdrPlugin.cs index 6aed7c6..2b38738 100644 --- a/source/ChanSort.Loader.VDR/SerializerPlugin.cs +++ b/source/ChanSort.Loader.VDR/VdrPlugin.cs @@ -2,12 +2,12 @@ namespace ChanSort.Loader.VDR { - public class SerializerPlugin : ISerializerPlugin + public class VdrPlugin : ISerializerPlugin { public string DllName { get; set; } - public string PluginName { get { return "Linux VDR"; } } - public string FileFilter { get { return "*.conf"; } } - + public string PluginName => "Linux VDR (*.conf)"; + public string FileFilter => "*.conf"; + public SerializerBase CreateSerializer(string inputFile) { return new Serializer(inputFile); diff --git a/source/ChanSort.sln b/source/ChanSort.sln index 7f4bc5b..aad5231 100644 --- a/source/ChanSort.sln +++ b/source/ChanSort.sln @@ -5,14 +5,12 @@ VisualStudioVersion = 16.0.29025.244 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChanSort", "ChanSort\ChanSort.csproj", "{5FAFDABC-A52F-498C-BD2F-AFFC4119797A}" ProjectSection(ProjectDependencies) = postProject - {33897002-0537-49A4-B963-A18D17311B3D} = {33897002-0537-49A4-B963-A18D17311B3D} {74A18C6F-09FF-413E-90D9-827066FA5B36} = {74A18C6F-09FF-413E-90D9-827066FA5B36} {68DA8072-3A29-4076-9F64-D66F38349585} = {68DA8072-3A29-4076-9F64-D66F38349585} {A1C9A98D-368A-44E8-9B7F-7EACA46C9EC5} = {A1C9A98D-368A-44E8-9B7F-7EACA46C9EC5} {F6F02792-07F1-48D5-9AF3-F945CA5E3931} = {F6F02792-07F1-48D5-9AF3-F945CA5E3931} {E972D8A1-2F5F-421C-AC91-CFF45E5191BE} = {E972D8A1-2F5F-421C-AC91-CFF45E5191BE} {4D5AF0A3-1B96-42C8-910D-0C4852EA22F4} = {4D5AF0A3-1B96-42C8-910D-0C4852EA22F4} - {5361C8CB-F737-4709-AF8C-E1F0456F3C5B} = {5361C8CB-F737-4709-AF8C-E1F0456F3C5B} {D093E7EE-D3AD-4E7B-AF82-C6918CA017FB} = {D093E7EE-D3AD-4E7B-AF82-C6918CA017FB} EndProjectSection EndProject @@ -39,33 +37,21 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.Loader.LG", "Test.Load EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChanSort.Loader.VDR", "ChanSort.Loader.VDR\ChanSort.Loader.VDR.csproj", "{74A18C6F-09FF-413E-90D9-827066FA5B36}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChanSort.Loader.GlobalClone", "ChanSort.Loader.GlobalClone\ChanSort.Loader.GlobalClone.csproj", "{5361C8CB-F737-4709-AF8C-E1F0456F3C5B}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChanSort.Loader.SamsungJ", "ChanSort.Loader.SamsungJ\ChanSort.Loader.SamsungJ.csproj", "{33897002-0537-49A4-B963-A18D17311B3D}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChanSort.Loader.Hisense", "ChanSort.Loader.Hisense\ChanSort.Loader.Hisense.csproj", "{D093E7EE-D3AD-4E7B-AF82-C6918CA017FB}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.Loader.Samsung", "Test.Loader.Samsung\Test.Loader.Samsung.csproj", "{1ED68A9B-6698-4609-B9E6-8E08B6055F2E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChanSort.Loader.Hisense2017", "ChanSort.Loader.Hisense2017\ChanSort.Loader.Hisense2017.csproj", "{9282E1DB-CD1F-400A-ACA1-17E0C4562ACF}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChanSort.Loader.SilvaSchneider", "ChanSort.Loader.SilvaSchneider\ChanSort.Loader.SilvaSchneider.csproj", "{E6279FF8-362A-41E6-AC0D-D0861D43F01C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChanSort.Loader.SatcoDX", "ChanSort.Loader.SatcoDX\ChanSort.Loader.SatcoDX.csproj", "{E6279FF8-362A-41E6-AC0D-D0861D43F01C}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChanSort.Loader.Sony", "ChanSort.Loader.Sony\ChanSort.Loader.Sony.csproj", "{70E29C6B-B926-4859-9548-23375BF1E1B5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.Loader.GlobalClone", "Test.Loader.GlobalClone\Test.Loader.GlobalClone.csproj", "{AA31A65D-9437-42AE-89C8-98C7392B450D}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.Loader.Panasonic", "Test.Loader.Panasonic\Test.Loader.Panasonic.csproj", "{D1E4454F-DB09-402D-AD87-1E3BD17266A9}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.Loader.Hisense", "Test.Loader.Hisense\Test.Loader.Hisense.csproj", "{2717DB4C-7E94-4277-A880-FC2571096E74}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.Loader.Hisense2017", "Test.Loader.Hisense2017\Test.Loader.Hisense2017.csproj", "{8D592EB4-3BE2-4D99-8923-FA0794C729ED}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.Loader.Philips", "Test.Loader.Philips\Test.Loader.Philips.csproj", "{0A162099-DA92-426A-AB70-36F88F9E5DC1}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.Loader.SamsungJ", "Test.Loader.SamsungJ\Test.Loader.SamsungJ.csproj", "{902EA731-EBB2-4B18-BE87-256C05277B3E}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.Loader.SilvaSchneider", "Test.Loader.SilvaSchneider\Test.Loader.SilvaSchneider.csproj", "{C0528858-F32D-4C0C-8EC8-CEDB53C01402}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.Loader.SatcoDX", "Test.Loader.SatcoDX\Test.Loader.SatcoDX.csproj", "{C0528858-F32D-4C0C-8EC8-CEDB53C01402}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.Loader.Sony", "Test.Loader.Sony\Test.Loader.Sony.csproj", "{F732435A-0188-456C-8F06-7FBA1842FB35}" EndProject @@ -199,30 +185,6 @@ Global {74A18C6F-09FF-413E-90D9-827066FA5B36}.Release|Mixed Platforms.Build.0 = Release|x86 {74A18C6F-09FF-413E-90D9-827066FA5B36}.Release|x86.ActiveCfg = Release|x86 {74A18C6F-09FF-413E-90D9-827066FA5B36}.Release|x86.Build.0 = Release|x86 - {5361C8CB-F737-4709-AF8C-E1F0456F3C5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5361C8CB-F737-4709-AF8C-E1F0456F3C5B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5361C8CB-F737-4709-AF8C-E1F0456F3C5B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {5361C8CB-F737-4709-AF8C-E1F0456F3C5B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {5361C8CB-F737-4709-AF8C-E1F0456F3C5B}.Debug|x86.ActiveCfg = Debug|x86 - {5361C8CB-F737-4709-AF8C-E1F0456F3C5B}.Debug|x86.Build.0 = Debug|x86 - {5361C8CB-F737-4709-AF8C-E1F0456F3C5B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5361C8CB-F737-4709-AF8C-E1F0456F3C5B}.Release|Any CPU.Build.0 = Release|Any CPU - {5361C8CB-F737-4709-AF8C-E1F0456F3C5B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {5361C8CB-F737-4709-AF8C-E1F0456F3C5B}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {5361C8CB-F737-4709-AF8C-E1F0456F3C5B}.Release|x86.ActiveCfg = Release|x86 - {5361C8CB-F737-4709-AF8C-E1F0456F3C5B}.Release|x86.Build.0 = Release|x86 - {33897002-0537-49A4-B963-A18D17311B3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {33897002-0537-49A4-B963-A18D17311B3D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {33897002-0537-49A4-B963-A18D17311B3D}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 - {33897002-0537-49A4-B963-A18D17311B3D}.Debug|Mixed Platforms.Build.0 = Debug|x86 - {33897002-0537-49A4-B963-A18D17311B3D}.Debug|x86.ActiveCfg = Debug|x86 - {33897002-0537-49A4-B963-A18D17311B3D}.Debug|x86.Build.0 = Debug|x86 - {33897002-0537-49A4-B963-A18D17311B3D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {33897002-0537-49A4-B963-A18D17311B3D}.Release|Any CPU.Build.0 = Release|Any CPU - {33897002-0537-49A4-B963-A18D17311B3D}.Release|Mixed Platforms.ActiveCfg = Release|x86 - {33897002-0537-49A4-B963-A18D17311B3D}.Release|Mixed Platforms.Build.0 = Release|x86 - {33897002-0537-49A4-B963-A18D17311B3D}.Release|x86.ActiveCfg = Release|x86 - {33897002-0537-49A4-B963-A18D17311B3D}.Release|x86.Build.0 = Release|x86 {D093E7EE-D3AD-4E7B-AF82-C6918CA017FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D093E7EE-D3AD-4E7B-AF82-C6918CA017FB}.Debug|Any CPU.Build.0 = Debug|Any CPU {D093E7EE-D3AD-4E7B-AF82-C6918CA017FB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU @@ -247,18 +209,6 @@ Global {1ED68A9B-6698-4609-B9E6-8E08B6055F2E}.Release|Mixed Platforms.Build.0 = Release|Any CPU {1ED68A9B-6698-4609-B9E6-8E08B6055F2E}.Release|x86.ActiveCfg = Release|x86 {1ED68A9B-6698-4609-B9E6-8E08B6055F2E}.Release|x86.Build.0 = Release|x86 - {9282E1DB-CD1F-400A-ACA1-17E0C4562ACF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9282E1DB-CD1F-400A-ACA1-17E0C4562ACF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9282E1DB-CD1F-400A-ACA1-17E0C4562ACF}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 - {9282E1DB-CD1F-400A-ACA1-17E0C4562ACF}.Debug|Mixed Platforms.Build.0 = Debug|x86 - {9282E1DB-CD1F-400A-ACA1-17E0C4562ACF}.Debug|x86.ActiveCfg = Debug|x86 - {9282E1DB-CD1F-400A-ACA1-17E0C4562ACF}.Debug|x86.Build.0 = Debug|x86 - {9282E1DB-CD1F-400A-ACA1-17E0C4562ACF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9282E1DB-CD1F-400A-ACA1-17E0C4562ACF}.Release|Any CPU.Build.0 = Release|Any CPU - {9282E1DB-CD1F-400A-ACA1-17E0C4562ACF}.Release|Mixed Platforms.ActiveCfg = Release|x86 - {9282E1DB-CD1F-400A-ACA1-17E0C4562ACF}.Release|Mixed Platforms.Build.0 = Release|x86 - {9282E1DB-CD1F-400A-ACA1-17E0C4562ACF}.Release|x86.ActiveCfg = Release|x86 - {9282E1DB-CD1F-400A-ACA1-17E0C4562ACF}.Release|x86.Build.0 = Release|x86 {E6279FF8-362A-41E6-AC0D-D0861D43F01C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E6279FF8-362A-41E6-AC0D-D0861D43F01C}.Debug|Any CPU.Build.0 = Debug|Any CPU {E6279FF8-362A-41E6-AC0D-D0861D43F01C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU @@ -283,18 +233,6 @@ Global {70E29C6B-B926-4859-9548-23375BF1E1B5}.Release|Mixed Platforms.Build.0 = Release|Any CPU {70E29C6B-B926-4859-9548-23375BF1E1B5}.Release|x86.ActiveCfg = Release|x86 {70E29C6B-B926-4859-9548-23375BF1E1B5}.Release|x86.Build.0 = Release|x86 - {AA31A65D-9437-42AE-89C8-98C7392B450D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AA31A65D-9437-42AE-89C8-98C7392B450D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AA31A65D-9437-42AE-89C8-98C7392B450D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {AA31A65D-9437-42AE-89C8-98C7392B450D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {AA31A65D-9437-42AE-89C8-98C7392B450D}.Debug|x86.ActiveCfg = Debug|x86 - {AA31A65D-9437-42AE-89C8-98C7392B450D}.Debug|x86.Build.0 = Debug|x86 - {AA31A65D-9437-42AE-89C8-98C7392B450D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AA31A65D-9437-42AE-89C8-98C7392B450D}.Release|Any CPU.Build.0 = Release|Any CPU - {AA31A65D-9437-42AE-89C8-98C7392B450D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {AA31A65D-9437-42AE-89C8-98C7392B450D}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {AA31A65D-9437-42AE-89C8-98C7392B450D}.Release|x86.ActiveCfg = Release|x86 - {AA31A65D-9437-42AE-89C8-98C7392B450D}.Release|x86.Build.0 = Release|x86 {D1E4454F-DB09-402D-AD87-1E3BD17266A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D1E4454F-DB09-402D-AD87-1E3BD17266A9}.Debug|Any CPU.Build.0 = Debug|Any CPU {D1E4454F-DB09-402D-AD87-1E3BD17266A9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU @@ -319,18 +257,6 @@ Global {2717DB4C-7E94-4277-A880-FC2571096E74}.Release|Mixed Platforms.Build.0 = Release|Any CPU {2717DB4C-7E94-4277-A880-FC2571096E74}.Release|x86.ActiveCfg = Release|x86 {2717DB4C-7E94-4277-A880-FC2571096E74}.Release|x86.Build.0 = Release|x86 - {8D592EB4-3BE2-4D99-8923-FA0794C729ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8D592EB4-3BE2-4D99-8923-FA0794C729ED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8D592EB4-3BE2-4D99-8923-FA0794C729ED}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {8D592EB4-3BE2-4D99-8923-FA0794C729ED}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {8D592EB4-3BE2-4D99-8923-FA0794C729ED}.Debug|x86.ActiveCfg = Debug|x86 - {8D592EB4-3BE2-4D99-8923-FA0794C729ED}.Debug|x86.Build.0 = Debug|x86 - {8D592EB4-3BE2-4D99-8923-FA0794C729ED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8D592EB4-3BE2-4D99-8923-FA0794C729ED}.Release|Any CPU.Build.0 = Release|Any CPU - {8D592EB4-3BE2-4D99-8923-FA0794C729ED}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {8D592EB4-3BE2-4D99-8923-FA0794C729ED}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {8D592EB4-3BE2-4D99-8923-FA0794C729ED}.Release|x86.ActiveCfg = Release|x86 - {8D592EB4-3BE2-4D99-8923-FA0794C729ED}.Release|x86.Build.0 = Release|x86 {0A162099-DA92-426A-AB70-36F88F9E5DC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0A162099-DA92-426A-AB70-36F88F9E5DC1}.Debug|Any CPU.Build.0 = Debug|Any CPU {0A162099-DA92-426A-AB70-36F88F9E5DC1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU @@ -343,18 +269,6 @@ Global {0A162099-DA92-426A-AB70-36F88F9E5DC1}.Release|Mixed Platforms.Build.0 = Release|Any CPU {0A162099-DA92-426A-AB70-36F88F9E5DC1}.Release|x86.ActiveCfg = Release|x86 {0A162099-DA92-426A-AB70-36F88F9E5DC1}.Release|x86.Build.0 = Release|x86 - {902EA731-EBB2-4B18-BE87-256C05277B3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {902EA731-EBB2-4B18-BE87-256C05277B3E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {902EA731-EBB2-4B18-BE87-256C05277B3E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {902EA731-EBB2-4B18-BE87-256C05277B3E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {902EA731-EBB2-4B18-BE87-256C05277B3E}.Debug|x86.ActiveCfg = Debug|x86 - {902EA731-EBB2-4B18-BE87-256C05277B3E}.Debug|x86.Build.0 = Debug|x86 - {902EA731-EBB2-4B18-BE87-256C05277B3E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {902EA731-EBB2-4B18-BE87-256C05277B3E}.Release|Any CPU.Build.0 = Release|Any CPU - {902EA731-EBB2-4B18-BE87-256C05277B3E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {902EA731-EBB2-4B18-BE87-256C05277B3E}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {902EA731-EBB2-4B18-BE87-256C05277B3E}.Release|x86.ActiveCfg = Release|x86 - {902EA731-EBB2-4B18-BE87-256C05277B3E}.Release|x86.Build.0 = Release|x86 {C0528858-F32D-4C0C-8EC8-CEDB53C01402}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C0528858-F32D-4C0C-8EC8-CEDB53C01402}.Debug|Any CPU.Build.0 = Debug|Any CPU {C0528858-F32D-4C0C-8EC8-CEDB53C01402}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU diff --git a/source/ChanSort/ChanSort.csproj b/source/ChanSort/ChanSort.csproj index 0cb4ade..d068f7f 100644 --- a/source/ChanSort/ChanSort.csproj +++ b/source/ChanSort/ChanSort.csproj @@ -482,14 +482,6 @@ {DCCFFA08-472B-4D17-BB90-8F513FC01392} ChanSort.Api - - {5361c8cb-f737-4709-af8c-e1f0456f3c5b} - ChanSort.Loader.GlobalClone - - - {9282e1db-cd1f-400a-aca1-17e0c4562acf} - ChanSort.Loader.Hisense2017 - {d093e7ee-d3ad-4e7b-af82-c6918ca017fb} ChanSort.Loader.Hisense @@ -510,18 +502,10 @@ {1f52b5ec-a2f1-4e53-9e1a-4658296c5bb5} ChanSort.Loader.Philips - - {33897002-0537-49a4-b963-a18d17311b3d} - ChanSort.Loader.SamsungJ - {a1c9a98d-368a-44e8-9b7f-7eaca46c9ec5} ChanSort.Loader.Samsung - - {e6279ff8-362a-41e6-ac0d-d0861d43f01c} - ChanSort.Loader.SilvaSchneider - {70e29c6b-b926-4859-9548-23375bf1e1b5} ChanSort.Loader.Sony diff --git a/source/Test.Loader.GlobalClone/Properties/AssemblyInfo.cs b/source/Test.Loader.GlobalClone/Properties/AssemblyInfo.cs deleted file mode 100644 index a9c5616..0000000 --- a/source/Test.Loader.GlobalClone/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("Test.Loader.GlobalClone")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Test.Loader.GlobalClone")] -[assembly: AssemblyCopyright("Copyright © 2019")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -[assembly: ComVisible(false)] - -[assembly: Guid("aa31a65d-9437-42ae-89c8-98c7392b450d")] - -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/source/Test.Loader.GlobalClone/Test.Loader.GlobalClone.csproj b/source/Test.Loader.GlobalClone/Test.Loader.GlobalClone.csproj deleted file mode 100644 index 0a71e29..0000000 --- a/source/Test.Loader.GlobalClone/Test.Loader.GlobalClone.csproj +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - Debug - AnyCPU - {AA31A65D-9437-42AE-89C8-98C7392B450D} - Library - Properties - Test.Loader.GlobalClone - Test.Loader.GlobalClone - v4.8 - 512 - {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 15.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages - False - UnitTest - - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - true - ..\Debug\ - DEBUG;TRACE - full - x86 - prompt - MinimumRecommendedRules.ruleset - - - bin\x86\Release\ - TRACE - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - - - - False - - - ..\packages\NUnit.3.12.0\lib\net45\nunit.framework.dll - - - - - - - - - - - - - - - - - - - {dccffa08-472b-4d17-bb90-8f513fc01392} - ChanSort.Api - - - {5361c8cb-f737-4709-af8c-e1f0456f3c5b} - ChanSort.Loader.GlobalClone - - - {68cfcb2f-b52a-43a1-aa5c-5d64a1d655d2} - Test.Loader - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - \ No newline at end of file diff --git a/source/Test.Loader.GlobalClone/Test.Loader.GlobalClone.csproj.DotSettings b/source/Test.Loader.GlobalClone/Test.Loader.GlobalClone.csproj.DotSettings deleted file mode 100644 index 90b4104..0000000 --- a/source/Test.Loader.GlobalClone/Test.Loader.GlobalClone.csproj.DotSettings +++ /dev/null @@ -1,2 +0,0 @@ - - True \ No newline at end of file diff --git a/source/Test.Loader.GlobalClone/packages.config b/source/Test.Loader.GlobalClone/packages.config deleted file mode 100644 index ec5e459..0000000 --- a/source/Test.Loader.GlobalClone/packages.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/source/Test.Loader.Hisense/HisenseChannelDbTest.cs b/source/Test.Loader.Hisense/ChannelDb/HisenseChannelDbTest.cs similarity index 93% rename from source/Test.Loader.Hisense/HisenseChannelDbTest.cs rename to source/Test.Loader.Hisense/ChannelDb/HisenseChannelDbTest.cs index 094cbaa..a554d00 100644 --- a/source/Test.Loader.Hisense/HisenseChannelDbTest.cs +++ b/source/Test.Loader.Hisense/ChannelDb/HisenseChannelDbTest.cs @@ -3,7 +3,7 @@ using ChanSort.Api; using ChanSort.Loader.Hisense; using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace Test.Loader.Hisense +namespace Test.Loader.Hisense.ChannelDb { [TestClass] public class HisenseChannelDbTest @@ -29,8 +29,8 @@ namespace Test.Loader.Hisense #region TestChannelsAddedToCorrectList private void TestChannelsAddedToCorrectLists(string fileName, SignalSource signalSource, int expectedTotal, int expectedTv, int expectedRadio, int dataProgramSid, string dataProgramName) { - var tempFile = TestUtils.DeploymentItem("Test.Loader.Hisense\\TestFiles\\" + fileName); - var plugin = new HisDbSerializerPlugin(); + var tempFile = TestUtils.DeploymentItem("Test.Loader.Hisense\\ChannelDb\\TestFiles\\" + fileName); + var plugin = new HisensePlugin(); var ser = plugin.CreateSerializer(tempFile); ser.Load(); @@ -54,8 +54,8 @@ namespace Test.Loader.Hisense [TestMethod] public void TestDeletingChannel() { - var tempFile = TestUtils.DeploymentItem("Test.Loader.Hisense\\TestFiles\\channel.db"); - var plugin = new HisDbSerializerPlugin(); + var tempFile = TestUtils.DeploymentItem("Test.Loader.Hisense\\ChannelDb\\TestFiles\\channel.db"); + var plugin = new HisensePlugin(); var ser = plugin.CreateSerializer(tempFile); ser.Load(); var data = ser.DataRoot; diff --git a/source/Test.Loader.Hisense/TestFiles/channel.db b/source/Test.Loader.Hisense/ChannelDb/TestFiles/channel.db similarity index 100% rename from source/Test.Loader.Hisense/TestFiles/channel.db rename to source/Test.Loader.Hisense/ChannelDb/TestFiles/channel.db diff --git a/source/Test.Loader.Hisense2017/HisenseServicelistDbTest.cs b/source/Test.Loader.Hisense/ServicelistDb/HisenseServicelistDbTest.cs similarity index 92% rename from source/Test.Loader.Hisense2017/HisenseServicelistDbTest.cs rename to source/Test.Loader.Hisense/ServicelistDb/HisenseServicelistDbTest.cs index 7e96bbc..e71f46d 100644 --- a/source/Test.Loader.Hisense2017/HisenseServicelistDbTest.cs +++ b/source/Test.Loader.Hisense/ServicelistDb/HisenseServicelistDbTest.cs @@ -1,12 +1,10 @@ -using System.IO; -using System.Linq; -using System.Reflection; +using System.Linq; using ChanSort.Api; -using ChanSort.Loader.Hisense2017; +using ChanSort.Loader.Hisense; using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace Test.Loader.Hisense2017 +namespace Test.Loader.Hisense.ServicelistDb { [TestClass] public class HisenseServicelistDbTest @@ -32,7 +30,7 @@ namespace Test.Loader.Hisense2017 private void TestChannelsAddedToCorrectLists(string fileName, string listCaption, int expectedTotal, int expectedTv, int expectedRadio) { var tempFile = TestUtils.DeploymentItem("Test.Loader.Hisense2017\\TestFiles\\" + fileName); - var plugin = new HisDbSerializerPlugin(); + var plugin = new HisensePlugin(); var ser = plugin.CreateSerializer(tempFile); ser.Load(); @@ -54,7 +52,7 @@ namespace Test.Loader.Hisense2017 public void TestDeletingChannel() { var tempFile = TestUtils.DeploymentItem("Test.Loader.Hisense2017\\TestFiles\\servicelist.db"); - var plugin = new HisDbSerializerPlugin(); + var plugin = new HisensePlugin(); var ser = plugin.CreateSerializer(tempFile); ser.Load(); var data = ser.DataRoot; diff --git a/source/Test.Loader.Hisense2017/TestFiles/servicelist.db b/source/Test.Loader.Hisense/ServicelistDb/TestFiles/servicelist.db similarity index 100% rename from source/Test.Loader.Hisense2017/TestFiles/servicelist.db rename to source/Test.Loader.Hisense/ServicelistDb/TestFiles/servicelist.db diff --git a/source/Test.Loader.Hisense/Test.Loader.Hisense.csproj b/source/Test.Loader.Hisense/Test.Loader.Hisense.csproj index 35c1415..4f44719 100644 --- a/source/Test.Loader.Hisense/Test.Loader.Hisense.csproj +++ b/source/Test.Loader.Hisense/Test.Loader.Hisense.csproj @@ -68,12 +68,14 @@ - + + - + + diff --git a/source/Test.Loader.Hisense2017/Properties/AssemblyInfo.cs b/source/Test.Loader.Hisense2017/Properties/AssemblyInfo.cs deleted file mode 100644 index ac6df41..0000000 --- a/source/Test.Loader.Hisense2017/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("Test.Loader.Hisense2017")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Test.Loader.Hisense2017")] -[assembly: AssemblyCopyright("Copyright © 2019")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -[assembly: ComVisible(false)] - -[assembly: Guid("8d592eb4-3be2-4d99-8923-fa0794c729ed")] - -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/source/Test.Loader.Hisense2017/Test.Loader.Hisense2017.csproj b/source/Test.Loader.Hisense2017/Test.Loader.Hisense2017.csproj deleted file mode 100644 index d445f8a..0000000 --- a/source/Test.Loader.Hisense2017/Test.Loader.Hisense2017.csproj +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - Debug - AnyCPU - {8D592EB4-3BE2-4D99-8923-FA0794C729ED} - Library - Properties - Test.Loader.Hisense2017 - Test.Loader.Hisense2017 - v4.8 - 512 - {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 15.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages - False - UnitTest - - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - true - ..\Debug\ - DEBUG;TRACE - full - x86 - prompt - MinimumRecommendedRules.ruleset - - - bin\x86\Release\ - TRACE - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - - - - ..\packages\MSTest.TestFramework.1.3.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll - - - ..\packages\MSTest.TestFramework.1.3.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll - - - - - - - - - - - - - - - {dccffa08-472b-4d17-bb90-8f513fc01392} - ChanSort.Api - - - {9282e1db-cd1f-400a-aca1-17e0c4562acf} - ChanSort.Loader.Hisense2017 - - - {68cfcb2f-b52a-43a1-aa5c-5d64a1d655d2} - Test.Loader - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - \ No newline at end of file diff --git a/source/Test.Loader.LG/CS/TestCS.cs b/source/Test.Loader.LG/Binary/CS/TestCS.cs similarity index 90% rename from source/Test.Loader.LG/CS/TestCS.cs rename to source/Test.Loader.LG/Binary/CS/TestCS.cs index 9addce4..9d59a41 100644 --- a/source/Test.Loader.LG/CS/TestCS.cs +++ b/source/Test.Loader.LG/Binary/CS/TestCS.cs @@ -1,6 +1,6 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace Test.Loader.LG +namespace Test.Loader.LG.Binary { [TestClass] public class TestCS : TestBase diff --git a/source/Test.Loader.LG/CS/xxCS460S-ZA00001.TLL.in b/source/Test.Loader.LG/Binary/CS/xxCS460S-ZA00001.TLL.in similarity index 100% rename from source/Test.Loader.LG/CS/xxCS460S-ZA00001.TLL.in rename to source/Test.Loader.LG/Binary/CS/xxCS460S-ZA00001.TLL.in diff --git a/source/Test.Loader.LG/CS/xxCS460S-ZA00001.TLL.out b/source/Test.Loader.LG/Binary/CS/xxCS460S-ZA00001.TLL.out similarity index 100% rename from source/Test.Loader.LG/CS/xxCS460S-ZA00001.TLL.out rename to source/Test.Loader.LG/Binary/CS/xxCS460S-ZA00001.TLL.out diff --git a/source/Test.Loader.LG/CS/xxCS460S-ZA00001.csv.in b/source/Test.Loader.LG/Binary/CS/xxCS460S-ZA00001.csv.in similarity index 100% rename from source/Test.Loader.LG/CS/xxCS460S-ZA00001.csv.in rename to source/Test.Loader.LG/Binary/CS/xxCS460S-ZA00001.csv.in diff --git a/source/Test.Loader.LG/DM/TestDM.cs b/source/Test.Loader.LG/Binary/DM/TestDM.cs similarity index 88% rename from source/Test.Loader.LG/DM/TestDM.cs rename to source/Test.Loader.LG/Binary/DM/TestDM.cs index 775dc81..7cda671 100644 --- a/source/Test.Loader.LG/DM/TestDM.cs +++ b/source/Test.Loader.LG/Binary/DM/TestDM.cs @@ -1,6 +1,6 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace Test.Loader.LG +namespace Test.Loader.LG.Binary { [TestClass] public class TestDM : TestBase diff --git a/source/Test.Loader.LG/DM/xx2350D-PZM00001.TLL.in b/source/Test.Loader.LG/Binary/DM/xx2350D-PZM00001.TLL.in similarity index 100% rename from source/Test.Loader.LG/DM/xx2350D-PZM00001.TLL.in rename to source/Test.Loader.LG/Binary/DM/xx2350D-PZM00001.TLL.in diff --git a/source/Test.Loader.LG/DM/xx2350D-PZM00001.TLL.out b/source/Test.Loader.LG/Binary/DM/xx2350D-PZM00001.TLL.out similarity index 100% rename from source/Test.Loader.LG/DM/xx2350D-PZM00001.TLL.out rename to source/Test.Loader.LG/Binary/DM/xx2350D-PZM00001.TLL.out diff --git a/source/Test.Loader.LG/DM/xx2350D-PZM00001.csv.in b/source/Test.Loader.LG/Binary/DM/xx2350D-PZM00001.csv.in similarity index 100% rename from source/Test.Loader.LG/DM/xx2350D-PZM00001.csv.in rename to source/Test.Loader.LG/Binary/DM/xx2350D-PZM00001.csv.in diff --git a/source/Test.Loader.LG/DvbsCleanup/TestDvbsCleanup.cs b/source/Test.Loader.LG/Binary/DvbsCleanup/TestDvbsCleanup.cs similarity index 86% rename from source/Test.Loader.LG/DvbsCleanup/TestDvbsCleanup.cs rename to source/Test.Loader.LG/Binary/DvbsCleanup/TestDvbsCleanup.cs index e779dd7..3b68ee7 100644 --- a/source/Test.Loader.LG/DvbsCleanup/TestDvbsCleanup.cs +++ b/source/Test.Loader.LG/Binary/DvbsCleanup/TestDvbsCleanup.cs @@ -1,8 +1,9 @@ using System.IO; using ChanSort.Loader.LG; +using ChanSort.Loader.LG.Binary; using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace Test.Loader.LG +namespace Test.Loader.LG.Binary { [TestClass] public class TestDvbsCleanup : TestBase @@ -36,13 +37,13 @@ namespace Test.Loader.LG { // copy required input and assertion files TestUtils.DeploymentItem("ChanSort.Loader.LG\\ChanSort.Loader.LG.ini"); - TestUtils.DeploymentItem("Test.Loader.LG\\" + modelAndBaseName + ".TLL.in"); - TestUtils.DeploymentItem("Test.Loader.LG\\" + modelAndBaseName + ".TLL.out"); + TestUtils.DeploymentItem("Test.Loader.LG\\Binary\\" + modelAndBaseName + ".TLL.in"); + TestUtils.DeploymentItem("Test.Loader.LG\\Binary\\" + modelAndBaseName + ".TLL.out"); var baseName = Path.GetFileNameWithoutExtension(modelAndBaseName); // load the TLL file - TllFileSerializerPlugin plugin = new TllFileSerializerPlugin(); + var plugin = new LgPlugin(); var serializer = (TllFileSerializer)plugin.CreateSerializer(baseName + ".TLL.in"); serializer.IsTesting = true; serializer.Load(); diff --git a/source/Test.Loader.LG/DvbsCleanup/xxLM620S-ZE00001.TLL.in b/source/Test.Loader.LG/Binary/DvbsCleanup/xxLM620S-ZE00001.TLL.in similarity index 100% rename from source/Test.Loader.LG/DvbsCleanup/xxLM620S-ZE00001.TLL.in rename to source/Test.Loader.LG/Binary/DvbsCleanup/xxLM620S-ZE00001.TLL.in diff --git a/source/Test.Loader.LG/DvbsCleanup/xxLM620S-ZE00001.TLL.out b/source/Test.Loader.LG/Binary/DvbsCleanup/xxLM620S-ZE00001.TLL.out similarity index 100% rename from source/Test.Loader.LG/DvbsCleanup/xxLM620S-ZE00001.TLL.out rename to source/Test.Loader.LG/Binary/DvbsCleanup/xxLM620S-ZE00001.TLL.out diff --git a/source/Test.Loader.LG/DvbsCleanup/xxLM620S-ZE00001.csv.in b/source/Test.Loader.LG/Binary/DvbsCleanup/xxLM620S-ZE00001.csv.in similarity index 100% rename from source/Test.Loader.LG/DvbsCleanup/xxLM620S-ZE00001.csv.in rename to source/Test.Loader.LG/Binary/DvbsCleanup/xxLM620S-ZE00001.csv.in diff --git a/source/Test.Loader.LG/DvbsCleanup/xxLM640T-ZA00000.TLL.in b/source/Test.Loader.LG/Binary/DvbsCleanup/xxLM640T-ZA00000.TLL.in similarity index 100% rename from source/Test.Loader.LG/DvbsCleanup/xxLM640T-ZA00000.TLL.in rename to source/Test.Loader.LG/Binary/DvbsCleanup/xxLM640T-ZA00000.TLL.in diff --git a/source/Test.Loader.LG/DvbsCleanup/xxLM640T-ZA00000.TLL.out b/source/Test.Loader.LG/Binary/DvbsCleanup/xxLM640T-ZA00000.TLL.out similarity index 100% rename from source/Test.Loader.LG/DvbsCleanup/xxLM640T-ZA00000.TLL.out rename to source/Test.Loader.LG/Binary/DvbsCleanup/xxLM640T-ZA00000.TLL.out diff --git a/source/Test.Loader.LG/DvbsCleanup/xxLM640T-ZA00000.csv.in b/source/Test.Loader.LG/Binary/DvbsCleanup/xxLM640T-ZA00000.csv.in similarity index 100% rename from source/Test.Loader.LG/DvbsCleanup/xxLM640T-ZA00000.csv.in rename to source/Test.Loader.LG/Binary/DvbsCleanup/xxLM640T-ZA00000.csv.in diff --git a/source/Test.Loader.LG/DvbsCleanup/xxLM860V-ZB99998.TLL.in b/source/Test.Loader.LG/Binary/DvbsCleanup/xxLM860V-ZB99998.TLL.in similarity index 100% rename from source/Test.Loader.LG/DvbsCleanup/xxLM860V-ZB99998.TLL.in rename to source/Test.Loader.LG/Binary/DvbsCleanup/xxLM860V-ZB99998.TLL.in diff --git a/source/Test.Loader.LG/DvbsCleanup/xxLM860V-ZB99998.TLL.out b/source/Test.Loader.LG/Binary/DvbsCleanup/xxLM860V-ZB99998.TLL.out similarity index 100% rename from source/Test.Loader.LG/DvbsCleanup/xxLM860V-ZB99998.TLL.out rename to source/Test.Loader.LG/Binary/DvbsCleanup/xxLM860V-ZB99998.TLL.out diff --git a/source/Test.Loader.LG/DvbsCleanup/xxLM860V-ZB99998.csv.in b/source/Test.Loader.LG/Binary/DvbsCleanup/xxLM860V-ZB99998.csv.in similarity index 100% rename from source/Test.Loader.LG/DvbsCleanup/xxLM860V-ZB99998.csv.in rename to source/Test.Loader.LG/Binary/DvbsCleanup/xxLM860V-ZB99998.csv.in diff --git a/source/Test.Loader.LG/LA/TestLA.cs b/source/Test.Loader.LG/Binary/LA/TestLA.cs similarity index 95% rename from source/Test.Loader.LG/LA/TestLA.cs rename to source/Test.Loader.LG/Binary/LA/TestLA.cs index 120a77d..44b1b92 100644 --- a/source/Test.Loader.LG/LA/TestLA.cs +++ b/source/Test.Loader.LG/Binary/LA/TestLA.cs @@ -1,6 +1,6 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace Test.Loader.LG +namespace Test.Loader.LG.Binary { [TestClass] public class TestLA : TestBase diff --git a/source/Test.Loader.LG/LA/xxLA691S-ZA00004.TLL.in b/source/Test.Loader.LG/Binary/LA/xxLA691S-ZA00004.TLL.in similarity index 100% rename from source/Test.Loader.LG/LA/xxLA691S-ZA00004.TLL.in rename to source/Test.Loader.LG/Binary/LA/xxLA691S-ZA00004.TLL.in diff --git a/source/Test.Loader.LG/LA/xxLA691S-ZA00004.TLL.out b/source/Test.Loader.LG/Binary/LA/xxLA691S-ZA00004.TLL.out similarity index 100% rename from source/Test.Loader.LG/LA/xxLA691S-ZA00004.TLL.out rename to source/Test.Loader.LG/Binary/LA/xxLA691S-ZA00004.TLL.out diff --git a/source/Test.Loader.LG/LA/xxLA691S-ZA00004.csv.in b/source/Test.Loader.LG/Binary/LA/xxLA691S-ZA00004.csv.in similarity index 100% rename from source/Test.Loader.LG/LA/xxLA691S-ZA00004.csv.in rename to source/Test.Loader.LG/Binary/LA/xxLA691S-ZA00004.csv.in diff --git a/source/Test.Loader.LG/LA/xxLA7408-ZB00001.TLL.in b/source/Test.Loader.LG/Binary/LA/xxLA7408-ZB00001.TLL.in similarity index 100% rename from source/Test.Loader.LG/LA/xxLA7408-ZB00001.TLL.in rename to source/Test.Loader.LG/Binary/LA/xxLA7408-ZB00001.TLL.in diff --git a/source/Test.Loader.LG/LA/xxLA7408-ZB00001.TLL.out b/source/Test.Loader.LG/Binary/LA/xxLA7408-ZB00001.TLL.out similarity index 100% rename from source/Test.Loader.LG/LA/xxLA7408-ZB00001.TLL.out rename to source/Test.Loader.LG/Binary/LA/xxLA7408-ZB00001.TLL.out diff --git a/source/Test.Loader.LG/LA/xxLA7408-ZB00001.csv.in b/source/Test.Loader.LG/Binary/LA/xxLA7408-ZB00001.csv.in similarity index 100% rename from source/Test.Loader.LG/LA/xxLA7408-ZB00001.csv.in rename to source/Test.Loader.LG/Binary/LA/xxLA7408-ZB00001.csv.in diff --git a/source/Test.Loader.LG/LA/xxLA7408-ZB00002.TLL.in b/source/Test.Loader.LG/Binary/LA/xxLA7408-ZB00002.TLL.in similarity index 100% rename from source/Test.Loader.LG/LA/xxLA7408-ZB00002.TLL.in rename to source/Test.Loader.LG/Binary/LA/xxLA7408-ZB00002.TLL.in diff --git a/source/Test.Loader.LG/LA/xxLA7408-ZB00002.TLL.out b/source/Test.Loader.LG/Binary/LA/xxLA7408-ZB00002.TLL.out similarity index 100% rename from source/Test.Loader.LG/LA/xxLA7408-ZB00002.TLL.out rename to source/Test.Loader.LG/Binary/LA/xxLA7408-ZB00002.TLL.out diff --git a/source/Test.Loader.LG/LA/xxLA7408-ZB00002.csv.in b/source/Test.Loader.LG/Binary/LA/xxLA7408-ZB00002.csv.in similarity index 100% rename from source/Test.Loader.LG/LA/xxLA7408-ZB00002.csv.in rename to source/Test.Loader.LG/Binary/LA/xxLA7408-ZB00002.csv.in diff --git a/source/Test.Loader.LG/LD/TestLD.cs b/source/Test.Loader.LG/Binary/LD/TestLD.cs similarity index 90% rename from source/Test.Loader.LG/LD/TestLD.cs rename to source/Test.Loader.LG/Binary/LD/TestLD.cs index ad8fc6f..bbffb21 100644 --- a/source/Test.Loader.LG/LD/TestLD.cs +++ b/source/Test.Loader.LG/Binary/LD/TestLD.cs @@ -1,6 +1,6 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace Test.Loader.LG +namespace Test.Loader.LG.Binary { [TestClass] public class TestLD : TestBase diff --git a/source/Test.Loader.LG/LD/xxLD750-ZA00001.TLL.in b/source/Test.Loader.LG/Binary/LD/xxLD750-ZA00001.TLL.in similarity index 100% rename from source/Test.Loader.LG/LD/xxLD750-ZA00001.TLL.in rename to source/Test.Loader.LG/Binary/LD/xxLD750-ZA00001.TLL.in diff --git a/source/Test.Loader.LG/LD/xxLD750-ZA00001.TLL.out b/source/Test.Loader.LG/Binary/LD/xxLD750-ZA00001.TLL.out similarity index 100% rename from source/Test.Loader.LG/LD/xxLD750-ZA00001.TLL.out rename to source/Test.Loader.LG/Binary/LD/xxLD750-ZA00001.TLL.out diff --git a/source/Test.Loader.LG/LD/xxLD750-ZA00001.csv.in b/source/Test.Loader.LG/Binary/LD/xxLD750-ZA00001.csv.in similarity index 100% rename from source/Test.Loader.LG/LD/xxLD750-ZA00001.csv.in rename to source/Test.Loader.LG/Binary/LD/xxLD750-ZA00001.csv.in diff --git a/source/Test.Loader.LG/LE/TestLE.cs b/source/Test.Loader.LG/Binary/LE/TestLE.cs similarity index 90% rename from source/Test.Loader.LG/LE/TestLE.cs rename to source/Test.Loader.LG/Binary/LE/TestLE.cs index 59825a1..fb1c8fd 100644 --- a/source/Test.Loader.LG/LE/TestLE.cs +++ b/source/Test.Loader.LG/Binary/LE/TestLE.cs @@ -1,6 +1,6 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace Test.Loader.LG +namespace Test.Loader.LG.Binary { [TestClass] public class TestLE : TestBase diff --git a/source/Test.Loader.LG/LE/xxLE5500-ZA00002.TLL.in b/source/Test.Loader.LG/Binary/LE/xxLE5500-ZA00002.TLL.in similarity index 100% rename from source/Test.Loader.LG/LE/xxLE5500-ZA00002.TLL.in rename to source/Test.Loader.LG/Binary/LE/xxLE5500-ZA00002.TLL.in diff --git a/source/Test.Loader.LG/LE/xxLE5500-ZA00002.TLL.out b/source/Test.Loader.LG/Binary/LE/xxLE5500-ZA00002.TLL.out similarity index 100% rename from source/Test.Loader.LG/LE/xxLE5500-ZA00002.TLL.out rename to source/Test.Loader.LG/Binary/LE/xxLE5500-ZA00002.TLL.out diff --git a/source/Test.Loader.LG/LE/xxLE5500-ZA00002.csv.in b/source/Test.Loader.LG/Binary/LE/xxLE5500-ZA00002.csv.in similarity index 100% rename from source/Test.Loader.LG/LE/xxLE5500-ZA00002.csv.in rename to source/Test.Loader.LG/Binary/LE/xxLE5500-ZA00002.csv.in diff --git a/source/Test.Loader.LG/LH/TestLH.cs b/source/Test.Loader.LG/Binary/LH/TestLH.cs similarity index 93% rename from source/Test.Loader.LG/LH/TestLH.cs rename to source/Test.Loader.LG/Binary/LH/TestLH.cs index d0c1e02..00c5b95 100644 --- a/source/Test.Loader.LG/LH/TestLH.cs +++ b/source/Test.Loader.LG/Binary/LH/TestLH.cs @@ -1,6 +1,6 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace Test.Loader.LG +namespace Test.Loader.LG.Binary { [TestClass] public class TestLH : TestBase diff --git a/source/Test.Loader.LG/LH/xxLH3000-ZA00002.TLL.in b/source/Test.Loader.LG/Binary/LH/xxLH3000-ZA00002.TLL.in similarity index 100% rename from source/Test.Loader.LG/LH/xxLH3000-ZA00002.TLL.in rename to source/Test.Loader.LG/Binary/LH/xxLH3000-ZA00002.TLL.in diff --git a/source/Test.Loader.LG/LH/xxLH3000-ZA00002.TLL.out b/source/Test.Loader.LG/Binary/LH/xxLH3000-ZA00002.TLL.out similarity index 100% rename from source/Test.Loader.LG/LH/xxLH3000-ZA00002.TLL.out rename to source/Test.Loader.LG/Binary/LH/xxLH3000-ZA00002.TLL.out diff --git a/source/Test.Loader.LG/LH/xxLH3000-ZA00002.csv.in b/source/Test.Loader.LG/Binary/LH/xxLH3000-ZA00002.csv.in similarity index 100% rename from source/Test.Loader.LG/LH/xxLH3000-ZA00002.csv.in rename to source/Test.Loader.LG/Binary/LH/xxLH3000-ZA00002.csv.in diff --git a/source/Test.Loader.LG/LH/xxLH5000-ZB00002.TLL.in b/source/Test.Loader.LG/Binary/LH/xxLH5000-ZB00002.TLL.in similarity index 100% rename from source/Test.Loader.LG/LH/xxLH5000-ZB00002.TLL.in rename to source/Test.Loader.LG/Binary/LH/xxLH5000-ZB00002.TLL.in diff --git a/source/Test.Loader.LG/LH/xxLH5000-ZB00002.TLL.out b/source/Test.Loader.LG/Binary/LH/xxLH5000-ZB00002.TLL.out similarity index 100% rename from source/Test.Loader.LG/LH/xxLH5000-ZB00002.TLL.out rename to source/Test.Loader.LG/Binary/LH/xxLH5000-ZB00002.TLL.out diff --git a/source/Test.Loader.LG/LH/xxLH5000-ZB00002.csv.in b/source/Test.Loader.LG/Binary/LH/xxLH5000-ZB00002.csv.in similarity index 100% rename from source/Test.Loader.LG/LH/xxLH5000-ZB00002.csv.in rename to source/Test.Loader.LG/Binary/LH/xxLH5000-ZB00002.csv.in diff --git a/source/Test.Loader.LG/LK/TestLK.cs b/source/Test.Loader.LG/Binary/LK/TestLK.cs similarity index 93% rename from source/Test.Loader.LG/LK/TestLK.cs rename to source/Test.Loader.LG/Binary/LK/TestLK.cs index f91eb5c..e08f50a 100644 --- a/source/Test.Loader.LG/LK/TestLK.cs +++ b/source/Test.Loader.LG/Binary/LK/TestLK.cs @@ -1,6 +1,6 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace Test.Loader.LG +namespace Test.Loader.LG.Binary { [TestClass] public class TestLK : TestBase diff --git a/source/Test.Loader.LG/LK/xxLK450-ZB00001.TLL.in b/source/Test.Loader.LG/Binary/LK/xxLK450-ZB00001.TLL.in similarity index 100% rename from source/Test.Loader.LG/LK/xxLK450-ZB00001.TLL.in rename to source/Test.Loader.LG/Binary/LK/xxLK450-ZB00001.TLL.in diff --git a/source/Test.Loader.LG/LK/xxLK450-ZB00001.TLL.out b/source/Test.Loader.LG/Binary/LK/xxLK450-ZB00001.TLL.out similarity index 100% rename from source/Test.Loader.LG/LK/xxLK450-ZB00001.TLL.out rename to source/Test.Loader.LG/Binary/LK/xxLK450-ZB00001.TLL.out diff --git a/source/Test.Loader.LG/LK/xxLK450-ZB00001.csv.in b/source/Test.Loader.LG/Binary/LK/xxLK450-ZB00001.csv.in similarity index 100% rename from source/Test.Loader.LG/LK/xxLK450-ZB00001.csv.in rename to source/Test.Loader.LG/Binary/LK/xxLK450-ZB00001.csv.in diff --git a/source/Test.Loader.LG/LK/xxLK950S-ZA00001.TLL.in b/source/Test.Loader.LG/Binary/LK/xxLK950S-ZA00001.TLL.in similarity index 100% rename from source/Test.Loader.LG/LK/xxLK950S-ZA00001.TLL.in rename to source/Test.Loader.LG/Binary/LK/xxLK950S-ZA00001.TLL.in diff --git a/source/Test.Loader.LG/LK/xxLK950S-ZA00001.TLL.out b/source/Test.Loader.LG/Binary/LK/xxLK950S-ZA00001.TLL.out similarity index 100% rename from source/Test.Loader.LG/LK/xxLK950S-ZA00001.TLL.out rename to source/Test.Loader.LG/Binary/LK/xxLK950S-ZA00001.TLL.out diff --git a/source/Test.Loader.LG/LK/xxLK950S-ZA00001.csv.in b/source/Test.Loader.LG/Binary/LK/xxLK950S-ZA00001.csv.in similarity index 100% rename from source/Test.Loader.LG/LK/xxLK950S-ZA00001.csv.in rename to source/Test.Loader.LG/Binary/LK/xxLK950S-ZA00001.csv.in diff --git a/source/Test.Loader.LG/LM/TestLM.cs b/source/Test.Loader.LG/Binary/LM/TestLM.cs similarity index 92% rename from source/Test.Loader.LG/LM/TestLM.cs rename to source/Test.Loader.LG/Binary/LM/TestLM.cs index bb7df25..1ff9da9 100644 --- a/source/Test.Loader.LG/LM/TestLM.cs +++ b/source/Test.Loader.LG/Binary/LM/TestLM.cs @@ -3,7 +3,7 @@ using ChanSort.Api; using ChanSort.Loader.LG; using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace Test.Loader.LG +namespace Test.Loader.LG.Binary { [TestClass] public class TestLM : TestBase @@ -45,8 +45,8 @@ namespace Test.Loader.LG [TestMethod] public void TestDeletingChannel() { - var tempFile = TestUtils.DeploymentItem("Test.Loader.LG\\LM\\xxLM620s-ZE00001.TLL.in"); - var plugin = new TllFileSerializerPlugin(); + var tempFile = TestUtils.DeploymentItem("Test.Loader.LG\\Binary\\LM\\xxLM620s-ZE00001.TLL.in"); + var plugin = new LgPlugin(); var ser = plugin.CreateSerializer(tempFile); ser.Load(); var data = ser.DataRoot; diff --git a/source/Test.Loader.LG/LM/xxLM340S-ZA00001.TLL.in b/source/Test.Loader.LG/Binary/LM/xxLM340S-ZA00001.TLL.in similarity index 100% rename from source/Test.Loader.LG/LM/xxLM340S-ZA00001.TLL.in rename to source/Test.Loader.LG/Binary/LM/xxLM340S-ZA00001.TLL.in diff --git a/source/Test.Loader.LG/LM/xxLM340S-ZA00001.TLL.out b/source/Test.Loader.LG/Binary/LM/xxLM340S-ZA00001.TLL.out similarity index 100% rename from source/Test.Loader.LG/LM/xxLM340S-ZA00001.TLL.out rename to source/Test.Loader.LG/Binary/LM/xxLM340S-ZA00001.TLL.out diff --git a/source/Test.Loader.LG/LM/xxLM340S-ZA00001.csv.in b/source/Test.Loader.LG/Binary/LM/xxLM340S-ZA00001.csv.in similarity index 100% rename from source/Test.Loader.LG/LM/xxLM340S-ZA00001.csv.in rename to source/Test.Loader.LG/Binary/LM/xxLM340S-ZA00001.csv.in diff --git a/source/Test.Loader.LG/LM/xxLM611S-ZA00001.TLL.in b/source/Test.Loader.LG/Binary/LM/xxLM611S-ZA00001.TLL.in similarity index 100% rename from source/Test.Loader.LG/LM/xxLM611S-ZA00001.TLL.in rename to source/Test.Loader.LG/Binary/LM/xxLM611S-ZA00001.TLL.in diff --git a/source/Test.Loader.LG/LM/xxLM611S-ZA00001.TLL.out b/source/Test.Loader.LG/Binary/LM/xxLM611S-ZA00001.TLL.out similarity index 100% rename from source/Test.Loader.LG/LM/xxLM611S-ZA00001.TLL.out rename to source/Test.Loader.LG/Binary/LM/xxLM611S-ZA00001.TLL.out diff --git a/source/Test.Loader.LG/LM/xxLM611S-ZA00001.csv.in b/source/Test.Loader.LG/Binary/LM/xxLM611S-ZA00001.csv.in similarity index 100% rename from source/Test.Loader.LG/LM/xxLM611S-ZA00001.csv.in rename to source/Test.Loader.LG/Binary/LM/xxLM611S-ZA00001.csv.in diff --git a/source/Test.Loader.LG/LM/xxLM620S-ZE00001.TLL.in b/source/Test.Loader.LG/Binary/LM/xxLM620S-ZE00001.TLL.in similarity index 100% rename from source/Test.Loader.LG/LM/xxLM620S-ZE00001.TLL.in rename to source/Test.Loader.LG/Binary/LM/xxLM620S-ZE00001.TLL.in diff --git a/source/Test.Loader.LG/LM/xxLM620S-ZE00001.TLL.out b/source/Test.Loader.LG/Binary/LM/xxLM620S-ZE00001.TLL.out similarity index 100% rename from source/Test.Loader.LG/LM/xxLM620S-ZE00001.TLL.out rename to source/Test.Loader.LG/Binary/LM/xxLM620S-ZE00001.TLL.out diff --git a/source/Test.Loader.LG/LM/xxLM620S-ZE00001.csv.in b/source/Test.Loader.LG/Binary/LM/xxLM620S-ZE00001.csv.in similarity index 100% rename from source/Test.Loader.LG/LM/xxLM620S-ZE00001.csv.in rename to source/Test.Loader.LG/Binary/LM/xxLM620S-ZE00001.csv.in diff --git a/source/Test.Loader.LG/LM/xxLM760S-ZB00001.TLL.in b/source/Test.Loader.LG/Binary/LM/xxLM760S-ZB00001.TLL.in similarity index 100% rename from source/Test.Loader.LG/LM/xxLM760S-ZB00001.TLL.in rename to source/Test.Loader.LG/Binary/LM/xxLM760S-ZB00001.TLL.in diff --git a/source/Test.Loader.LG/LM/xxLM860V-ZB99998.TLL.in b/source/Test.Loader.LG/Binary/LM/xxLM860V-ZB99998.TLL.in similarity index 100% rename from source/Test.Loader.LG/LM/xxLM860V-ZB99998.TLL.in rename to source/Test.Loader.LG/Binary/LM/xxLM860V-ZB99998.TLL.in diff --git a/source/Test.Loader.LG/LM/xxLM860V-ZB99998.TLL.out b/source/Test.Loader.LG/Binary/LM/xxLM860V-ZB99998.TLL.out similarity index 100% rename from source/Test.Loader.LG/LM/xxLM860V-ZB99998.TLL.out rename to source/Test.Loader.LG/Binary/LM/xxLM860V-ZB99998.TLL.out diff --git a/source/Test.Loader.LG/LM/xxLM860V-ZB99998.csv.in b/source/Test.Loader.LG/Binary/LM/xxLM860V-ZB99998.csv.in similarity index 100% rename from source/Test.Loader.LG/LM/xxLM860V-ZB99998.csv.in rename to source/Test.Loader.LG/Binary/LM/xxLM860V-ZB99998.csv.in diff --git a/source/Test.Loader.LG/LN/TestLN.cs b/source/Test.Loader.LG/Binary/LN/TestLN.cs similarity index 94% rename from source/Test.Loader.LG/LN/TestLN.cs rename to source/Test.Loader.LG/Binary/LN/TestLN.cs index 7131986..c332d81 100644 --- a/source/Test.Loader.LG/LN/TestLN.cs +++ b/source/Test.Loader.LG/Binary/LN/TestLN.cs @@ -1,6 +1,6 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace Test.Loader.LG +namespace Test.Loader.LG.Binary { [TestClass] public class TestLN : TestBase diff --git a/source/Test.Loader.LG/LN/xxLN5406-ZA99999.TLL.in b/source/Test.Loader.LG/Binary/LN/xxLN5406-ZA99999.TLL.in similarity index 100% rename from source/Test.Loader.LG/LN/xxLN5406-ZA99999.TLL.in rename to source/Test.Loader.LG/Binary/LN/xxLN5406-ZA99999.TLL.in diff --git a/source/Test.Loader.LG/LN/xxLN5406-ZA99999.TLL.out b/source/Test.Loader.LG/Binary/LN/xxLN5406-ZA99999.TLL.out similarity index 100% rename from source/Test.Loader.LG/LN/xxLN5406-ZA99999.TLL.out rename to source/Test.Loader.LG/Binary/LN/xxLN5406-ZA99999.TLL.out diff --git a/source/Test.Loader.LG/LN/xxLN5406-ZA99999.csv.in b/source/Test.Loader.LG/Binary/LN/xxLN5406-ZA99999.csv.in similarity index 100% rename from source/Test.Loader.LG/LN/xxLN5406-ZA99999.csv.in rename to source/Test.Loader.LG/Binary/LN/xxLN5406-ZA99999.csv.in diff --git a/source/Test.Loader.LG/LN/xxLN5758-ZE99999.TLL.in b/source/Test.Loader.LG/Binary/LN/xxLN5758-ZE99999.TLL.in similarity index 100% rename from source/Test.Loader.LG/LN/xxLN5758-ZE99999.TLL.in rename to source/Test.Loader.LG/Binary/LN/xxLN5758-ZE99999.TLL.in diff --git a/source/Test.Loader.LG/LN/xxLN5758-ZE99999.TLL.out b/source/Test.Loader.LG/Binary/LN/xxLN5758-ZE99999.TLL.out similarity index 100% rename from source/Test.Loader.LG/LN/xxLN5758-ZE99999.TLL.out rename to source/Test.Loader.LG/Binary/LN/xxLN5758-ZE99999.TLL.out diff --git a/source/Test.Loader.LG/LN/xxLN5758-ZE99999.csv.in b/source/Test.Loader.LG/Binary/LN/xxLN5758-ZE99999.csv.in similarity index 100% rename from source/Test.Loader.LG/LN/xxLN5758-ZE99999.csv.in rename to source/Test.Loader.LG/Binary/LN/xxLN5758-ZE99999.csv.in diff --git a/source/Test.Loader.LG/LP/TestLP.cs b/source/Test.Loader.LG/Binary/LP/TestLP.cs similarity index 90% rename from source/Test.Loader.LG/LP/TestLP.cs rename to source/Test.Loader.LG/Binary/LP/TestLP.cs index 8ecad99..bd7cf5b 100644 --- a/source/Test.Loader.LG/LP/TestLP.cs +++ b/source/Test.Loader.LG/Binary/LP/TestLP.cs @@ -1,6 +1,6 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace Test.Loader.LG +namespace Test.Loader.LG.Binary { [TestClass] public class TestLP : TestBase diff --git a/source/Test.Loader.LG/LP/xxLP632H-ZA00001.TLL.in b/source/Test.Loader.LG/Binary/LP/xxLP632H-ZA00001.TLL.in similarity index 100% rename from source/Test.Loader.LG/LP/xxLP632H-ZA00001.TLL.in rename to source/Test.Loader.LG/Binary/LP/xxLP632H-ZA00001.TLL.in diff --git a/source/Test.Loader.LG/LP/xxLP632H-ZA00001.TLL.out b/source/Test.Loader.LG/Binary/LP/xxLP632H-ZA00001.TLL.out similarity index 100% rename from source/Test.Loader.LG/LP/xxLP632H-ZA00001.TLL.out rename to source/Test.Loader.LG/Binary/LP/xxLP632H-ZA00001.TLL.out diff --git a/source/Test.Loader.LG/LP/xxLP632H-ZA00001.csv.in b/source/Test.Loader.LG/Binary/LP/xxLP632H-ZA00001.csv.in similarity index 100% rename from source/Test.Loader.LG/LP/xxLP632H-ZA00001.csv.in rename to source/Test.Loader.LG/Binary/LP/xxLP632H-ZA00001.csv.in diff --git a/source/Test.Loader.LG/LS/TestLS.cs b/source/Test.Loader.LG/Binary/LS/TestLS.cs similarity index 94% rename from source/Test.Loader.LG/LS/TestLS.cs rename to source/Test.Loader.LG/Binary/LS/TestLS.cs index 1e5a548..dbaf562 100644 --- a/source/Test.Loader.LG/LS/TestLS.cs +++ b/source/Test.Loader.LG/Binary/LS/TestLS.cs @@ -1,6 +1,6 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace Test.Loader.LG +namespace Test.Loader.LG.Binary { [TestClass] public class TestLS : TestBase diff --git a/source/Test.Loader.LG/LS/xxLS560S-ZC00010.TLL.in b/source/Test.Loader.LG/Binary/LS/xxLS560S-ZC00010.TLL.in similarity index 100% rename from source/Test.Loader.LG/LS/xxLS560S-ZC00010.TLL.in rename to source/Test.Loader.LG/Binary/LS/xxLS560S-ZC00010.TLL.in diff --git a/source/Test.Loader.LG/LS/xxLS560S-ZC00010.TLL.out b/source/Test.Loader.LG/Binary/LS/xxLS560S-ZC00010.TLL.out similarity index 100% rename from source/Test.Loader.LG/LS/xxLS560S-ZC00010.TLL.out rename to source/Test.Loader.LG/Binary/LS/xxLS560S-ZC00010.TLL.out diff --git a/source/Test.Loader.LG/LS/xxLS560S-ZC00010.csv.in b/source/Test.Loader.LG/Binary/LS/xxLS560S-ZC00010.csv.in similarity index 100% rename from source/Test.Loader.LG/LS/xxLS560S-ZC00010.csv.in rename to source/Test.Loader.LG/Binary/LS/xxLS560S-ZC00010.csv.in diff --git a/source/Test.Loader.LG/LS/xxLS570S-ZB00001.TLL.in b/source/Test.Loader.LG/Binary/LS/xxLS570S-ZB00001.TLL.in similarity index 100% rename from source/Test.Loader.LG/LS/xxLS570S-ZB00001.TLL.in rename to source/Test.Loader.LG/Binary/LS/xxLS570S-ZB00001.TLL.in diff --git a/source/Test.Loader.LG/LS/xxLS570S-ZB00001.TLL.out b/source/Test.Loader.LG/Binary/LS/xxLS570S-ZB00001.TLL.out similarity index 100% rename from source/Test.Loader.LG/LS/xxLS570S-ZB00001.TLL.out rename to source/Test.Loader.LG/Binary/LS/xxLS570S-ZB00001.TLL.out diff --git a/source/Test.Loader.LG/LS/xxLS570S-ZB00001.csv.in b/source/Test.Loader.LG/Binary/LS/xxLS570S-ZB00001.csv.in similarity index 100% rename from source/Test.Loader.LG/LS/xxLS570S-ZB00001.csv.in rename to source/Test.Loader.LG/Binary/LS/xxLS570S-ZB00001.csv.in diff --git a/source/Test.Loader.LG/LT/TestLT.cs b/source/Test.Loader.LG/Binary/LT/TestLT.cs similarity index 90% rename from source/Test.Loader.LG/LT/TestLT.cs rename to source/Test.Loader.LG/Binary/LT/TestLT.cs index 69bf8b0..93d2d6d 100644 --- a/source/Test.Loader.LG/LT/TestLT.cs +++ b/source/Test.Loader.LG/Binary/LT/TestLT.cs @@ -1,6 +1,6 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace Test.Loader.LG +namespace Test.Loader.LG.Binary { [TestClass] public class TestLT : TestBase diff --git a/source/Test.Loader.LG/LT/xxLT380H-ZA00001.TLL.in b/source/Test.Loader.LG/Binary/LT/xxLT380H-ZA00001.TLL.in similarity index 100% rename from source/Test.Loader.LG/LT/xxLT380H-ZA00001.TLL.in rename to source/Test.Loader.LG/Binary/LT/xxLT380H-ZA00001.TLL.in diff --git a/source/Test.Loader.LG/LT/xxLT380H-ZA00001.TLL.out b/source/Test.Loader.LG/Binary/LT/xxLT380H-ZA00001.TLL.out similarity index 100% rename from source/Test.Loader.LG/LT/xxLT380H-ZA00001.TLL.out rename to source/Test.Loader.LG/Binary/LT/xxLT380H-ZA00001.TLL.out diff --git a/source/Test.Loader.LG/LT/xxLT380H-ZA00001.csv.in b/source/Test.Loader.LG/Binary/LT/xxLT380H-ZA00001.csv.in similarity index 100% rename from source/Test.Loader.LG/LT/xxLT380H-ZA00001.csv.in rename to source/Test.Loader.LG/Binary/LT/xxLT380H-ZA00001.csv.in diff --git a/source/Test.Loader.LG/LV/TestLV.cs b/source/Test.Loader.LG/Binary/LV/TestLV.cs similarity index 95% rename from source/Test.Loader.LG/LV/TestLV.cs rename to source/Test.Loader.LG/Binary/LV/TestLV.cs index 345ef16..6225299 100644 --- a/source/Test.Loader.LG/LV/TestLV.cs +++ b/source/Test.Loader.LG/Binary/LV/TestLV.cs @@ -1,6 +1,6 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace Test.Loader.LG +namespace Test.Loader.LG.Binary { [TestClass] public class TestLV : TestBase diff --git a/source/Test.Loader.LG/LV/xxLV375S-ZC00001.TLL.in b/source/Test.Loader.LG/Binary/LV/xxLV375S-ZC00001.TLL.in similarity index 100% rename from source/Test.Loader.LG/LV/xxLV375S-ZC00001.TLL.in rename to source/Test.Loader.LG/Binary/LV/xxLV375S-ZC00001.TLL.in diff --git a/source/Test.Loader.LG/LV/xxLV375S-ZC00001.TLL.out b/source/Test.Loader.LG/Binary/LV/xxLV375S-ZC00001.TLL.out similarity index 100% rename from source/Test.Loader.LG/LV/xxLV375S-ZC00001.TLL.out rename to source/Test.Loader.LG/Binary/LV/xxLV375S-ZC00001.TLL.out diff --git a/source/Test.Loader.LG/LV/xxLV375S-ZC00001.csv.in b/source/Test.Loader.LG/Binary/LV/xxLV375S-ZC00001.csv.in similarity index 100% rename from source/Test.Loader.LG/LV/xxLV375S-ZC00001.csv.in rename to source/Test.Loader.LG/Binary/LV/xxLV375S-ZC00001.csv.in diff --git a/source/Test.Loader.LG/LV/xxLV470S-ZC00001.TLL.in b/source/Test.Loader.LG/Binary/LV/xxLV470S-ZC00001.TLL.in similarity index 100% rename from source/Test.Loader.LG/LV/xxLV470S-ZC00001.TLL.in rename to source/Test.Loader.LG/Binary/LV/xxLV470S-ZC00001.TLL.in diff --git a/source/Test.Loader.LG/LV/xxLV470S-ZC00001.TLL.out b/source/Test.Loader.LG/Binary/LV/xxLV470S-ZC00001.TLL.out similarity index 100% rename from source/Test.Loader.LG/LV/xxLV470S-ZC00001.TLL.out rename to source/Test.Loader.LG/Binary/LV/xxLV470S-ZC00001.TLL.out diff --git a/source/Test.Loader.LG/LV/xxLV470S-ZC00001.csv.in b/source/Test.Loader.LG/Binary/LV/xxLV470S-ZC00001.csv.in similarity index 100% rename from source/Test.Loader.LG/LV/xxLV470S-ZC00001.csv.in rename to source/Test.Loader.LG/Binary/LV/xxLV470S-ZC00001.csv.in diff --git a/source/Test.Loader.LG/LV/xxLV579S-ZB00001.TLL.in b/source/Test.Loader.LG/Binary/LV/xxLV579S-ZB00001.TLL.in similarity index 100% rename from source/Test.Loader.LG/LV/xxLV579S-ZB00001.TLL.in rename to source/Test.Loader.LG/Binary/LV/xxLV579S-ZB00001.TLL.in diff --git a/source/Test.Loader.LG/LV/xxLV579S-ZB00001.TLL.out b/source/Test.Loader.LG/Binary/LV/xxLV579S-ZB00001.TLL.out similarity index 100% rename from source/Test.Loader.LG/LV/xxLV579S-ZB00001.TLL.out rename to source/Test.Loader.LG/Binary/LV/xxLV579S-ZB00001.TLL.out diff --git a/source/Test.Loader.LG/LV/xxLV579S-ZB00001.csv.in b/source/Test.Loader.LG/Binary/LV/xxLV579S-ZB00001.csv.in similarity index 100% rename from source/Test.Loader.LG/LV/xxLV579S-ZB00001.csv.in rename to source/Test.Loader.LG/Binary/LV/xxLV579S-ZB00001.csv.in diff --git a/source/Test.Loader.LG/LW/TestLW.cs b/source/Test.Loader.LG/Binary/LW/TestLW.cs similarity index 93% rename from source/Test.Loader.LG/LW/TestLW.cs rename to source/Test.Loader.LG/Binary/LW/TestLW.cs index 00c3970..268d069 100644 --- a/source/Test.Loader.LG/LW/TestLW.cs +++ b/source/Test.Loader.LG/Binary/LW/TestLW.cs @@ -1,6 +1,6 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace Test.Loader.LG +namespace Test.Loader.LG.Binary { [TestClass] public class TestLW : TestBase diff --git a/source/Test.Loader.LG/LW/xxLW4500-ZB00001.TLL.in b/source/Test.Loader.LG/Binary/LW/xxLW4500-ZB00001.TLL.in similarity index 100% rename from source/Test.Loader.LG/LW/xxLW4500-ZB00001.TLL.in rename to source/Test.Loader.LG/Binary/LW/xxLW4500-ZB00001.TLL.in diff --git a/source/Test.Loader.LG/LW/xxLW4500-ZB00001.TLL.out b/source/Test.Loader.LG/Binary/LW/xxLW4500-ZB00001.TLL.out similarity index 100% rename from source/Test.Loader.LG/LW/xxLW4500-ZB00001.TLL.out rename to source/Test.Loader.LG/Binary/LW/xxLW4500-ZB00001.TLL.out diff --git a/source/Test.Loader.LG/LW/xxLW4500-ZB00001.csv.in b/source/Test.Loader.LG/Binary/LW/xxLW4500-ZB00001.csv.in similarity index 100% rename from source/Test.Loader.LG/LW/xxLW4500-ZB00001.csv.in rename to source/Test.Loader.LG/Binary/LW/xxLW4500-ZB00001.csv.in diff --git a/source/Test.Loader.LG/LW/xxLW659S-ZC00001.TLL.in b/source/Test.Loader.LG/Binary/LW/xxLW659S-ZC00001.TLL.in similarity index 100% rename from source/Test.Loader.LG/LW/xxLW659S-ZC00001.TLL.in rename to source/Test.Loader.LG/Binary/LW/xxLW659S-ZC00001.TLL.in diff --git a/source/Test.Loader.LG/LW/xxLW659S-ZC00001.TLL.out b/source/Test.Loader.LG/Binary/LW/xxLW659S-ZC00001.TLL.out similarity index 100% rename from source/Test.Loader.LG/LW/xxLW659S-ZC00001.TLL.out rename to source/Test.Loader.LG/Binary/LW/xxLW659S-ZC00001.TLL.out diff --git a/source/Test.Loader.LG/LW/xxLW659S-ZC00001.csv.in b/source/Test.Loader.LG/Binary/LW/xxLW659S-ZC00001.csv.in similarity index 100% rename from source/Test.Loader.LG/LW/xxLW659S-ZC00001.csv.in rename to source/Test.Loader.LG/Binary/LW/xxLW659S-ZC00001.csv.in diff --git a/source/Test.Loader.LG/LX/TestLX.cs b/source/Test.Loader.LG/Binary/LX/TestLX.cs similarity index 90% rename from source/Test.Loader.LG/LX/TestLX.cs rename to source/Test.Loader.LG/Binary/LX/TestLX.cs index e4b44f9..5ad9693 100644 --- a/source/Test.Loader.LG/LX/TestLX.cs +++ b/source/Test.Loader.LG/Binary/LX/TestLX.cs @@ -1,6 +1,6 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace Test.Loader.LG +namespace Test.Loader.LG.Binary { [TestClass] public class TestLX : TestBase diff --git a/source/Test.Loader.LG/LX/xxLX9500-ZA00001.TLL.in b/source/Test.Loader.LG/Binary/LX/xxLX9500-ZA00001.TLL.in similarity index 100% rename from source/Test.Loader.LG/LX/xxLX9500-ZA00001.TLL.in rename to source/Test.Loader.LG/Binary/LX/xxLX9500-ZA00001.TLL.in diff --git a/source/Test.Loader.LG/LX/xxLX9500-ZA00001.TLL.out b/source/Test.Loader.LG/Binary/LX/xxLX9500-ZA00001.TLL.out similarity index 100% rename from source/Test.Loader.LG/LX/xxLX9500-ZA00001.TLL.out rename to source/Test.Loader.LG/Binary/LX/xxLX9500-ZA00001.TLL.out diff --git a/source/Test.Loader.LG/LX/xxLX9500-ZA00001.csv.in b/source/Test.Loader.LG/Binary/LX/xxLX9500-ZA00001.csv.in similarity index 100% rename from source/Test.Loader.LG/LX/xxLX9500-ZA00001.csv.in rename to source/Test.Loader.LG/Binary/LX/xxLX9500-ZA00001.csv.in diff --git a/source/Test.Loader.LG/PM/TestPM.cs b/source/Test.Loader.LG/Binary/PM/TestPM.cs similarity index 94% rename from source/Test.Loader.LG/PM/TestPM.cs rename to source/Test.Loader.LG/Binary/PM/TestPM.cs index 37b4ef0..3d61529 100644 --- a/source/Test.Loader.LG/PM/TestPM.cs +++ b/source/Test.Loader.LG/Binary/PM/TestPM.cs @@ -1,6 +1,6 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace Test.Loader.LG +namespace Test.Loader.LG.Binary { [TestClass] public class TestPM : TestBase diff --git a/source/Test.Loader.LG/PM/xxPM670S-ZA00001.TLL.in b/source/Test.Loader.LG/Binary/PM/xxPM670S-ZA00001.TLL.in similarity index 100% rename from source/Test.Loader.LG/PM/xxPM670S-ZA00001.TLL.in rename to source/Test.Loader.LG/Binary/PM/xxPM670S-ZA00001.TLL.in diff --git a/source/Test.Loader.LG/PM/xxPM670S-ZA00001.TLL.out b/source/Test.Loader.LG/Binary/PM/xxPM670S-ZA00001.TLL.out similarity index 100% rename from source/Test.Loader.LG/PM/xxPM670S-ZA00001.TLL.out rename to source/Test.Loader.LG/Binary/PM/xxPM670S-ZA00001.TLL.out diff --git a/source/Test.Loader.LG/PM/xxPM670S-ZA00001.csv.in b/source/Test.Loader.LG/Binary/PM/xxPM670S-ZA00001.csv.in similarity index 100% rename from source/Test.Loader.LG/PM/xxPM670S-ZA00001.csv.in rename to source/Test.Loader.LG/Binary/PM/xxPM670S-ZA00001.csv.in diff --git a/source/Test.Loader.LG/PM/xxPM970S-ZA99999.TLL.in b/source/Test.Loader.LG/Binary/PM/xxPM970S-ZA99999.TLL.in similarity index 100% rename from source/Test.Loader.LG/PM/xxPM970S-ZA99999.TLL.in rename to source/Test.Loader.LG/Binary/PM/xxPM970S-ZA99999.TLL.in diff --git a/source/Test.Loader.LG/PM/xxPM970S-ZA99999.TLL.out b/source/Test.Loader.LG/Binary/PM/xxPM970S-ZA99999.TLL.out similarity index 100% rename from source/Test.Loader.LG/PM/xxPM970S-ZA99999.TLL.out rename to source/Test.Loader.LG/Binary/PM/xxPM970S-ZA99999.TLL.out diff --git a/source/Test.Loader.LG/PM/xxPM970S-ZA99999.csv.in b/source/Test.Loader.LG/Binary/PM/xxPM970S-ZA99999.csv.in similarity index 100% rename from source/Test.Loader.LG/PM/xxPM970S-ZA99999.csv.in rename to source/Test.Loader.LG/Binary/PM/xxPM970S-ZA99999.csv.in diff --git a/source/Test.Loader.LG/PN/TestPN.cs b/source/Test.Loader.LG/Binary/PN/TestPN.cs similarity index 90% rename from source/Test.Loader.LG/PN/TestPN.cs rename to source/Test.Loader.LG/Binary/PN/TestPN.cs index ce881dd..43a9e20 100644 --- a/source/Test.Loader.LG/PN/TestPN.cs +++ b/source/Test.Loader.LG/Binary/PN/TestPN.cs @@ -1,6 +1,6 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace Test.Loader.LG +namespace Test.Loader.LG.Binary { [TestClass] public class TestPN : TestBase diff --git a/source/Test.Loader.LG/PN/xxPN6500-ZB00001.TLL.in b/source/Test.Loader.LG/Binary/PN/xxPN6500-ZB00001.TLL.in similarity index 100% rename from source/Test.Loader.LG/PN/xxPN6500-ZB00001.TLL.in rename to source/Test.Loader.LG/Binary/PN/xxPN6500-ZB00001.TLL.in diff --git a/source/Test.Loader.LG/PN/xxPN6500-ZB00001.TLL.out b/source/Test.Loader.LG/Binary/PN/xxPN6500-ZB00001.TLL.out similarity index 100% rename from source/Test.Loader.LG/PN/xxPN6500-ZB00001.TLL.out rename to source/Test.Loader.LG/Binary/PN/xxPN6500-ZB00001.TLL.out diff --git a/source/Test.Loader.LG/PN/xxPN6500-ZB00001.csv.in b/source/Test.Loader.LG/Binary/PN/xxPN6500-ZB00001.csv.in similarity index 100% rename from source/Test.Loader.LG/PN/xxPN6500-ZB00001.csv.in rename to source/Test.Loader.LG/Binary/PN/xxPN6500-ZB00001.csv.in diff --git a/source/Test.Loader.LG/PT/TestPT.cs b/source/Test.Loader.LG/Binary/PT/TestPT.cs similarity index 90% rename from source/Test.Loader.LG/PT/TestPT.cs rename to source/Test.Loader.LG/Binary/PT/TestPT.cs index b088721..92288bd 100644 --- a/source/Test.Loader.LG/PT/TestPT.cs +++ b/source/Test.Loader.LG/Binary/PT/TestPT.cs @@ -1,6 +1,6 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace Test.Loader.LG +namespace Test.Loader.LG.Binary { [TestClass] public class TestPT : TestBase diff --git a/source/Test.Loader.LG/PT/xxPT353-ZA00001.TLL.in b/source/Test.Loader.LG/Binary/PT/xxPT353-ZA00001.TLL.in similarity index 100% rename from source/Test.Loader.LG/PT/xxPT353-ZA00001.TLL.in rename to source/Test.Loader.LG/Binary/PT/xxPT353-ZA00001.TLL.in diff --git a/source/Test.Loader.LG/PT/xxPT353-ZA00001.TLL.out b/source/Test.Loader.LG/Binary/PT/xxPT353-ZA00001.TLL.out similarity index 100% rename from source/Test.Loader.LG/PT/xxPT353-ZA00001.TLL.out rename to source/Test.Loader.LG/Binary/PT/xxPT353-ZA00001.TLL.out diff --git a/source/Test.Loader.LG/PT/xxPT353-ZA00001.csv.in b/source/Test.Loader.LG/Binary/PT/xxPT353-ZA00001.csv.in similarity index 100% rename from source/Test.Loader.LG/PT/xxPT353-ZA00001.csv.in rename to source/Test.Loader.LG/Binary/PT/xxPT353-ZA00001.csv.in diff --git a/source/Test.Loader.LG/TestBase.cs b/source/Test.Loader.LG/Binary/TestBase.cs similarity index 93% rename from source/Test.Loader.LG/TestBase.cs rename to source/Test.Loader.LG/Binary/TestBase.cs index b5c5ef6..1b263a5 100644 --- a/source/Test.Loader.LG/TestBase.cs +++ b/source/Test.Loader.LG/Binary/TestBase.cs @@ -7,9 +7,10 @@ using System.Text.RegularExpressions; using Microsoft.VisualStudio.TestTools.UnitTesting; using ChanSort.Api; using ChanSort.Loader.LG; +using ChanSort.Loader.LG.Binary; using Assert = NUnit.Framework.Assert; -namespace Test.Loader.LG +namespace Test.Loader.LG.Binary { [TestClass] public class TestBase @@ -21,14 +22,14 @@ namespace Test.Loader.LG { // copy required input and assertion files TestUtils.DeploymentItem("ChanSort.Loader.LG\\ChanSort.Loader.LG.ini"); - TestUtils.DeploymentItem("Test.Loader.LG\\" + modelAndBaseName + ".TLL.in"); - TestUtils.DeploymentItem("Test.Loader.LG\\" + modelAndBaseName + ".csv.in"); - TestUtils.DeploymentItem("Test.Loader.LG\\" + modelAndBaseName + ".TLL.out"); + TestUtils.DeploymentItem("Test.Loader.LG\\Binary\\" + modelAndBaseName + ".TLL.in"); + TestUtils.DeploymentItem("Test.Loader.LG\\Binary\\" + modelAndBaseName + ".csv.in"); + TestUtils.DeploymentItem("Test.Loader.LG\\Binary\\" + modelAndBaseName + ".TLL.out"); var baseName = Path.GetFileNameWithoutExtension(modelAndBaseName); // load the TLL file - TllFileSerializerPlugin plugin = new TllFileSerializerPlugin(); + var plugin = new LgPlugin(); var serializer = (TllFileSerializer)plugin.CreateSerializer(baseName + ".TLL.in"); serializer.IsTesting = true; serializer.Load(); @@ -130,7 +131,7 @@ namespace Test.Loader.LG protected void GenerateTestFiles(string modelAndBaseName, bool moveChannels = true) { TestUtils.DeploymentItem("ChanSort.Loader.LG\\ChanSort.Loader.LG.ini"); - var testDataDir = TestUtils.GetSolutionBaseDir() + "\\Test.Loader.LG\\" + Path.GetDirectoryName(modelAndBaseName); + var testDataDir = TestUtils.GetSolutionBaseDir() + "\\Test.Loader.LG\\Binary\\" + Path.GetDirectoryName(modelAndBaseName); var basename = Path.GetFileNameWithoutExtension(modelAndBaseName); // copy .TLL.in diff --git a/source/Test.Loader.GlobalClone/TestFiles/GlobalClone00001.TLL b/source/Test.Loader.LG/GlobalClone/GlobalClone00001.TLL similarity index 100% rename from source/Test.Loader.GlobalClone/TestFiles/GlobalClone00001.TLL rename to source/Test.Loader.LG/GlobalClone/GlobalClone00001.TLL diff --git a/source/Test.Loader.GlobalClone/TestFiles/GlobalClone00002.TLL b/source/Test.Loader.LG/GlobalClone/GlobalClone00002.TLL similarity index 100% rename from source/Test.Loader.GlobalClone/TestFiles/GlobalClone00002.TLL rename to source/Test.Loader.LG/GlobalClone/GlobalClone00002.TLL diff --git a/source/Test.Loader.GlobalClone/TestFiles/GlobalClone00003.TLL b/source/Test.Loader.LG/GlobalClone/GlobalClone00003.TLL similarity index 100% rename from source/Test.Loader.GlobalClone/TestFiles/GlobalClone00003.TLL rename to source/Test.Loader.LG/GlobalClone/GlobalClone00003.TLL diff --git a/source/Test.Loader.GlobalClone/TestFiles/GlobalClone00201.TLL b/source/Test.Loader.LG/GlobalClone/GlobalClone00201.TLL similarity index 100% rename from source/Test.Loader.GlobalClone/TestFiles/GlobalClone00201.TLL rename to source/Test.Loader.LG/GlobalClone/GlobalClone00201.TLL diff --git a/source/Test.Loader.GlobalClone/TestFiles/GlobalClone200-inner.json b/source/Test.Loader.LG/GlobalClone/GlobalClone200-inner.json similarity index 100% rename from source/Test.Loader.GlobalClone/TestFiles/GlobalClone200-inner.json rename to source/Test.Loader.LG/GlobalClone/GlobalClone200-inner.json diff --git a/source/Test.Loader.GlobalClone/LgGlobalCloneTest.cs b/source/Test.Loader.LG/GlobalClone/LgGlobalCloneTest.cs similarity index 95% rename from source/Test.Loader.GlobalClone/LgGlobalCloneTest.cs rename to source/Test.Loader.LG/GlobalClone/LgGlobalCloneTest.cs index 4c8a899..1fabae1 100644 --- a/source/Test.Loader.GlobalClone/LgGlobalCloneTest.cs +++ b/source/Test.Loader.LG/GlobalClone/LgGlobalCloneTest.cs @@ -1,13 +1,11 @@ -using System; -using System.IO; +using System.IO; using System.Linq; -using System.Reflection; using System.Text; using ChanSort.Api; -using ChanSort.Loader.GlobalClone; +using ChanSort.Loader.LG; using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace Test.Loader.GlobalClone +namespace Test.Loader.LG.GlobalClone { [TestClass] public class LgGlobalCloneTest @@ -41,7 +39,7 @@ namespace Test.Loader.GlobalClone private void ChannelsAddedToCorrectLists(string fileName, SignalSource signalSource, int expectedTv, int expectedRadio, int dataProgramSid, string dataProgramName) { var testFile = TestUtils.DeploymentItem("Test.Loader.GlobalClone\\TestFiles\\" + fileName); - var plugin = new GcSerializerPlugin(); + var plugin = new LgPlugin(); var ser = plugin.CreateSerializer(testFile); ser.Load(); @@ -68,7 +66,7 @@ namespace Test.Loader.GlobalClone public void TestDeletingChannel() { var tempFile = TestUtils.DeploymentItem("Test.Loader.GlobalClone\\TestFiles\\GlobalClone00001.TLL"); - var plugin = new GcSerializerPlugin(); + var plugin = new LgPlugin(); var ser = plugin.CreateSerializer(tempFile); ser.Load(); var data = ser.DataRoot; @@ -116,7 +114,7 @@ namespace Test.Loader.GlobalClone var tempFile = TestUtils.DeploymentItem("Test.Loader.GlobalClone\\TestFiles\\GlobalClone00201.TLL"); var orig = File.ReadAllText(tempFile, Encoding.UTF8); - var plugin = new GcSerializerPlugin(); + var plugin = new LgPlugin(); var ser = plugin.CreateSerializer(tempFile); ser.Load(); var data = ser.DataRoot; @@ -158,8 +156,5 @@ namespace Test.Loader.GlobalClone NUnit.Framework.Assert.AreEqual(orig, changed); // need NUnit.AreEqual to only show the actual difference and not 5MB + 5MB of data } #endregion - - - } } diff --git a/source/Test.Loader.LG/Test.Loader.LG.csproj b/source/Test.Loader.LG/Test.Loader.LG.csproj index 96b6b17..9e06998 100644 --- a/source/Test.Loader.LG/Test.Loader.LG.csproj +++ b/source/Test.Loader.LG/Test.Loader.LG.csproj @@ -1,5 +1,6 @@  + Debug AnyCPU @@ -15,6 +16,8 @@ 512 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + + true @@ -55,9 +58,8 @@ - - False - ..\DLL\nunit.framework.dll + + ..\packages\NUnit.3.13.0\lib\net45\nunit.framework.dll @@ -70,33 +72,40 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + - + Always + + + + + + @@ -115,7 +124,14 @@ + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + +