スタイル: コーディング規約に準拠したコードフォーマットの適用(this.の明示、空白スタイルの統一)

- 自インスタンスメンバーアクセスへの this. 付与(28ファイル)
- .editorconfig に準拠したインデント・波括弧・空白スタイルの適用
- UTF-8 (BOMあり)、CRLF改行コード、行末空白除去の整合性検証
This commit is contained in:
armonica committed 2026-10-20 10:14:26 +09:00
1 parent 2fa40c950f
commit ae86b53147
28 files changed
+1362 -1380

No files matched your search

+57 -57
View File
@@ -132,8 +132,8 @@ namespace GameLauncher.Services
public GameScannerService()
{
var baseDir = AppPathHelper.GetExeDirectory();
_cacheFilePath = Path.Combine(baseDir, "games_cache.json");
_bookmarksFilePath = Path.Combine(baseDir, "bookmarks.json");
this._cacheFilePath = Path.Combine(baseDir, "games_cache.json");
this._bookmarksFilePath = Path.Combine(baseDir, "bookmarks.json");
}
/// <summary>
@@ -145,11 +145,11 @@ namespace GameLauncher.Services
var list = new List<GameItemBase>();
// 1. 本アプリのキャッシュが存在すればロード
if (File.Exists(_cacheFilePath))
if (File.Exists(this._cacheFilePath))
{
try
{
string json = File.ReadAllText(_cacheFilePath);
string json = File.ReadAllText(this._cacheFilePath);
var entries = JsonSerializer.Deserialize<List<UnifiedGameCacheEntry>>(json);
if (entries != null)
{
@@ -451,7 +451,7 @@ namespace GameLauncher.Services
if (imported)
{
SaveCache(list);
this.SaveCache(list);
}
}
catch { }
@@ -460,7 +460,7 @@ namespace GameLauncher.Services
// キャッシュが破棄・再スキャンされても、ブックマークは bookmarks.json から維持されます。
try
{
var bookmarkKeys = LoadBookmarks();
var bookmarkKeys = this.LoadBookmarks();
if (bookmarkKeys.Count > 0)
{
foreach (var item in list)
@@ -473,7 +473,7 @@ namespace GameLauncher.Services
}
// フォルダが消えたブックマークを除去し、既存キャッシュからの移行も兼ねて保存し直します。
SaveBookmarks(list);
this.SaveBookmarks(list);
}
catch { }
@@ -569,7 +569,7 @@ namespace GameLauncher.Services
};
string json = JsonSerializer.Serialize(entries, options);
File.WriteAllText(_cacheFilePath, json);
File.WriteAllText(this._cacheFilePath, json);
}
catch { }
}
@@ -606,12 +606,12 @@ namespace GameLauncher.Services
try
{
if (!File.Exists(_bookmarksFilePath))
if (!File.Exists(this._bookmarksFilePath))
{
return set;
}
string json = File.ReadAllText(_bookmarksFilePath);
string json = File.ReadAllText(this._bookmarksFilePath);
var keys = JsonSerializer.Deserialize<List<string>>(json);
if (keys != null)
{
@@ -651,7 +651,7 @@ namespace GameLauncher.Services
};
string json = JsonSerializer.Serialize(keys, options);
File.WriteAllText(_bookmarksFilePath, json);
File.WriteAllText(this._bookmarksFilePath, json);
}
catch { }
}
@@ -712,7 +712,7 @@ namespace GameLauncher.Services
}
// セーブデータ有無確認
bool hasSave = CheckHasSaveData(ug);
bool hasSave = this.CheckHasSaveData(ug);
if (ug.HasSaveData != hasSave)
{
ug.HasSaveData = hasSave;
@@ -987,7 +987,7 @@ namespace GameLauncher.Services
if (cacheNeedsSave)
{
SaveCache(copyList.Where(g => Directory.Exists(g.RootDirectory)));
this.SaveCache(copyList.Where(g => Directory.Exists(g.RootDirectory)));
}
}, ct);
}
@@ -1017,7 +1017,7 @@ namespace GameLauncher.Services
List<string> subDirs;
try
{
subDirs = Directory.EnumerateDirectories(targetPath).ToList();
subDirs = [.. Directory.EnumerateDirectories(targetPath)];
}
catch
{
@@ -1042,7 +1042,7 @@ namespace GameLauncher.Services
if (isExisting) return;
// ディレクトリ直下のゲームを検出
var game = DetectGameInDirectory(dir);
var game = this.DetectGameInDirectory(dir);
if (game != null)
{
lock (existingPaths)
@@ -1068,7 +1068,7 @@ namespace GameLauncher.Services
}
if (isChildExisting) continue;
var childGame = DetectGameInDirectory(childDir);
var childGame = this.DetectGameInDirectory(childDir);
if (childGame != null)
{
lock (existingPaths)
@@ -1105,21 +1105,21 @@ namespace GameLauncher.Services
// 後段のティラノ判定が誤反応してUnityがティラノ扱いになるため、
// 信頼性の高いUnity証拠(UnityPlayer.dll / *_Data\globalgamemanagers 等)を
// 最優先で評価し、他エンジン判定より先に確定させる。
var unityGame = DetectUnityGameInDirectory(dirPath);
var unityGame = this.DetectUnityGameInDirectory(dirPath);
if (unityGame != null)
{
return unityGame;
}
// 2. 次にツクール/ティラノ判定
var tkoolGame = DetectTkoolGameInDirectory(dirPath);
var tkoolGame = this.DetectTkoolGameInDirectory(dirPath);
if (tkoolGame != null)
{
return tkoolGame;
}
// 3. どの特定エンジンにも該当しない場合は「その他」ゲーム判定
var otherGame = DetectOtherGameInDirectory(dirPath);
var otherGame = this.DetectOtherGameInDirectory(dirPath);
if (otherGame != null)
{
return otherGame;
@@ -1240,7 +1240,7 @@ namespace GameLauncher.Services
var canApplyMod = false;
if (isExtracted && evbOutDir != null)
{
var pluginsJs = FindPluginsJs(evbOutDir, maxDepth: 2);
var pluginsJs = this.FindPluginsJs(evbOutDir, maxDepth: 2);
if (!string.IsNullOrEmpty(pluginsJs) && File.Exists(pluginsJs))
{
pluginsJsPath = pluginsJs;
@@ -1315,22 +1315,22 @@ namespace GameLauncher.Services
// 0. Enigma Virtual Box (EVB) パック済みゲームの検出(最優先・前段)。
// EVB は汎用パッカーで、内部にどのエンジンのゲームでも包めるため、
// 他エンジン判定より前に評価し、Evb 用の情報(本来エンジン等)を付与する。
var evbGame = DetectEvbGameInDirectory(dirPath, folderName, folderModified);
var evbGame = this.DetectEvbGameInDirectory(dirPath, folderName, folderModified);
if (evbGame != null)
{
return evbGame;
}
// 1. 通常の plugins.js 探索
var pluginsJs = FindPluginsJs(dirPath, maxDepth: 2);
var pluginsJs = this.FindPluginsJs(dirPath, maxDepth: 2);
if (pluginsJs != null)
{
var pluginsDir = Path.Combine(Path.GetDirectoryName(pluginsJs)!, "plugins");
var jsDir = Path.GetDirectoryName(pluginsJs)!;
var engineType = DetectEngineType(jsDir);
var title = ExtractTkoolTitle(dirPath, jsDir);
var exePath = FindTkoolExecutable(dirPath, jsDir);
var engineType = this.DetectEngineType(jsDir);
var title = this.ExtractTkoolTitle(dirPath, jsDir);
var exePath = this.FindTkoolExecutable(dirPath, jsDir);
var icon = LoadIcon(exePath, dirPath);
var isModded = TkoolModService.CheckIsModded(pluginsJs);
@@ -1357,24 +1357,24 @@ namespace GameLauncher.Services
}
// 2. boxed(nw.js埋め込み: *boxed*.exe + 埋め込みpackage.nw または on-disk www\)のツクール探索
var boxedGame = DetectBoxedNwGameInDirectory(dirPath, folderName, folderModified);
var boxedGame = this.DetectBoxedNwGameInDirectory(dirPath, folderName, folderModified);
if (boxedGame != null)
{
return boxedGame;
}
// 3. FOSSIL単体exe同梱のツクールMZ探索 (js/plugins.jsがexe内に埋め込まれている形態)
var fossilMzGame = DetectFossilMZGameInDirectory(dirPath, folderName, folderModified);
var fossilMzGame = this.DetectFossilMZGameInDirectory(dirPath, folderName, folderModified);
if (fossilMzGame != null)
{
return fossilMzGame;
}
// 3. 通常のティラノスクリプト探索
var tyranoIndex = FindTyranoIndexHtml(dirPath);
var tyranoIndex = this.FindTyranoIndexHtml(dirPath);
if (tyranoIndex != null)
{
var exePath = FindTkoolExecutable(dirPath, Path.GetDirectoryName(tyranoIndex)!);
var exePath = this.FindTkoolExecutable(dirPath, Path.GetDirectoryName(tyranoIndex)!);
var icon = LoadIcon(exePath, dirPath);
var isModded = TyranoModService.CheckIsModded(tyranoIndex);
bool isAsarPkg = AsarArchiveService.FindAsarPackage(dirPath, out var aPath, out bool isExt, out var extDir);
@@ -1403,14 +1403,14 @@ namespace GameLauncher.Services
// 4. app.asar パッケージであるか判定
if (AsarArchiveService.FindAsarPackage(dirPath, out var asarPath, out bool isExtracted, out var extractedDirPath))
{
var inspect = _asarService.InspectAsar(asarPath!);
var inspect = this._asarService.InspectAsar(asarPath!);
if (inspect.IsValid && (inspect.IsTkoolGame || inspect.IsTyranoGame))
{
var relJs = inspect.RelativePluginsJsPath ?? (inspect.IsTyranoGame ? "index.html" : "project/js/plugins.js");
var plannedJsPath = Path.Combine(extractedDirPath!, relJs.Replace('/', Path.DirectorySeparatorChar));
var plannedPluginsDir = Path.Combine(Path.GetDirectoryName(plannedJsPath)!, "plugins");
var exePath = FindTkoolExecutable(dirPath, extractedDirPath ?? dirPath);
var exePath = this.FindTkoolExecutable(dirPath, extractedDirPath ?? dirPath);
var icon = LoadIcon(exePath, dirPath);
bool isModded = false;
@@ -1446,21 +1446,21 @@ namespace GameLauncher.Services
}
// 5. WOLF RPGエディター(ウディタ)ゲームの検出
var wolfGame = DetectWolfGameInDirectory(dirPath, folderName, folderModified);
var wolfGame = this.DetectWolfGameInDirectory(dirPath, folderName, folderModified);
if (wolfGame != null)
{
return wolfGame;
}
// 6. SRPG Studio ゲームの検出
var srpgGame = DetectSrpgGameInDirectory(dirPath, folderName, folderModified);
var srpgGame = this.DetectSrpgGameInDirectory(dirPath, folderName, folderModified);
if (srpgGame != null)
{
return srpgGame;
}
// 7. ツクールVX / VX Ace (RGSS2 / RGSS3) ゲームの検出
var rgssGame = DetectRgssGameInDirectory(dirPath, folderName, folderModified);
var rgssGame = this.DetectRgssGameInDirectory(dirPath, folderName, folderModified);
if (rgssGame != null)
{
return rgssGame;
@@ -1634,12 +1634,12 @@ namespace GameLauncher.Services
long size = fs.Length;
// package.nw マーカーは exe の中間域に置かれることが多いため、中央付近から数点だけ走査する
long[] probes = new[]
{
long[] probes =
[
Math.Max(0, size / 2 - windowSize / 2),
Math.Max(0, size / 4),
Math.Max(0, size * 3 / 4),
};
];
foreach (var start in probes)
{
@@ -1699,7 +1699,7 @@ namespace GameLauncher.Services
var dataDir = Path.Combine(dirPath, "data");
var engine = DetectEngineTypeByDataJson(dirPath);
var title = ExtractTkoolTitle(dirPath, dataDir);
var title = this.ExtractTkoolTitle(dirPath, dataDir);
var icon = LoadIcon(boxedExe, dirPath);
return new TkoolGameItem
@@ -1769,7 +1769,7 @@ namespace GameLauncher.Services
return false;
}
double[] fractions = { 0.25, 0.5, 0.75, 0.9 };
double[] fractions = [0.25, 0.5, 0.75, 0.9];
foreach (var frac in fractions)
{
long start = (long)(size * frac);
@@ -1888,7 +1888,7 @@ namespace GameLauncher.Services
var trim = line.Trim();
if (trim.StartsWith("Title=", StringComparison.OrdinalIgnoreCase))
{
var val = trim.Substring(6).Trim();
var val = trim[6..].Trim();
if (!string.IsNullOrWhiteSpace(val))
{
title = val;
@@ -2082,7 +2082,7 @@ namespace GameLauncher.Services
var trim = line.Trim();
if (trim.StartsWith("Title=", StringComparison.OrdinalIgnoreCase))
{
var val = trim.Substring(6).Trim();
var val = trim[6..].Trim();
if (!string.IsNullOrWhiteSpace(val))
{
title = val;
@@ -2284,12 +2284,12 @@ namespace GameLauncher.Services
}
else if (trim.StartsWith("Title=", StringComparison.OrdinalIgnoreCase))
{
var val = trim.Substring(6).Trim();
var val = trim[6..].Trim();
if (!string.IsNullOrEmpty(val)) title = val;
}
else if (trim.StartsWith("RTP=", StringComparison.OrdinalIgnoreCase))
{
var val = trim.Substring(4).Trim();
var val = trim[4..].Trim();
if (val.Contains("RPGVXAce", StringComparison.OrdinalIgnoreCase))
{
engineType = TkoolEngineType.VXAce;
@@ -2303,7 +2303,7 @@ namespace GameLauncher.Services
}
else if (trim.StartsWith("Library=", StringComparison.OrdinalIgnoreCase))
{
var val = trim.Substring(8).Trim();
var val = trim[8..].Trim();
if (val.Contains("RGSS3", StringComparison.OrdinalIgnoreCase))
{
engineType = TkoolEngineType.VXAce;
@@ -2321,7 +2321,7 @@ namespace GameLauncher.Services
}
else if (trim.StartsWith("Scripts=", StringComparison.OrdinalIgnoreCase))
{
var val = trim.Substring(8).Trim();
var val = trim[8..].Trim();
if (val.EndsWith(".rvdata2", StringComparison.OrdinalIgnoreCase))
{
engineType = TkoolEngineType.VXAce;
@@ -2346,8 +2346,8 @@ namespace GameLauncher.Services
}
// アーカイブファイルの探索
var rgss3aFiles = Directory.Exists(searchDir) ? Directory.GetFiles(searchDir, "*.rgss3a", SearchOption.TopDirectoryOnly) : Array.Empty<string>();
var rgss2aFiles = Directory.Exists(searchDir) ? Directory.GetFiles(searchDir, "*.rgss2a", SearchOption.TopDirectoryOnly) : Array.Empty<string>();
var rgss3aFiles = Directory.Exists(searchDir) ? Directory.GetFiles(searchDir, "*.rgss3a", SearchOption.TopDirectoryOnly) : [];
var rgss2aFiles = Directory.Exists(searchDir) ? Directory.GetFiles(searchDir, "*.rgss2a", SearchOption.TopDirectoryOnly) : [];
if (rgss3aFiles.Length > 0)
{
@@ -2475,7 +2475,7 @@ namespace GameLauncher.Services
continue;
}
var result = FindPluginsJs(dir, maxDepth, currentDepth + 1);
var result = this.FindPluginsJs(dir, maxDepth, currentDepth + 1);
if (result != null) return result;
}
}
@@ -2489,14 +2489,14 @@ namespace GameLauncher.Services
try
{
var directIndex = Path.Combine(dirPath, "index.html");
if (File.Exists(directIndex) && CheckIsTyranoDirectory(dirPath))
if (File.Exists(directIndex) && this.CheckIsTyranoDirectory(dirPath))
{
return directIndex;
}
// FOSSILで梱包されたティラノスクリプトは index.html が FOSSILindex.html にリネームされる
var directFossilIndex = Path.Combine(dirPath, "FOSSILindex.html");
if (File.Exists(directFossilIndex) && CheckIsTyranoDirectory(dirPath))
if (File.Exists(directFossilIndex) && this.CheckIsTyranoDirectory(dirPath))
{
return directFossilIndex;
}
@@ -2511,13 +2511,13 @@ namespace GameLauncher.Services
continue;
var subIndex = Path.Combine(sub, "index.html");
if (File.Exists(subIndex) && CheckIsTyranoDirectory(sub))
if (File.Exists(subIndex) && this.CheckIsTyranoDirectory(sub))
{
return subIndex;
}
var subFossilIndex = Path.Combine(sub, "FOSSILindex.html");
if (File.Exists(subFossilIndex) && CheckIsTyranoDirectory(sub))
if (File.Exists(subFossilIndex) && this.CheckIsTyranoDirectory(sub))
{
return subFossilIndex;
}
@@ -2732,7 +2732,7 @@ namespace GameLauncher.Services
}
// 3. 実行可能ファイル(.exe)の探索
var exePath = FindUnityExecutable(dirPath, dataDir);
var exePath = this.FindUnityExecutable(dirPath, dataDir);
if (exePath == null)
{
return null;
@@ -2753,14 +2753,14 @@ namespace GameLauncher.Services
}
// 5. バックエンド(IL2CPP / Mono)の判定
var backend = DetectUnityBackendType(dirPath, dataDir);
var backend = this.DetectUnityBackendType(dirPath, dataDir);
// 6. Unityバージョンの取得
var unityVersion = DetectUnityVersion(dirPath, dataDir, unityPlayerDll);
var unityVersion = this.DetectUnityVersion(dirPath, dataDir, unityPlayerDll);
// 7. タイトルの決定
var folderName = Path.GetFileName(dirPath.TrimEnd('\\', '/'));
var title = DetermineUnityTitle(dirPath, exePath, productName, folderName);
var title = this.DetermineUnityTitle(dirPath, exePath, productName, folderName);
// 8. アイコン読み込み
var icon = LoadIcon(exePath, dirPath);
@@ -2784,7 +2784,7 @@ namespace GameLauncher.Services
FolderLastModified = folderModified
};
game.HasSaveData = CheckHasSaveData(game);
game.HasSaveData = this.CheckHasSaveData(game);
return game;
}