Changeset 3

Timestamp:

10/26/08 15:59:45 (4 weeks ago)

Author:

Jeremy

Message:

Added tag model

Location:

trunk

Files:

• AddInViews/AudioModel.AddInViews/AudioInvalidException.cs (moved) (moved from trunk/AddInViews/AudioModel.AddInViews/InvalidAudioException.cs) (1 diff, 1 prop)
• AddInViews/AudioModel.AddInViews/AudioModel.AddInViews.csproj (modified) (1 diff)
• AddInViews/AudioModel.AddInViews/AudioUnsupportedException.cs (moved) (moved from trunk/AddInViews/AudioModel.AddInViews/UnsupportedAudioException.cs) (1 diff, 1 prop)
• AddIns/WaveAudio/WaveAudio.cs (modified) (2 diffs)
• AddIns/WaveAudio/WaveReader.cs (modified) (1 diff)
• AudioModel/AudioInvalidException.cs (moved) (moved from trunk/AudioModel/InvalidAudioException.cs) (1 diff, 1 prop)
• AudioModel/AudioModel.csproj (modified) (1 diff)
• AudioModel/AudioUnsupportedException.cs (moved) (moved from trunk/AudioModel/UnsupportedAudioException.cs) (1 diff, 1 prop)
• AudioModel/CompositeAudioFormat.cs (modified) (3 diffs)
• DataModel.UnitTests/AddTrackTests.cs (modified) (4 diffs)
• DataModel.UnitTests/App.config (modified) (1 diff)
• DataModel.UnitTests/DataModel.UnitTests.csproj (modified) (1 diff)
• DataModel/DataModel.csproj (modified) (1 diff)
• DataModel/Track.cs (modified) (3 diffs)
• DataModel/TrackFactory.cs (modified) (2 diffs)
• HostSideAdapters/AudioModel.HostSideAdapters/AudioFormatContractToViewAdapter.cs (modified) (1 diff)
• OmniEncoder.sln (modified) (3 diffs)
• TagModel (added)
• TagModel/CompositeTagFormat.cs (added)
• TagModel/ITag.cs (added)
• TagModel/ITagFormat.cs (added)
• TagModel/Properties (added)
• TagModel/Properties/AssemblyInfo.cs (added)
• TagModel/TagModel.csproj (added)
• TestFiles/AudioInvalid00.wav (moved) (moved from trunk/TestFiles/Invalid00.wav) (1 prop)
• TestFiles/AudioSupported00.wav (moved) (moved from trunk/TestFiles/Supported00.wav) (1 prop)
• TestFiles/AudioSupported01.wav (moved) (moved from trunk/TestFiles/Supported01.wav) (1 prop)
• TestFiles/AudioSupported02.wav (moved) (moved from trunk/TestFiles/Supported02.wav) (1 prop)
• TestFiles/AudioUnsupported00.txt (moved) (moved from trunk/TestFiles/Unsupported00.txt) (1 prop)
• TestFiles/AudioUnsupported00.wav (moved) (moved from trunk/TestFiles/Unsupported00.wav) (1 prop)
• TestFiles/FileList.xlsx (modified) (previous)
• TestFiles/TagSupported00.wav (added)

trunk/AddInViews/AudioModel.AddInViews/AudioInvalidException.cs

