Skip to content

Commit

Permalink
こめたんぷれいや、NicoConvAssなどのツールでニコ生のコメントがなるべく正しく表示されるように変換。
Browse files Browse the repository at this point in the history 
- mail要素周りのロジックを修正
- こめたん、NicoConvAssを選んだ場合絵文字変換offにするように修正
  • Loading branch information
@nnn-revo2012
nnn-revo2012 committed Sep 12, 2022
1 parent 0682079 commit 607b607
Show file tree
Hide file tree
Showing 7 changed files with 51 additions and 16 deletions.
12 changes: 8 additions & 4 deletions README.txt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
===============================================================================
【タイトル】 comeconv
【ファイル】 comeconv.exe
【作成月日】 2022/09/11
【作成月日】 2022/09/12
【著 作 者】 nnn-revo2012
【開発環境】 Microsoft Windows 10
Microsoft Visual Studio Community 2019
Expand Down Expand Up @@ -131,6 +131,8 @@ https://support.microsoft.com/ja-jp/topic/windows-%E7%94%A8%E3%81%AE-microsoft-n
・Saccubus（さきゅばす）1.67.7.11、1.67.2.11、1.67.8.xx、1.70.0.xx
https://github.com/Saccubus/Saccubus1.x/releases
・commeon、commein
・こめたんぷれいや
・NicoConvAss
・動画ファイルおよびコメントファイル
- ニコ生新配信録画ツール（仮
- livedl
Expand Down Expand Up @@ -209,7 +211,9 @@ GNU General Public License v3.0
　エモーション　さくら絵文字を変換
　README.md、README.txtを現状に合わせて修正
　コンパイラを Microsoft Visual Studio Community 2019 に変更
2022/09/11　Version 0.0.1.18
2022/09/12　Version 0.0.1.18
　運営コメントのクルーズ、インフォ、その他の表示する／しないを変更するチェックボックス追加
　出力先アプリ選択のコンボボックス追加
　　- 選択されたアプリに応じたチェックボックスON/OFF、運営コメント変換などを行う
　変換先ソフト指定選択のコンボボックス追加
　　- 選択されたソフトに応じたチェックボックスON/OFF、運営コメント変換などを行う
　こめたんぷれいや、NicoConvAssなどのツールでニコ生のコメントがなるべく正しく表示されるように変換。
　※NicoConvAssの場合、アンケ表示、アスキーアートの表示がされない場合があります
2 changes: 1 addition & 1 deletion comeconv/App.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
<value>0</value>
</setting>
<setting name="SacAppList" serializeAs="String">
<value>0 さきゅばす(～1.67.7.11);1 さきゅばす(1.67.8.01～);2 commeon、commein;3 こめたん</value>
<value>0 さきゅばす(～1.67.7.11);1 さきゅばす(1.67.8.01～);2 commeon、commein;3 NicoConvAss;4 こめたん他ニコ動ソフト</value>
</setting>
</comeconv.Properties.Settings>
</userSettings>
Expand Down
44 changes: 36 additions & 8 deletions comeconv/ConvComment.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ private string ConvChatData(string chat, Props props)
ttt = _RegGift.Match(ttt).Groups[1].Value + "さん:"
+ _RegGift.Match(ttt).Groups[4].Value
+ "(+" + _RegGift.Match(ttt).Groups[2].Value + ")";
data["mail"] = "184 white shita medium";
data["mail"] = "184 white shita";
data["premium"] = "1";
}
}
Expand All @@ -198,7 +198,7 @@ private string ConvChatData(string chat, Props props)
if (ttt.Contains("🌸"))
ttt = ttt.Replace("🌸", "さくら");
}
data["mail"] = data["mail"] + " white shita medium";
data["mail"] = "184 white shita";
data["premium"] = "1";
}
}
Expand All @@ -217,7 +217,7 @@ private string ConvChatData(string chat, Props props)
if (jo["message"] != null)
{
ttt = jo["message"].ToString();
data["mail"] = data["mail"] + " white shita small";
data["mail"] = "184 white shita small";
data["premium"] = "1";
}
}
Expand All @@ -234,7 +234,10 @@ private string ConvChatData(string chat, Props props)
if (props.SacConvApp < 1 || props.SacConvApp > 2)
{
ttt = ttt.Substring(8).Trim('"');
data["mail"] = "184 white shita small";
if (!data.ContainsKey("mail"))
data["mail"] = "white shita small";
else
data["mail"] = data["mail"] + " white shita small";
data["premium"] = "1";
}
}
Expand All @@ -250,7 +253,10 @@ private string ConvChatData(string chat, Props props)
if (props.SacConvApp < 1 || props.SacConvApp > 2)
{
ttt = ttt.Substring(7).Trim('"');
data["mail"] = "184 white shita small";
if (!data.ContainsKey("mail"))
data["mail"] = "white shita small";
else
data["mail"] = data["mail"] + " white shita small";
data["premium"] = "1";
}
}
Expand All @@ -266,8 +272,10 @@ private string ConvChatData(string chat, Props props)
if (props.SacConvApp < 1 || props.SacConvApp > 2)
{
ttt = _RegInfo.Match(ttt.Substring(6)).Groups[2].Value;

data["mail"] = "184 white shita small";
if (!data.ContainsKey("mail"))
data["mail"] = "white shita small";
else
data["mail"] = data["mail"] + " white shita small";
data["premium"] = "1";
}
}
Expand All @@ -283,7 +291,10 @@ private string ConvChatData(string chat, Props props)
if (props.SacConvApp < 1 || props.SacConvApp > 2)
{
ttt = ttt.Substring(5).Trim('"');
data["mail"] = "184 white shita small";
if (!data.ContainsKey("mail"))
data["mail"] = "white shita small";
else
data["mail"] = data["mail"] + " white shita small";
data["premium"] = "1";
}
}
Expand Down Expand Up @@ -316,6 +327,17 @@ private string ConvChatData(string chat, Props props)
del_flg = true;
}
}
// 運営コマンドはすべてpremium="1"
if (props.SacConvApp > 2
&& (data["premium"] == "2" || data["premium"] == "3")
&& del_flg != true)
{
if (!data.ContainsKey("mail"))
data["mail"] = "white ue";
else
data["mail"] = data["mail"] + " white ue";
data["premium"] = "1";
}
}
else
{
Expand All @@ -327,6 +349,12 @@ private string ConvChatData(string chat, Props props)
}
}

