fix: cloning + updating of repos

raydak-labs · Jun 12, 2024 · 18ec80a · 18ec80a
1 parent 40b3a3a
commit 18ec80a
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 5 deletions.
diff --git a/src/recyclarr-importer.ts b/src/recyclarr-importer.ts
@@ -11,6 +11,7 @@ const DEFAULT_RECYCLARR_GIT_URL = "https://github.com/recyclarr/config-templates
 
 export const cloneRecyclarrTemplateRepo = async () => {
   const rootPath = recyclarrRepoPaths.root;
+  logger.info(`Checking Recyclarr repo (${rootPath})`);
 
   if (!fs.existsSync(rootPath)) {
     fs.mkdirSync(rootPath, { recursive: true });
@@ -25,9 +26,17 @@ export const cloneRecyclarrTemplateRepo = async () => {
     await simpleGit().clone(applicationConfig.recyclarrConfigUrl ?? DEFAULT_RECYCLARR_GIT_URL, rootPath);
   }
 
-  await gitClient.checkout(applicationConfig.recyclarrRevision ?? "master");
+  await gitClient.checkout(applicationConfig.recyclarrRevision ?? "master", ["-f"]);
+  const result = await gitClient.status();
 
-  logger.info(`Updating Recyclarr repo`);
+  if (!result.detached) {
+    const res = await gitClient.pull();
+    if (res.files.length > 0) {
+      logger.info(`Updated Recyclarr repo.`);
+    }
+  }
+
+  logger.info(`Recyclarr repo on '${result.current}'`);
 };
 
 export const getLocalTemplatePath = () => {

diff --git a/src/trash-guide.ts b/src/trash-guide.ts
@@ -20,6 +20,7 @@ const DEFAULT_TRASH_GIT_URL = "https://github.com/TRaSH-Guides/Guides";
 
 export const cloneTrashRepo = async () => {
   const rootPath = trashRepoPaths.root;
+  logger.info(`Checking TrashGuide repo (${rootPath})`);
 
   if (!fs.existsSync(rootPath)) {
     fs.mkdirSync(rootPath, { recursive: true });
@@ -34,9 +35,17 @@ export const cloneTrashRepo = async () => {
     await simpleGit().clone(applicationConfig.trashGuideUrl ?? DEFAULT_TRASH_GIT_URL, rootPath);
   }
 
-  await gitClient.checkout(applicationConfig.trashRevision ?? "master");
+  await gitClient.checkout(applicationConfig.trashRevision ?? "master", ["-f"]);
+  const result = await gitClient.status();
 
-  logger.info(`Updating TrashGuide repo`);
+  if (!result.detached) {
+    const res = await gitClient.pull();
+    if (res.files.length > 0) {
+      logger.info(`Updated TrashGuide repo.`);
+    }
+  }
+
+  logger.info(`TrashGuide repo on '${result.current}'`);
 };
 
 export const loadSonarrTrashCFs = async (arrType: ArrType): Promise<CFProcessing> => {

diff --git a/src/util.ts b/src/util.ts
@@ -23,7 +23,6 @@ const recyclarrRadarrQPs = `${recyclarrRadarrRoot}/includes/quality-profiles`;
 const trashRepoPath = "docs/json";
 const trashRepoRoot = `${repoPath}/trash-guides`;
 const trashRepoSonarrRoot = `${trashRepoRoot}/${trashRepoPath}/sonarr`;
-
 const trashRepoRadarrRoot = `${trashRepoRoot}/${trashRepoPath}/radarr`;
 
 export const trashRepoPaths = {