コマンドファイルをリソースにするのをやめる

Author: berryzplus

include/BatchCommand.h

@@ -9,7 +9,6 @@ class BatchCommand {
 	typedef BatchCommand _Myt;
 
 public:
-	BatchCommand(_In_ WORD wBatchResourceId);
 	BatchCommand(_In_opt_ const std::wstring& batchContent = L"");
 	BatchCommand(_Inout_ _Myt &&other) = delete;
 	_Myt& operator = (_Inout_ _Myt &&rhs) = delete;

include/GitHubPR.h

@@ -13,10 +13,9 @@ class GitHubPrApp {
 	PrivateProfile profile;
 	std::wstring profileBuffer;
 	std::wstring gitRemoteName;
-	std::wstring homeBranch;
 	std::wstring branchPrefix;
 	std::wstring prNumber;
-	std::wstring currentBranch;
+	bool branchNameExists;
 
 public:
 	void initSettings(_In_ const std::wstring &targetDir);

include/resource.h

@@ -2,10 +2,6 @@
 // Microsoft Visual C++ generated include file.
 // Used by Win32Project1.rc
 //
-#define IDR_CMD_GET_PR                  101
-#define IDR_CMD_ENUM_REMOTES            102
-#define IDR_CMD_ENUM_BRANCHS            103
-#define IDR_CMD_CHECKOUT_BRANCH         104
 #define IDS_ENTER_PRNUMBER              105
 #define IDS_ENTER_BRANCH                106
 #define IDS_ENTER_REMOTE                107

src/BatchCommand.cpp

@@ -9,12 +9,6 @@
 #endif /* __MINGW32__ */
 
 
-BatchCommand::BatchCommand(_In_ WORD wBatchResourceId)
-{
-	batContent = loadBatchContent(wBatchResourceId);
-	batName = generateBatchName();
-}
-
 BatchCommand::BatchCommand(_In_opt_ const std::wstring& batchContent)
 {
 	batContent = std::move(batchContent);
@@ -33,28 +27,6 @@ std::wstring BatchCommand::generateBatchName()
 	return std::wstring(fnTemplate);
 }
 
-// リソースからバッチ内容を読み込む
-std::wstring BatchCommand::loadBatchContent(_In_ WORD wBatchResourceId)
-{
-	HRSRC hres = ::FindResource(NULL, MAKEINTRESOURCE(wBatchResourceId), (LPCWSTR)L"BatchCommands");
-	if (!hres) {
-		THROW_APP_EXCEPTION("resource not found.");
-	}
-	const SIZE_T cbResData = ::SizeofResource(NULL, hres);
-	HGLOBAL hResData = ::LoadResource(NULL, hres);
-	if (!hResData) {
-		THROW_APP_EXCEPTION("load resource failed.");
-	}
-	LPCSTR pResData = static_cast<LPSTR>(::LockResource(hResData));
-	if (!pResData) {
-		THROW_APP_EXCEPTION("lock resource failed.");
-	}
-	std::wstring batchContent(convertMbsToWString(pResData, cbResData));
-	UnlockResource(hResData);
-
-	return std::move(batchContent);
-}
-
 //バッチを実行してストリームを取得する
 std::unique_ptr<std::wistream> BatchCommand::invokeAndGetStream()
 {

src/GitHubPR.cpp

@@ -22,6 +22,7 @@ const WCHAR PR_NUMBER[] = L"PR_NUMBER";
 
 void GitHubPrApp::initSettings(_In_ const std::wstring &targetDir)
 {
+	constexpr bool saveEnvStr = false;
 	constexpr bool skipSave = true;
 
 	::SetConsoleTitle(GITHUB_PR);
@@ -55,20 +56,17 @@ void GitHubPrApp::initSettings(_In_ const std::wstring &targetDir)
 	std::wstring profileName = curDir + PROFILE_SUFFIX;
 	profile = std::move(PrivateProfile(profileName));
 
-	gitRemoteName = _initSetting(GIT_REMOTE_NAME, [this]() {return _getRemoteName(); }, skipSave);
+	gitRemoteName = _initSetting(GIT_REMOTE_NAME, [this]() {return _getRemoteName(); }, saveEnvStr);
 	branchPrefix = _initSetting(BRANCH_PREFIX, [this]() {return _getBranchPrefix(); }, skipSave);
 	prNumber = _initSetting(PR_NUMBER, [this]() {return _getPrNumber(); }, skipSave);
 
 	{
-		BatchCommand cmd(IDR_CMD_CHECKOUT_BRANCH);
+		BatchCommand cmd(L"@%GIT% checkout %BRANCH_NAME% > NUL 2>&1\r\n@ECHO %ERRORLEVEL%");
 		auto retList = cmd.invokeAndGetLines();
-		if (!retList.empty()) {
-			currentBranch = retList.back();
+		if (retList.empty()) {
+			THROW_APP_EXCEPTION("git checkout may not work correctly.");
 		}
-	}
-	if (!currentBranch.empty()) {
-		setEnvStr(L"CURRENT_BRANCH", currentBranch.c_str());
-		homeBranch = _initSetting(HOME_BRANCH, [this]() {return _getHomeBranch(); }, skipSave);
+		branchNameExists = retList.front() == L"0";
 	}
 }
 
@@ -114,7 +112,7 @@ std::wstring GitHubPrApp::_getRemoteName() const
 {
 	std::list<std::wstring> remotes;
 	{
-		BatchCommand cmd(IDR_CMD_ENUM_REMOTES);
+		BatchCommand cmd(L"@%GIT% remote");
 		remotes = cmd.invokeAndGetLines();
 		remotes.remove(L"");
 	}
@@ -174,7 +172,7 @@ std::wstring GitHubPrApp::_getHomeBranch() const
 {
 	std::list<std::wstring> branchs;
 	{
-		BatchCommand cmd(IDR_CMD_ENUM_BRANCHS);
+		BatchCommand cmd(L"@%GIT% branch --list");
 		branchs = cmd.invokeAndGetLines();
 		branchs.remove(L"");
 		std::wregex reBranch(L"^\\*?\\s+(.+)$");
@@ -218,8 +216,18 @@ std::wstring GitHubPrApp::_getHomeBranch() const
 
 void GitHubPrApp::executeBatch() const
 {
+	//実行するコマンドを組み立てる
+	std::wostringstream os;
+	if (!branchNameExists) {
+		os << L"@%GIT% fetch %GIT_REMOTE_NAME% pull/%PR_NUMBER%/head:%BRANCH_NAME%" << std::endl;
+		os << L"@%GIT% checkout %BRANCH_NAME%" << std::endl;
+	}
+	else {
+		os << L"@%GIT% pull %GIT_REMOTE_NAME% pull/%PR_NUMBER%/head" << std::endl;
+	}
+
 	//バッチファイルを実行する
-	BatchCommand cmd(IDR_CMD_GET_PR);
+	BatchCommand cmd(os.str());
 	auto lines(cmd.invokeAndGetLines());
 	std::for_each(lines.cbegin(), lines.cend(), [](const std::wstring &line) {std::wcout << line << std::endl; });
 }

src/GitHubPR.rc

@@ -19,16 +19,6 @@
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #pragma code_page(65001)
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// BatchCommands
-//
-
-IDR_CMD_GET_PR              BatchCommands          "../res/bat_get_pr.cmd"
-IDR_CMD_ENUM_REMOTES        BatchCommands          "../res/bat_enum_remotes.cmd"
-IDR_CMD_ENUM_BRANCHS        BatchCommands          "../res/bat_enum_branchs.cmd"
-IDR_CMD_CHECKOUT_BRANCH     BatchCommands          "../res/bat_checkout_branch.cmd"
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon

test/BatchCommandTest.cpp

@@ -11,13 +11,6 @@ TEST(BatchCommandTest, constructWithNoArg)
 	ASSERT_TRUE(cmd.GetContent().empty());
 }
 
-TEST(BatchCommandTest, constructWithResource)
-{
-	BatchCommand cmd(IDR_CMD_CHECKOUT_BRANCH);
-	EXPECT_FALSE(cmd.GetName().empty());
-	EXPECT_FALSE(cmd.GetContent().empty());
-}
-
 TEST(BatchCommandTest, constructWithCmdEcho)
 {
 	const WCHAR content[] = L"@echo test";
@@ -27,11 +20,6 @@ TEST(BatchCommandTest, constructWithCmdEcho)
 	ASSERT_STREQ(content, cmd.GetContent().c_str());
 }
 
-TEST(BatchCommandTest, constructWithInvalidResource)
-{
-	ASSERT_THROW({ BatchCommand cmd((WORD)0xFFFFu); }, std::runtime_error);
-}
-
 TEST(BatchCommandTest, executeBatchWithoutContent)
 {
 	BatchCommand cmd;