Backport changes from 1.2.x build to 1.1.3 build

margro · Oct 23, 2011 · b3aaf74 · b3aaf74
1 parent 9f5fb8d
commit b3aaf74
Show file tree

Hide file tree

Showing 8 changed files with 86 additions and 12 deletions.
diff --git a/TVServerXBMC/Changelog.txt b/TVServerXBMC/Changelog.txt
@@ -1,3 +1,9 @@
+1.1.3.109:
+- Send TvResult as integer to XBMC to be able to show a localized error message when timeshifting fails
+
+1.1.3.108:
+- Add GetSignalQuality command
+
 1.1.3.107:
 - Fix radio webstream detection when starting a timeshift fails
 

diff --git a/TVServerXBMC/Commands/GetSignalQuality.cs b/TVServerXBMC/Commands/GetSignalQuality.cs
@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using MPTvClient;
+
+namespace TVServerXBMC.Commands
+{
+    class GetSignalQuality : CommandHandler
+    {
+      public GetSignalQuality(ConnectionHandler connection)
+        : base(connection)
+        {
+
+        }
+
+        public override void handleCommand(string command, string[] arguments, ref TvControl.User me)
+        {
+          int cardID = -1;
+          List<string> results = new List<string>();
+
+          try
+          {
+            if (arguments != null)
+            {
+              cardID = Int32.Parse(arguments[0]);
+            }
+            else
+            {
+              cardID = me.CardId;
+            }
+
+            TVServerController server = TVServerConnection.GetServerInterface();
+            int level = server.GetSignalLevel(cardID);
+            int quality = server.GetSignalQuality(cardID);
+
+            writer.write(level.ToString() + "|" + quality.ToString());
+          }
+          catch
+          {
+            Console.WriteLine(getCommandToHandle() + ": failed");
+            writer.write("");
+          }
+          //getConnection().WriteLine("[ERROR]: Expected format: " + getCommandToHandle() + "[:cardID]");
+        }
+
+        public override string getCommandToHandle()
+        {
+          return "GetSignalQuality";
+        }
+    }
+}
diff --git a/TVServerXBMC/Commands/TimeshiftChannel.cs b/TVServerXBMC/Commands/TimeshiftChannel.cs
@@ -48,16 +48,19 @@ public override void handleCommand(string command, string[] arguments, ref TvCon
                     }
 
                     result = TVServerConnection.playChannel(chanId, resolveToIP, ref originalURL, ref me, ref timeShiftFileName);
-                    if (resolveToIP == true)
+                    if ( !result.StartsWith("[ERROR]") )
                     {
-                        result += "|" + originalURL;
+                      if (resolveToIP == true)
+                      {
+                          result += "|" + originalURL;
+                      }
+                      else
+                      {
+                          result += "|";
+                      }
+                      result += "|" + timeShiftFileName +
+                        "|" + me.CardId.ToString();
                     }
-                    else
-                    {
-                        result += "|";
-                    }
-                    result += "|" + timeShiftFileName +
-                      "|" + me.CardId.ToString();
 
                     writer.write(result);
                 }

diff --git a/TVServerXBMC/ConnectionHandler.cs b/TVServerXBMC/ConnectionHandler.cs
@@ -97,6 +97,7 @@ private void addHandlers()
             handlers.Add(new GetUserName(this));
             // Settings:
             handlers.Add(new GetCardSettings(this));
+            handlers.Add(new GetSignalQuality(this));
 
             //handlers.Add(new Test(this));
 

diff --git a/TVServerXBMC/Properties/AssemblyInfo.cs b/TVServerXBMC/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("1.1.3.107")]
-[assembly: AssemblyFileVersion("1.1.3.107")]
+[assembly: AssemblyVersion("1.1.3.109")]
+[assembly: AssemblyFileVersion("1.1.3.109")]
diff --git a/TVServerXBMC/TV/ServerInterface.cs b/TVServerXBMC/TV/ServerInterface.cs
@@ -163,7 +163,7 @@ public TvResult StartTimeShifting(int idChannel, ref string rtspURL, ref string
                 }
                 catch { }
 
-                Console.WriteLine("Timeshift started for channel: '" + vcard.ChannelName + "' on device '" + vcard.Name + "'");
+                Console.WriteLine("Timeshift started for channel: '" + vcard.ChannelName + "' on device '" + vcard.Name + "' card id=" + vcard.Id);
                 Log.Debug("TVServerXBMC: Timeshift started for channel: '" + vcard.ChannelName + "' on device '" + vcard.Name + "'");
                 Console.WriteLine("TV Server returned '" + rtspURL + "' as timeshift URL and " + timeshiftfilename + " as timeshift file");
                 Log.Debug("TVServerXBMC: TV Server returned '" + rtspURL + "' as timeshift URL and " + timeshiftfilename + " as timeshift file");
@@ -204,6 +204,7 @@ public TvResult StartTimeShifting(int idChannel, ref string rtspURL, ref string
             watch.Stop();
             Console.WriteLine("StartTimeShifting took " + watch.ElapsedMilliseconds.ToString() + " ms");
             Log.Debug("TVServerXBMC: StartTimeShifting took " + watch.ElapsedMilliseconds.ToString() + " ms");
+
             return result;
         }
 
@@ -1455,6 +1456,7 @@ public bool UpdateSchedule(int scheduleindex, int channelId, int active, String
                     updatedSchedule.PostRecordInterval = postRecordInterval;
                 }
                 updatedSchedule.Persist();
+                RemoteControl.Instance.OnNewSchedule();
 
                 return true;
             }
@@ -1472,6 +1474,7 @@ public bool UpdateRecording(int recordingindex, String recordingName)
 
             recording.Title = recordingName;
             recording.Persist();
+
             return true;
           }
           catch
@@ -1571,6 +1574,15 @@ public  List<String> GetCardSettings(int cardID)
             return cardSettingsList;
         }
 
+        public int GetSignalQuality(int cardID)
+        {
+          return controller.SignalLevel(cardID);
+        }
+
+        public int GetSignalLevel(int cardID)
+        {
+          return controller.SignalLevel(cardID);
+        }
         #endregion
     }
 }
diff --git a/TVServerXBMC/TVServerConnection.cs b/TVServerXBMC/TVServerConnection.cs
@@ -191,7 +191,7 @@ public static String playChannel(int chanId, bool resolveHostnames, ref string O
 
             if (result != TvResult.Succeeded)
             {
-                rtspURL = "[ERROR]: TVServer answer: " + result.ToString();
+                rtspURL = "[ERROR]: TVServer answer: " + result.ToString() + "|" + (int) result;
             }
             else
             {

diff --git a/TVServerXBMC/TVServerXBMC.csproj b/TVServerXBMC/TVServerXBMC.csproj
@@ -40,6 +40,7 @@
     <Compile Include="Commands\CloseConnection.cs" />
     <Compile Include="Commands\CommandHandler.cs" />
     <Compile Include="Commands\AddSchedule.cs" />
+    <Compile Include="Commands\GetSignalQuality.cs" />
     <Compile Include="Commands\GetCardSettings.cs" />
     <Compile Include="Commands\GetDriveSpace.cs" />
     <Compile Include="Commands\GetRecordingInfo.cs" />