// NicoConvAssの場合mail=のsmall,bigを削除
if (props.SacConvApp ==3 && data.ContainsKey("mail"))
{
data["mail"] = data["mail"].Replace("small", "").Replace("big", "");
}

//絵文字処理
if (props.IsSacEmoji)
{
Expand Down
2 changes: 2 additions & 0 deletions comeconv/Form1.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,8 @@ private void comboBox3_SelectedIndexChanged(object sender, EventArgs e)
checkBox2.Enabled = true;
checkBox13.Checked = true;
checkBox13.Enabled = true;
if (index > 2)
checkBox1.Checked = false;
}
else
{
Expand Down
2 changes: 1 addition & 1 deletion comeconv/Prop/Version.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ namespace comeconv.Prop
public class Ver
{
public static readonly string Version = "0.0.1.18";
public static readonly string VerDate = "2022/09/09";
public static readonly string VerDate = "2022/09/12";

public static string GetFullVersion()
{
Expand Down
3 changes: 2 additions & 1 deletion comeconv/Properties/Settings.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion comeconv/Properties/Settings.settings
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
<Value Profile="(Default)">0</Value>
</Setting>
<Setting Name="SacAppList" Type="System.String" Scope="User">
<Value Profile="(Default)">0 さきゅばす(～1.67.7.11);1 さきゅばす(1.67.8.01～);2 commeon、commein;3 こめたん</Value>
<Value Profile="(Default)">0 さきゅばす(～1.67.7.11);1 さきゅばす(1.67.8.01～);2 commeon、commein;3 NicoConvAss;4 こめたん他ニコ動ソフト</Value>
</Setting>
</Settings>
</SettingsFile>

0 comments on commit 607b607

Please sign in to comment.