Fix #204

Update filebrowser.js

Author: benhatsor

filebrowser.js

@@ -123,8 +123,12 @@ async function renderSidebarHTML() {
     }
 
 
+    const currentTime = new Date().getTime();
+    
     // if repo obj dosen't exist
-    if (!repoObj || !repoObj.defaultBranch) {
+    if (!repoObj || !repoObj.defaultBranch
+        || repoObj.repoDataExpiration === undefined || repoObj.branchExpiration === undefined
+        || repoObj.repoDataExpiration < currentTime) {
 
       // get repo obj from git
       // and save to modified repos
@@ -1506,8 +1510,20 @@ async function renderBranchMenuHTML(renderAll) {
 
   let branchResp;
 
+  
+  // get current time
+  
+  let currentDate = new Date();
+  const currentTime = currentDate.getTime();
+  
+  currentDate.setDate(currentDate.getDate() + 1);
+  const dayFromNow = currentDate.getTime();
+  
+  
   // if repo obj exists
-  if (repoObj && repoObj.branches) {
+  if (repoObj && repoObj.branches &&
+      repoObj.branchExpiration !== undefined &&
+      repoObj.branchExpiration >= currentTime) {
 
     // get repository branches
     // from repo obj
@@ -1518,34 +1534,46 @@ async function renderBranchMenuHTML(renderAll) {
 
   // if branch menu isn't already rendered
   if (getAttr(branchMenu, 'tree') !== [user, repoName, contents].join()) {
-    
-    setAttr(branchMenu, 'tree', [user, repoName, contents].join());
-    
+        
     // show loading message
     branchMenu.innerHTML = '<div class="icon selected"><a>Loading...</a></div>';
 
-    // if branch resp isn't already stored
-    // in local storage
-    if (!repoObj || !repoObj.branches) {
-      
-      // get branches for repository
-      branchResp = await git.getBranches(treeLoc);
-
-      // if repo dosen't exist, return
-      if (branchResp.message) {
-        return;
-      }
-      
-      // clean resp and save only relevant fields
-      const cleanedResp = branchResp.map(branch => {
-        return { name: branch.name, commit: { sha: branch.commit.sha } };
-      });
-      
-      // save branch resp in local storage
-      updateModRepoBranches(fullName, cleanedResp);
-      
+    setAttr(branchMenu, 'tree', [user, repoName, contents].join()); 
+    
+  }
+  
+  
+  // if branch resp isn't already stored
+  // in local storage
+  if (!repoObj || !repoObj.branches ||
+    repoObj.branchExpiration === undefined ||
+    repoObj.branchExpiration < currentTime) {
+  
+    // get branches for repository
+    branchResp = await git.getBranches(treeLoc);
+  
+    // if repo dosen't exist, return
+    if (branchResp.message) {
+      return;
     }
-      
+  
+    // clean resp and save only relevant fields
+    const cleanedResp = branchResp.map(branch => {
+      return {
+        name: branch.name,
+        commit: {
+          sha: branch.commit.sha
+        }
+      };
+    });
+  
+    // save branch resp in local storage
+    updateModRepoBranches(fullName, cleanedResp);
+  
+    // save branch expiration date
+    // in local storage
+    updateModRepoBranchExpiration(fullName, dayFromNow);
+  
   }
 
 

full.css

@@ -778,7 +778,6 @@ body.notransition .sidebar {
   height: 2px;
   width: var(--sidebar-width);
   margin-bottom: -2px;
-  border-radius: 6px;
   pointer-events: none;
   background: #568af2;
   background: var(--rosemary-lighter);

repos.js

@@ -2,7 +2,8 @@
 // create a repository object
 function createRepoObj(fullName, selBranch, defaultBranch,
                        pushAccess, branches, private,
-                       isFork, empty) {
+                       isFork, empty,
+                       repoDataExpiration, branchExpiration) {
 
   return {
     fullName,
@@ -12,7 +13,9 @@ function createRepoObj(fullName, selBranch, defaultBranch,
     branches,
     private,
     isFork,
-    empty
+    empty,
+    repoDataExpiration,
+    branchExpiration,
   }
 
 }
@@ -86,6 +89,22 @@ function updateModRepoEmptyStatus(fullName, empty) {
 
 }
 
+function updateModRepoDataExpiration(fullName, time) {
+
+  modifiedRepos[fullName].repoDataExpiration = time;
+  
+  updateModReposLS();
+  
+}
+
+function updateModRepoBranchExpiration(fullName, time) {
+
+  modifiedRepos[fullName].branchExpiration = time;
+  
+  updateModReposLS();
+  
+}
+
 
 
 // get repo obj from git
@@ -102,7 +121,7 @@ async function fetchRepoAndSaveToModRepos(treeLoc) {
 
   // create temporary repo object
   const tempRepoObj = createRepoObj(fullName, selBranch, null,
-                                    null, null, null, null, null);
+                                    null, null, null, null, null, 0, 0);
 
   // add temp repo object
   // to modified repos
@@ -127,6 +146,16 @@ async function fetchRepoAndSaveToModRepos(treeLoc) {
     // check temp repo changed
     const tempRepo = modifiedRepos[fullName];
 
+    
+    // get repo data expiration time
+    // (two months from now)
+    
+    let expirationDate = new Date();
+    expirationDate.setDate(expirationDate.getDate() + (2 * 4 * 7));
+    
+    const twoMonthsTime = expirationDate.getTime();
+    
+    
     // create repo obj
     const repoObj = createRepoObj(fullName,
 
@@ -140,7 +169,11 @@ async function fetchRepoAndSaveToModRepos(treeLoc) {
 
                                   repo.private, repo.fork,
 
-                                  (tempRepo.empty ?? false));
+                                  (tempRepo.empty ?? false),
+                                  
+                                  twoMonthsTime,
+                                  
+                                  tempRepo.branchExpiration);
 
     // add repo object
     // to modified repos

worker/client-channel.js

@@ -4,7 +4,7 @@
 
 
 // update worker name when updating worker
-const WORKER_NAME = 'codeit-worker-v556';
+const WORKER_NAME = 'codeit-worker-v558';
 
 
 // internal paths