@@ -24 +24 @@
 {
     [Serializable]
-    public class InvalidAudioException : Exception
+    public class AudioInvalidException : Exception
     {
-        public InvalidAudioException()
+        public AudioInvalidException()
             : base()
         {
         }
 
-        public InvalidAudioException(string message)
+        public AudioInvalidException(string message)
             : base(message)
         {
         }
 
-        public InvalidAudioException(string message, Exception innerException)
+        public AudioInvalidException(string message, Exception innerException)
             : base(message, innerException)
         {
         }
 
-        protected InvalidAudioException(SerializationInfo info, StreamingContext context)
+        protected AudioInvalidException(SerializationInfo info, StreamingContext context)
             : base(info, context)
         {

trunk/AddInViews/AudioModel.AddInViews/AudioModel.AddInViews.csproj

@@ -56 +56 @@
     <Compile Include="IAudioFormat.cs" />
     <Compile Include="IAudio.cs" />
-    <Compile Include="InvalidAudioException.cs" />
+    <Compile Include="AudioInvalidException.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="UnsupportedAudioException.cs" />
+    <Compile Include="AudioUnsupportedException.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

trunk/AddInViews/AudioModel.AddInViews/AudioUnsupportedException.cs

@@ -24 +24 @@
 {
     [Serializable]
-    public class UnsupportedAudioException : Exception
+    public class AudioUnsupportedException : Exception
     {
-        public UnsupportedAudioException()
+        public AudioUnsupportedException()
             : base()
         {
         }
 
-        public UnsupportedAudioException(string message)
+        public AudioUnsupportedException(string message)
             : base(message)
         {
         }
 
-        public UnsupportedAudioException(string message, Exception innerException)
+        public AudioUnsupportedException(string message, Exception innerException)
             : base(message, innerException)
         {
         }
 
-        protected UnsupportedAudioException(SerializationInfo info, StreamingContext context)
+        protected AudioUnsupportedException(SerializationInfo info, StreamingContext context)
             : base(info, context)
         {

trunk/AddIns/WaveAudio/WaveAudio.cs

@@ -49 +49 @@
                     break;
                 default:
-                    throw new UnsupportedAudioException("The Wave format '0x" + waveFormatEx.FormatTag.ToString("X", CultureInfo.CurrentCulture) + "' is not supported.");
+                    throw new AudioUnsupportedException("The Wave format '0x" + waveFormatEx.FormatTag.ToString("X", CultureInfo.CurrentCulture) + "' is not supported.");
             }
 
@@ -55 +55 @@
                 channels = waveFormatEx.Channels;
             else
-                throw new UnsupportedAudioException(waveFormatEx.Channels + "-channel Wave files are not supported.");
+                throw new AudioUnsupportedException(waveFormatEx.Channels + "-channel Wave files are not supported.");
 
             bitrate = (int)(waveFormatEx.AvgBytesPerSec * 8);

trunk/AddIns/WaveAudio/WaveReader.cs

@@ -36 +36 @@
             {
                 if (new string(reader.ReadChars(4)) != "RIFF")
-                    throw new InvalidAudioException("The file '" + fileName + "' does not contain a RIFF header.");
+                    throw new AudioInvalidException("The file '" + fileName + "' does not contain a RIFF header.");
 
                 reader.BaseStream.Seek(4, SeekOrigin.Current);
 
                 if (new string(reader.ReadChars(4)) != "WAVE")
-                    throw new InvalidAudioException("The file '" + fileName + "' is not a Wave file.");
+                    throw new AudioInvalidException("The file '" + fileName + "' is not a Wave file.");
             }
             catch (EndOfStreamException e)
             {
-                throw new InvalidAudioException("The file '" + fileName + "' is missing data.", e);
+                throw new AudioInvalidException("The file '" + fileName + "' is missing data.", e);
             }
         }

trunk/AudioModel/AudioInvalidException.cs

@@ -24 +24 @@
 {
     [Serializable]
-    public class InvalidAudioException : Exception
+    public class AudioInvalidException : Exception
     {
-        public InvalidAudioException()
+        public AudioInvalidException()
             : base()
         {
         }
 
-        public InvalidAudioException(string message)
+        public AudioInvalidException(string message)
             : base(message)
         {
         }
 
-        public InvalidAudioException(string message, Exception innerException)
+        public AudioInvalidException(string message, Exception innerException)
             : base(message, innerException)
         {
         }
 
-        protected InvalidAudioException(SerializationInfo info, StreamingContext context)
+        protected AudioInvalidException(SerializationInfo info, StreamingContext context)
             : base(info, context)
         {

trunk/AudioModel/AudioModel.csproj

@@ -54 +54 @@
     <Compile Include="IAudioFormat.cs" />
     <Compile Include="IAudio.cs" />
-    <Compile Include="InvalidAudioException.cs" />
+    <Compile Include="AudioInvalidException.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="UnsupportedAudioException.cs" />
+    <Compile Include="AudioUnsupportedException.cs" />
   </ItemGroup>
   <ItemGroup>

trunk/AudioModel/AudioUnsupportedException.cs

@@ -24 +24 @@
 {
     [Serializable]
-    public class UnsupportedAudioException : Exception
+    public class AudioUnsupportedException : Exception
     {
-        public UnsupportedAudioException()
+        public AudioUnsupportedException()
             : base()
         {
         }
 
-        public UnsupportedAudioException(string message)
+        public AudioUnsupportedException(string message)
             : base(message)
         {
         }
 
-        public UnsupportedAudioException(string message, Exception innerException)
+        public AudioUnsupportedException(string message, Exception innerException)
             : base(message, innerException)
         {
         }
 
-        protected UnsupportedAudioException(SerializationInfo info, StreamingContext context)
+        protected AudioUnsupportedException(SerializationInfo info, StreamingContext context)
             : base(info, context)
         {

trunk/AudioModel/CompositeAudioFormat.cs

@@ -37 +37 @@
                 List<string> result = new List<string>();
 
-                foreach (IAudioFormat container in manager.AddIns)
-                    foreach (string extension in container.Extensions)
+                foreach (IAudioFormat format in manager.AddIns)
+                    foreach (string extension in format.Extensions)
                         if (!result.Contains(extension))
                             result.Add(extension);
@@ -50 +50 @@
             string fileExtension = Path.GetExtension(fileName).ToUpperInvariant();
 
-            UnsupportedAudioException priorException = null;
+            AudioUnsupportedException priorException = null;
 
-            foreach (IAudioFormat container in manager.AddIns)
-                if (container.Extensions.Contains(fileExtension))
+            foreach (IAudioFormat format in manager.AddIns)
+                if (format.Extensions.Contains(fileExtension))
                 {
                     try
                     {
-                        return container.GetAudio(fileName);
+                        return format.GetAudio(fileName);
                     }
-                    catch (UnsupportedAudioException e)
+                    catch (AudioUnsupportedException e)
                     {
                         priorException = e;
@@ -69 +69 @@
                 throw priorException;
             else
-                throw new UnsupportedAudioException("The file '" + fileName + "' is not in a supported audio format.");
+                throw new AudioUnsupportedException("The file '" + fileName + "' is not in a supported audio format.");
         }
 

trunk/DataModel.UnitTests/AddTrackTests.cs

@@ -92 +92 @@
 
         [TestMethod]
-        [DataSource("SupportedFiles")]
-        public void AddTracksForSupportedFiles()
+        [DataSource("AudioSupportedFiles")]
+        public void AddTracksForFilesWithSupportedAudio()
         {
             string fileName = testContextInstance.DataRow["FileName"].ToString();
@@ -102 +102 @@
             TimeSpan length = new TimeSpan(0, 0, Convert.ToInt32(testContextInstance.DataRow["Length"]));
 
+            // Execute the command.
             AddTrackCommand command = new AddTrackCommand(fileName);
             command.Execute();
+            Track track = TrackCollection.Instance[fileName];
 
-            Track track = TrackCollection.Instance[fileName];
+            // Compare.
             Assert.IsNotNull(track, "The file '" + fileName + "' was not found in the track collection.");
-            Assert.IsNotNull(track.AudioInfo, "The file '" + fileName + "' has a null AudioInfo property.");
-            Assert.AreEqual<string>(format, track.AudioInfo.Format);
-            Assert.AreEqual<int>(channels, track.AudioInfo.Channels);
-            Assert.AreEqual<int>(bitRate, track.AudioInfo.Bitrate);
-            Assert.AreEqual<int>(sampleRate, track.AudioInfo.SampleRate);
-            Assert.AreEqual<TimeSpan>(length, track.AudioInfo.Length);
+            Assert.IsNotNull(track.Audio, "The file '" + fileName + "' has a null AudioInfo property.");
+            Assert.AreEqual<string>(format, track.Audio.Format);
+            Assert.AreEqual<int>(channels, track.Audio.Channels);
+            Assert.AreEqual<int>(bitRate, track.Audio.Bitrate);
+            Assert.AreEqual<int>(sampleRate, track.Audio.SampleRate);
+            Assert.AreEqual<TimeSpan>(length, track.Audio.Length);
         }
 
         [TestMethod]
-        [DataSource("UnsupportedFiles")]
-        [ExpectedException(typeof(UnsupportedAudioException))]
-        public void AddTracksForUnsupportedFiles()
+        [DataSource("AudioUnsupportedFiles")]
+        [ExpectedException(typeof(AudioUnsupportedException))]
+        public void AddTracksForFilesWithUnsupportedAudio()
         {
             string fileName = testContextInstance.DataRow["FileName"].ToString();
@@ -126 +128 @@
 
         [TestMethod]
-        [DataSource("InvalidFiles")]
-        [ExpectedException(typeof(InvalidAudioException))]
-        public void AddTracksForInvalidFiles()
+        [DataSource("AudioInvalidFiles")]
+        [ExpectedException(typeof(AudioInvalidException))]
+        public void AddTracksForFilesWithInvalidAudio()
         {
             string fileName = testContextInstance.DataRow["FileName"].ToString();
@@ -134 +136 @@
             command.Execute();
         }
+
+        [TestMethod]
+        [DataSource("TagSupportedFiles")]
+        public void AddTracksForFilesWithSupportedTags()
+        {
+            string fileName = testContextInstance.DataRow["FileName"].ToString();
+            string trackNumber = testContextInstance.DataRow["TrackNumber"].ToString();
+
+            AddTrackCommand command = new AddTrackCommand(fileName);
+            command.Execute();
+
+            Track track = TrackCollection.Instance[fileName];
+            Assert.IsNotNull(track.Tag, "The file '" + fileName + "' has a null Tag property.");
+            Assert.AreEqual<int>(Convert.ToInt32(trackNumber), (int)track.Tag["TrackNumber"]);
+        }
     }
 }

trunk/DataModel.UnitTests/App.config

@@ -10 +10 @@
   <microsoft.visualstudio.testtools>
     <dataSources>
-      <add name="SupportedFiles" connectionString="FileListConnection" dataTableName="Supported$" dataAccessMethod="Sequential"/>
-      <add name="UnsupportedFiles" connectionString="FileListConnection" dataTableName="Unsupported$" dataAccessMethod="Sequential"/>
-      <add name="InvalidFiles" connectionString="FileListConnection" dataTableName="Invalid$" dataAccessMethod="Sequential"/>
+      <add name="AudioSupportedFiles" connectionString="FileListConnection" dataTableName="AudioSupported$" dataAccessMethod="Sequential"/>
+      <add name="AudioUnsupportedFiles" connectionString="FileListConnection" dataTableName="AudioUnsupported$" dataAccessMethod="Sequential"/>
+      <add name="AudioInvalidFiles" connectionString="FileListConnection" dataTableName="AudioInvalid$" dataAccessMethod="Sequential"/>
+      <add name="TagSupportedFiles" connectionString="FileListConnection" dataTableName="TagSupported$" dataAccessMethod="Sequential"/>
     </dataSources>
   </microsoft.visualstudio.testtools>

trunk/DataModel.UnitTests/DataModel.UnitTests.csproj

@@ -53 +53 @@
       <Project>{08D4BF3C-24E5-4D2D-BE7C-5C09F3DA7D88}</Project>
       <Name>AddInModel</Name>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\AudioModel\AudioModel.csproj">
       <Project>{1EFE00B7-0B55-4A02-9C7B-78C8049016F9}</Project>
       <Name>AudioModel</Name>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\DataModel\DataModel.csproj">
       <Project>{DDE1CDD5-8D83-4A63-A6E3-DD0863C0FE70}</Project>
       <Name>DataModel</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\TagModel\TagModel.csproj">
+      <Project>{06D79C17-FC18-4F59-A115-6B1E01E5E32A}</Project>
+      <Name>TagModel</Name>
+      <Private>False</Private>
     </ProjectReference>
   </ItemGroup>

trunk/DataModel/DataModel.csproj

@@ -64 +64 @@
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\TagModel\TagModel.csproj">
+      <Project>{06D79C17-FC18-4F59-A115-6B1E01E5E32A}</Project>
+      <Name>TagModel</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

trunk/DataModel/Track.cs

@@ -19 +19 @@
 
 using OmniEncoder.AudioModel;
+using OmniEncoder.TagModel;
 
 namespace OmniEncoder.DataModel
@@ -25 +26 @@
     {
         readonly string fileName;
-        readonly IAudio audioInfo;
+        readonly IAudio audio;
+        readonly ITag tag;
 
-        internal Track(string fileName, IAudio audioInfo)
+        internal Track(string fileName, IAudio audio, ITag tag)
         {
             this.fileName = fileName;
-            this.audioInfo = audioInfo;
+            this.audio = audio;
+            this.tag = tag;
         }
 
@@ -38 +41 @@
         }
 
-        public IAudio AudioInfo
+        public IAudio Audio
         {
-            get { return audioInfo; }
+            get { return audio; }
+        }
+
+        public ITag Tag
+        {
+            get { return tag; }
         }
     }

trunk/DataModel/TrackFactory.cs

@@ -19 +19 @@
 
 using OmniEncoder.AudioModel;
+using OmniEncoder.TagModel;
 
 namespace OmniEncoder.DataModel
@@ -26 +27 @@
         internal static Track MakeTrack(string fileName)
         {
-            IAudio audioInfo = new CompositeAudioFormat().GetAudio(fileName);
-            return new Track(fileName, audioInfo);
+            IAudio audio = new CompositeAudioFormat().GetAudio(fileName);
+            ITag tag = new CompositeTagFormat().GetTag(fileName);
+            return new Track(fileName, audio, tag);
         }
     }

trunk/HostSideAdapters/AudioModel.HostSideAdapters/AudioFormatContractToViewAdapter.cs

@@ -66 +66 @@
                 {
                     // Custom exceptions don't have contracts, so re-throw based on the name.
-                    case "OmniEncoder.AudioModel.AddInViews.UnsupportedAudioException":
-                        throw new UnsupportedAudioException(e.Message, e);
-                    case "OmniEncoder.AudioModel.AddInViews.InvalidAudioException":
-                        throw new InvalidAudioException(e.Message, e);
+                    case "OmniEncoder.AudioModel.AddInViews.AudioUnsupportedException":
+                        throw new AudioUnsupportedException(e.Message, e);
+                    case "OmniEncoder.AudioModel.AddInViews.AudioInvalidException":
+                        throw new AudioInvalidException(e.Message, e);
 
                     // All other exceptions indicate add-in failure.

trunk/OmniEncoder.sln

@@ -14 +14 @@
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestFiles", "TestFiles", "{57261C29-B3B2-4FD0-9C0C-F2B41F6634D6}"
         ProjectSection(SolutionItems) = preProject
+                TestFiles\AudioInvalid00.wav = TestFiles\AudioInvalid00.wav
+                TestFiles\AudioSupported00.wav = TestFiles\AudioSupported00.wav
+                TestFiles\AudioSupported01.wav = TestFiles\AudioSupported01.wav
+                TestFiles\AudioSupported02.wav = TestFiles\AudioSupported02.wav
+                TestFiles\AudioUnsupported00.txt = TestFiles\AudioUnsupported00.txt
+                TestFiles\AudioUnsupported00.wav = TestFiles\AudioUnsupported00.wav
                 TestFiles\FileList.xlsx = TestFiles\FileList.xlsx
-                TestFiles\Invalid00.wav = TestFiles\Invalid00.wav
-                TestFiles\Supported00.wav = TestFiles\Supported00.wav
-                TestFiles\Supported01.wav = TestFiles\Supported01.wav
-                TestFiles\Supported02.wav = TestFiles\Supported02.wav
-                TestFiles\Unsupported00.txt = TestFiles\Unsupported00.txt
-                TestFiles\Unsupported00.wav = TestFiles\Unsupported00.wav
+                TestFiles\TagSupported00.wav = TestFiles\TagSupported00.wav
         EndProjectSection
 EndProject
@@ -48 +49 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WaveAudio", "AddIns\WaveAudio\WaveAudio.csproj", "{60743B1C-8EC7-4278-B940-EEB22EAA961D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TagModel", "TagModel\TagModel.csproj", "{06D79C17-FC18-4F59-A115-6B1E01E5E32A}"
 EndProject
 Global
@@ -99 +102 @@
                 {60743B1C-8EC7-4278-B940-EEB22EAA961D}.Release|Any CPU.ActiveCfg = Release|Any CPU
                 {60743B1C-8EC7-4278-B940-EEB22EAA961D}.Release|Any CPU.Build.0 = Release|Any CPU
+                {06D79C17-FC18-4F59-A115-6B1E01E5E32A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {06D79C17-FC18-4F59-A115-6B1E01E5E32A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {06D79C17-FC18-4F59-A115-6B1E01E5E32A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {06D79C17-FC18-4F59-A115-6B1E01E5E32A}.Release|Any CPU.Build.0 = Release|Any CPU
         EndGlobalSection
         GlobalSection(SolutionProperties) = preSolution