Skip to content

Commit 222d68b

Browse files
marihachimarihachi
committed
fix way to get agqr server info
1 parent fe8cbfb commit 222d68b

File tree

6 files changed

+52
-23
lines changed

6 files changed

+52
-23
lines changed

‎src/Forms/Form1.Designer.cs

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Forms/Form1.cs

+4-3
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,9 @@ private void UpdateForm()
145145
private async void Form1_Load(object sender, EventArgs e)
146146
{
147147
Status("初期化しています...");
148-
var asmInfo = Assembly.GetExecutingAssembly().GetName();
149-
Text = string.Format(Text, asmInfo.Name, asmInfo.Version.ToString(3));
148+
149+
var title = Attribute.GetCustomAttribute(Assembly.GetExecutingAssembly(), typeof(AssemblyTitleAttribute)) as AssemblyTitleAttribute;
150+
Text = string.Format(Text, title.Title);
150151

151152
if (!File.Exists("rtmpdump.exe"))
152153
{
@@ -258,7 +259,7 @@ private void issuesMainMenuItem_Click(object sender, EventArgs e)
258259
private void versionMainMenuItem_Click(object sender, EventArgs e)
259260
{
260261
var asmInfo = Assembly.GetExecutingAssembly().GetName();
261-
MessageBox.Show($"ver.{asmInfo.Version.ToString(3)}", $"{asmInfo.Name}のバージョン情報");
262+
MessageBox.Show($"ver.{asmInfo.Version.ToString(4)}", $"{asmInfo.Name}のバージョン情報");
262263
}
263264

264265
//

‎src/Forms/Form1.resx

+10-10
Original file line numberDiff line numberDiff line change
@@ -117,15 +117,6 @@
117117
<resheader name="writer">
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120-
<metadata name="agTimeReservationMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
121-
<value>573, 17</value>
122-
</metadata>
123-
<metadata name="agKeywordReservationMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
124-
<value>768, 18</value>
125-
</metadata>
126-
<metadata name="agProgramListViewMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
127-
<value>373, 17</value>
128-
</metadata>
129120
<metadata name="imageList1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
130121
<value>990, 18</value>
131122
</metadata>
@@ -134,7 +125,7 @@
134125
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
135126
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
136127
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACc
137-
BAAAAk1TRnQBSQFMAwEBAAEoAQABKAEAARABAAEQAQAE/wEZAQAI/wFCAU0BNgcAATYDAAEoAwABQAMA
128+
BAAAAk1TRnQBSQFMAwEBAAEwAQABMAEAARABAAEQAQAE/wEZAQAI/wFCAU0BNgcAATYDAAEoAwABQAMA
138129
ARADAAEBAQABGAYAAQzYAAG3AaIBkwFjAUkBNQFjAUkBNQFjAUkBNQFjAUkBNQFjAUkBNQFjAUkBNQFj
139130
AUkBNQFjAUkBNQFjAUkBNQFjAUkBNQFjAUkBNZwAAbcBogGTAfcB5QHcAbcBogGTAbcBogGTAbcBogGT
140131
AbcBogGTAbcBogGTAbcBogGTAbcBogGTAbcBogGTAbcBogGTAWMBSQE1nAABtwGiAZMB+QHpAeIB+AHm
@@ -159,6 +150,15 @@
159150
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
160151
<value>263, 17</value>
161152
</metadata>
153+
<metadata name="agTimeReservationMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
154+
<value>573, 17</value>
155+
</metadata>
156+
<metadata name="agKeywordReservationMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
157+
<value>768, 18</value>
158+
</metadata>
159+
<metadata name="agProgramListViewMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
160+
<value>373, 17</value>
161+
</metadata>
162162
<metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
163163
<value>17, 17</value>
164164
</metadata>

‎src/Models/AgRecorder.cs

+30-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
1-
using Stacker.Models.EventArgses;
1+
using Codeplex.Data;
2+
using Newtonsoft.Json;
3+
using Stacker.Models.EventArgses;
24
using Stacker.Utilities;
35
using System;
46
using System.Diagnostics;
57
using System.IO;
8+
using System.Net.Http;
69
using System.Text.RegularExpressions;
710
using System.Threading.Tasks;
11+
using System.Xml;
12+
using System.Xml.Linq;
813

914
namespace Stacker.Models
1015
{
@@ -64,8 +69,31 @@ public void StartRecord(string filename, bool isVideo)
6469
{
6570
CreateOutputDirectory();
6671

72+
var doc = new XmlDocument();
73+
doc.LoadXml(new HttpClient().GetAsync("http://www.uniqueradio.jp/agplayerf/getfmsListHD.php").Result.Content.ReadAsStringAsync().Result);
74+
var jStr = JsonConvert.SerializeXmlNode(doc);
75+
var j = DynamicJson.Parse(jStr);
76+
77+
string server = null;
78+
string app = null;
79+
string playpath = null;
80+
81+
foreach (var serverinfo in j.ag.serverlist.serverinfo)
82+
{
83+
if (string.IsNullOrEmpty(serverinfo.cryptography))
84+
{
85+
server = serverinfo.server;
86+
app = serverinfo.app;
87+
playpath = serverinfo.stream;
88+
break;
89+
}
90+
}
91+
92+
if (server == null)
93+
throw new ApplicationException("A&Gのストリーミングサーバー情報の取得に失敗しました。");
94+
6795
var process = ConsoleExecuter.StartOnConsole(
68-
$"rtmpdump -v -r \"rtmpe://fms1.uniqueradio.jp/\" -a ?rtmp://fms-base2.mitene.ad.jp/agqr/ -y aandg22 | ffmpeg -y -i pipe:0 ./library/ag/temp_{Name}.{(isVideo ? "mp4" : "mp3")}");
96+
$"rtmpdump -v -r \"{server}\" --app \"{app}\" --playpath {playpath} | ffmpeg -y -i pipe:0 ./library/ag/temp_{Name}.{(isVideo ? "mp4" : "mp3")}");
6997

7098
Filename = filename;
7199
ConsoleProcess = process;

‎src/Properties/AssemblyInfo.cs

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
// アセンブリに関する一般情報は以下の属性セットをとおして制御されます。
66
// アセンブリに関連付けられている情報を変更するには、
77
// これらの属性値を変更してください。
8-
[assembly: AssemblyTitle("Stacker")]
9-
[assembly: AssemblyDescription("")]
8+
[assembly: AssemblyTitle("Stacker(α版)")]
9+
[assembly: AssemblyDescription("A internet radio recording application")]
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("")]
1212
[assembly: AssemblyProduct("Stacker")]
13-
[assembly: AssemblyCopyright("Copyright © 2016")]
13+
[assembly: AssemblyCopyright("Copyright © marihachi 2016")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
1616

@@ -32,5 +32,5 @@
3232
// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を
3333
// 既定値にすることができます:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("0.0.4.0")]
36-
[assembly: AssemblyFileVersion("0.0.4.0")]
35+
[assembly: AssemblyVersion("0.0.4.1")]
36+
[assembly: AssemblyFileVersion("0.0.4.1")]

‎src/Utilities/ConsoleAppExecuter.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public static Process StartOnConsole(string command, int TimeoutMillisec = 0)
5353
var p = new Process();
5454
p.StartInfo.FileName = "cmd.exe";
5555
p.StartInfo.Arguments = $"/C {command}";
56-
p.StartInfo.WindowStyle = ProcessWindowStyle.Minimized;
56+
p.StartInfo.WindowStyle = ProcessWindowStyle.Normal;
5757
p.Start();
5858

5959
return p;

0 commit comments

Comments
 (0)