Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins: [213] trunk/plugins
|
From: <an...@us...> - 2007-03-23 13:29:46
|
Revision: 213
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=213&view=rev
Author: and-81
Date: 2007-03-23 06:29:45 -0700 (Fri, 23 Mar 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ComSkipLauncher TVE2/ComSkipLauncher.cs
trunk/plugins/ComSkipLauncher TVE2/Configuration.cs
trunk/plugins/ComSkipLauncher TVE3/ComSkipLauncher.cs
trunk/plugins/ComSkipLauncher TVE3/PluginSetup.cs
Modified: trunk/plugins/ComSkipLauncher TVE2/ComSkipLauncher.cs
===================================================================
--- trunk/plugins/ComSkipLauncher TVE2/ComSkipLauncher.cs 2007-03-23 04:43:45 UTC (rev 212)
+++ trunk/plugins/ComSkipLauncher TVE2/ComSkipLauncher.cs 2007-03-23 13:29:45 UTC (rev 213)
@@ -28,9 +28,9 @@
#region Members
- bool _runAtStart;
- string _program;
- string _parameters;
+ bool _runAtStart = false;
+ string _program = DefaultProgram;
+ string _parameters = DefaultParameters;
#endregion Members
@@ -42,19 +42,15 @@
LoadSettings();
- if (_runAtStart)
- Recorder.OnTvRecordingStarted += new Recorder.OnTvRecordingHandler(Recorder_OnTvRecordingStarted);
- else
- Recorder.OnTvRecordingEnded += new Recorder.OnTvRecordingHandler(Recorder_OnTvRecordingEnded);
+ Recorder.OnTvRecordingStarted += new Recorder.OnTvRecordingHandler(Recorder_OnTvRecordingStarted);
+ Recorder.OnTvRecordingEnded += new Recorder.OnTvRecordingHandler(Recorder_OnTvRecordingEnded);
}
public void Stop()
{
Log.Info("ComSkipLauncher: Stop");
- if (_runAtStart)
- Recorder.OnTvRecordingStarted -= new Recorder.OnTvRecordingHandler(Recorder_OnTvRecordingStarted);
- else
- Recorder.OnTvRecordingEnded -= new Recorder.OnTvRecordingHandler(Recorder_OnTvRecordingEnded);
+ Recorder.OnTvRecordingStarted -= new Recorder.OnTvRecordingHandler(Recorder_OnTvRecordingStarted);
+ Recorder.OnTvRecordingEnded -= new Recorder.OnTvRecordingHandler(Recorder_OnTvRecordingEnded);
}
#endregion
@@ -74,15 +70,15 @@
LoadSettings();
Configuration configuration = new Configuration();
- configuration.RunAtStart = _runAtStart;
- configuration.Program = _program;
- configuration.Parameters = _parameters;
+ configuration.RunAtStart = _runAtStart;
+ configuration.Program = _program;
+ configuration.Parameters = _parameters;
if (configuration.ShowDialog() == DialogResult.OK)
{
- _runAtStart = configuration.RunAtStart;
- _program = configuration.Program;
- _parameters = configuration.Parameters;
+ _runAtStart = configuration.RunAtStart;
+ _program = configuration.Program;
+ _parameters = configuration.Parameters;
SaveSettings();
}
@@ -102,13 +98,17 @@
{
Log.Debug("ComSkipLauncher: Recorder_OnTvRecordingStarted {0}", recordingFilename);
+ if (!_runAtStart)
+ return;
+
try
{
- string parameters = ProcessParameters(_parameters, recordingFilename);
+ string parameters = ProcessParameters(_parameters, recordingFilename, recording.Channel);
Log.Info(
- "ComSkipLauncher: Recording started ({0}), launching program ({1} {2}) ...",
+ "ComSkipLauncher: Recording started ({0} on {1}), launching program ({2} {3}) ...",
recordingFilename,
+ recording.Channel,
_program,
parameters
);
@@ -124,13 +124,17 @@
{
Log.Debug("ComSkipLauncher: Recorder_OnTvRecordingEnded {0}", recordingFilename);
+ if (_runAtStart)
+ return;
+
try
{
- string parameters = ProcessParameters(_parameters, recordingFilename);
+ string parameters = ProcessParameters(_parameters, recordingFilename, recording.Channel);
Log.Info(
- "ComSkipLauncher: Recording ended ({0}), launching program ({1} {2}) ...",
+ "ComSkipLauncher: Recording ended ({0} on {1}), launching program ({2} {3}) ...",
recordingFilename,
+ recording.Channel,
_program,
parameters
);
@@ -156,6 +160,10 @@
}
catch (Exception ex)
{
+ _runAtStart = false;
+ _program = DefaultProgram;
+ _parameters = DefaultParameters;
+
Log.Error("ComSkipLauncher: {0}", ex.Message);
}
}
@@ -176,7 +184,7 @@
}
}
- internal static string ProcessParameters(string input, string fileName)
+ internal static string ProcessParameters(string input, string fileName, string channel)
{
string output = String.Empty;
@@ -189,7 +197,8 @@
Path.GetFileNameWithoutExtension(fileName), // {2} = Recorded filename (w/o path or extension)
Path.GetDirectoryName(fileName), // {3} = Recorded file path
DateTime.Now.ToShortDateString(), // {4} = Current date
- DateTime.Now.ToShortTimeString() // {5} = Current time
+ DateTime.Now.ToShortTimeString(), // {5} = Current time
+ channel // {6} = Channel name
);
}
catch (Exception ex)
Modified: trunk/plugins/ComSkipLauncher TVE2/Configuration.cs
===================================================================
--- trunk/plugins/ComSkipLauncher TVE2/Configuration.cs 2007-03-23 04:43:45 UTC (rev 212)
+++ trunk/plugins/ComSkipLauncher TVE2/Configuration.cs 2007-03-23 13:29:45 UTC (rev 213)
@@ -91,7 +91,7 @@
try
{
- string parameters = ComSkipLauncher.ProcessParameters(param, textBoxTest.Text);
+ string parameters = ComSkipLauncher.ProcessParameters(param, textBoxTest.Text, "test");
ComSkipLauncher.LaunchProcess(program, parameters, Path.GetDirectoryName(program), ProcessWindowStyle.Normal);
}
Modified: trunk/plugins/ComSkipLauncher TVE3/ComSkipLauncher.cs
===================================================================
--- trunk/plugins/ComSkipLauncher TVE3/ComSkipLauncher.cs 2007-03-23 04:43:45 UTC (rev 212)
+++ trunk/plugins/ComSkipLauncher TVE3/ComSkipLauncher.cs 2007-03-23 13:29:45 UTC (rev 213)
@@ -30,9 +30,9 @@
#region Members
- bool _runAtStart;
- string _program;
- string _parameters;
+ bool _runAtStart = true;
+ string _program = DefaultProgram;
+ string _parameters = DefaultParameters;
#endregion Members
@@ -104,22 +104,18 @@
try
{
TvServerEventArgs tvEvent = (TvServerEventArgs)eventArgs;
- string parameters;
+ string parameters = ProcessParameters(_parameters, tvEvent.Recording.FileName, tvEvent.channel.Name);
if (tvEvent.EventType == TvServerEventType.RecordingStarted && _runAtStart)
{
- parameters = ProcessParameters(_parameters, tvEvent.Recording.FileName);
+ Log.Info("ComSkipLauncher: Recording started ({0} on {1}), launching program ({2} {3}) ...", tvEvent.Recording.FileName, tvEvent.channel.Name, _program, parameters);
- Log.Info("ComSkipLauncher: Recording started ({0}), launching program ({1} {2}) ...", tvEvent.Recording.FileName, _program, parameters);
-
LaunchProcess(_program, parameters, Path.GetDirectoryName(tvEvent.Recording.FileName), ProcessWindowStyle.Hidden);
}
else if (tvEvent.EventType == TvServerEventType.RecordingEnded && !_runAtStart)
{
- parameters = ProcessParameters(_parameters, tvEvent.Recording.FileName);
+ Log.Info("ComSkipLauncher: Recording ended ({0} on {1}), launching program ({2} {3}) ...", tvEvent.Recording.FileName, tvEvent.channel.Name, _program, parameters);
- Log.Info("ComSkipLauncher: Recording ended ({0}), launching program ({1} {2}) ...", tvEvent.Recording.FileName, _program, parameters);
-
LaunchProcess(_program, parameters, Path.GetDirectoryName(tvEvent.Recording.FileName), ProcessWindowStyle.Hidden);
}
}
@@ -141,11 +137,15 @@
}
catch (Exception ex)
{
+ _runAtStart = true;
+ _program = DefaultProgram;
+ _parameters = DefaultParameters;
+
Log.Error("ComSkipLauncher - LoadSettings(): {0}", ex.Message);
}
}
- internal static string ProcessParameters(string input, string fileName)
+ internal static string ProcessParameters(string input, string fileName, string channel)
{
string output = String.Empty;
@@ -158,7 +158,8 @@
Path.GetFileNameWithoutExtension(fileName), // {2} = Recorded filename (w/o path or extension)
Path.GetDirectoryName(fileName), // {3} = Recorded file path
DateTime.Now.ToShortDateString(), // {4} = Current date
- DateTime.Now.ToShortTimeString() // {5} = Current time
+ DateTime.Now.ToShortTimeString(), // {5} = Current time
+ channel // {6} = Channel name
);
}
catch (Exception ex)
Modified: trunk/plugins/ComSkipLauncher TVE3/PluginSetup.cs
===================================================================
--- trunk/plugins/ComSkipLauncher TVE3/PluginSetup.cs 2007-03-23 04:43:45 UTC (rev 212)
+++ trunk/plugins/ComSkipLauncher TVE3/PluginSetup.cs 2007-03-23 13:29:45 UTC (rev 213)
@@ -122,7 +122,7 @@
try
{
- string parameters = ComSkipLauncher.ProcessParameters(param, textBoxTest.Text);
+ string parameters = ComSkipLauncher.ProcessParameters(param, textBoxTest.Text, "test");
ComSkipLauncher.LaunchProcess(program, parameters, Path.GetDirectoryName(program), ProcessWindowStyle.Normal);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
