Less checks for membership and sim running, so we can deal with foreigners and not running sims.

1 files changed, 35 insertions, 32 deletions

diff --git a/src/sledjchisl/sledjchisl.c b/src/sledjchisl/sledjchisl.c
index c67187b..c659fb1 100644
--- a/src/sledjchisl/sledjchisl.c
+++ b/src/sledjchisl/sledjchisl.c
@@ -2316,16 +2316,8 @@ TODO -
 
   if (m)
   {
-    if (member)
-    {
-      free(name);
-      name = xmprintf("%s_%s", sim, last);
-    }
-    else
-    {
-      free(name);
-      return;
-    }
+    free(name);
+    name = xmprintf("%s_%s", sim, last);
   }
 
   char TYPE  = m ? 'I' : 'O';
@@ -2361,8 +2353,7 @@ TODO -
 
   if (m)
   {
-    if (member)
-      fullName = qstrreplace("tn", name, " ", "_");
+    fullName = qstrreplace("tn", name, " ", "_");
   }
   if (NULL == fullName)
     fullName = qstrreplace("tn", simd->name, " ", "_");
@@ -2768,7 +2759,7 @@ byTab has the short name as the key, simData as the value.
       strftime(date, DATE_TIME_LEN, "%F_%T", localtime(&curtime));
       if (FLAG(m))
       {
-        if (member)
+//      if (member)
         {
           I("Member %s %s is being backed up to %s/%s_%s-%s.iar in tmux window %s.", sim, last, scBackup, sim, last, date, ourSims->backup);
           snprintf(toybuf, sizeof(toybuf), "save iar %s %s / password %s/%s_%s-%s.iar -c -f=/Trash", sim, last, scBackup, sim, last, date);
@@ -2779,41 +2770,46 @@ byTab has the short name as the key, simData as the value.
               I("Running gitar on %s %s", sim, last);
               gitar(simd, sim, count, window, panes, pane, true, member, last);
             }
-            sendTmuxCmd(ourSims->backup, toybuf);
-//          if (0 == do)
+            if (member)
             {
-              snprintf(toybuf, sizeof(toybuf), "Saved archive with [[:digit:]]+ items for %s %s", sim, last);
-              waitTmuxText(ourSims->backup, toybuf);
-              I("%s %s is done backing up.", sim, last);
-              sendTmuxCmd(ourSims->backup, "");
-              sendTmuxCmd(ourSims->backup, "");
-              if ('\0' != rSync[0])
+              sendTmuxCmd(ourSims->backup, toybuf);
+//            if (0 == do)
               {
-                I("%s %s is rsyncing.", sim, last);
-                if (shellMeFail("ionice -c3 nice -n 19 rsync -Ha -R --modify-window=2 -P --port=%d --remove-source-files %s/*.iar %s",
-                     rSyncPort, scBackup, rSync))
-                  E("rsync failed");
-                I("%s %s is done rsyncing.", sim, last);
+                snprintf(toybuf, sizeof(toybuf), "Saved archive with [[:digit:]]+ items for %s %s", sim, last);
+                waitTmuxText(ourSims->backup, toybuf);
+                I("%s %s is done backing up.", sim, last);
+                sendTmuxCmd(ourSims->backup, "");
+                sendTmuxCmd(ourSims->backup, "");
+                if ('\0' != rSync[0])
+                {
+                  I("%s %s is rsyncing.", sim, last);
+                  if (shellMeFail("ionice -c3 nice -n 19 rsync -Ha -R --modify-window=2 -P --port=%d --remove-source-files %s/*.iar %s",
+                    rSyncPort, scBackup, rSync))
+                    E("rsync failed");
+                  I("%s %s is done rsyncing.", sim, last);
+                }
               }
-              ourSims->la = waitLoadAverage(ourSims->la, loadAverageInc, simTimeOut);
             }
+            ourSims->la = waitLoadAverage(ourSims->la, loadAverageInc, simTimeOut);
           }
           else
             E("Can't find backup sim.");
         }
       }
-      else if (checkSimIsRunning(simd->tab))
+      else // if (checkSimIsRunning(simd->tab))
       {
+        bool running = checkSimIsRunning(simd->tab);
         I("Sim %s is being backed up to %s/backups/%s-%s.oar.", simd->name, scRoot, simd->tab, date);
         if ('\0' == rSync[0])
         {
           I("Running gitar on %s", simd->tab);
             gitar(simd, sim, count, window, panes, pane, false, member, last);
         }
-        snprintf(toybuf, sizeof(toybuf), "save oar --all %s/%s-%s.oar", scBackup, simd->tab, date);
-        sendTmuxCmd(simd->paneID, toybuf);
-//      if (0 == do)
+        if (running)
         {
+          snprintf(toybuf, sizeof(toybuf), "save oar --all %s/%s-%s.oar", scBackup, simd->tab, date);
+          sendTmuxCmd(simd->paneID, toybuf);
+//      if (0 == do)
           snprintf(toybuf, sizeof(toybuf), "Finished writing out OAR for %s", simd->name);
           waitTmuxText(simd->paneID, toybuf);
           I("%s is done backing up.", simd->name);
@@ -2827,8 +2823,8 @@ byTab has the short name as the key, simData as the value.
                 E("rsync failed");
             I("%s is done rsyncing.", simd->name);
           }
-          ourSims->la = waitLoadAverage(ourSims->la, loadAverageInc, simTimeOut);
         }
+        ourSims->la = waitLoadAverage(ourSims->la, loadAverageInc, simTimeOut);
       }
       break;
     }
@@ -8359,6 +8355,13 @@ void forEachMember(char *verb, simFunction func, simFunction not)
     char *file = xmprintf("%s/.lastTime", scBackup);
 
     free(last);
+    if (NULL != ourSims->target)
+    {
+      free(file);
+      func(NULL, ourSims->target, "Member", 0, 0, 0, 0);
+      return;
+    }
+
     last = (char *) qfile_load(file, NULL);
     if (shellMeFail("date +%%s > %s", file))
       E("date command failed!");