627b526f8ff26ebb7539a5a6ee25f515a88242da
chmalee
  Tue Aug 6 15:10:06 2024 -0700
Can create a directory and place a hub.txt in it, and get an email for a userName

diff --git src/hg/hgHubConnect/trackHubWizard.c src/hg/hgHubConnect/trackHubWizard.c
index 74e29ce..5b27de0 100644
--- src/hg/hgHubConnect/trackHubWizard.c
+++ src/hg/hgHubConnect/trackHubWizard.c
@@ -1,196 +1,198 @@
 /* trackHubWizard -- a user interface for creating a track hubs configuration files */
 
 /* Copyright (C) 2019 The Regents of the University of California
  * See kent/LICENSE or http://genome.ucsc.edu/license/ for licensing information. */
 
 #include "common.h"
 #include "cart.h"
 #include "cheapcgi.h"
 #include "hdb.h"
 #include "hgConfig.h"
 #include "md5.h"
 #include "trashDir.h"
 #include "hgHubConnect.h"
 #include "jsHelper.h"
 #include "web.h"
 #include "wikiLink.h"
 #include "customTrack.h"
 #include "userdata.h"
 #include "jsonWrite.h"
 #include "cartJson.h"
 #include "hubSpace.h"
+#include "hubConnect.h"
 
 void removeOneFile(char *userName, char *cgiFileName)
 /* Remove one single file for userName */
 {
 char *fileName = prefixUserFile(userName, cgiFileName);
 if (fileExists(fileName))
     {
     fprintf(stderr, "deleting file: '%s'\n", fileName);
     removeFileForUser(fileName, userName);
     fflush(stderr);
     }
 }
 
 void doRemoveFile(struct cartJson *cj, struct hash *paramHash)
 /* Process the request to remove a file */
 {
 char *userName = getUserName();
 if (userName)
     {
     struct jsonElement *deleteJson = hashFindVal(paramHash, "fileNameList");
     //struct jsonWrite *errors = jsonWriteNew();
     // TODO: Check request is well-formed
     struct slRef *ele, *deleteList = deleteJson->val.jeList;
     jsonWriteListStart(cj->jw, "deletedList");
     for (ele = deleteList; ele != NULL; ele = ele->next)
         {
         struct jsonElement *jsonVal = ele->val;
         removeOneFile(userName, jsonVal->val.jeString);
         jsonWriteString(cj->jw, NULL, jsonVal->val.jeString);
         }
     jsonWriteListEnd(cj->jw);
     }
 }
 
 void doMoveFile(struct cartJson *cj, struct hash *paramHash)
 /* Move a file to a new hub */
 {
 }
 
-static void writeHubText(struct trackHub *hub, char *hubDir, char *fileName, boolean makeDir)
+static void writeHubText(char *path, char *userName, char *hubName, char *db)
 /* Create a hub.txt file, optionally creating the directory holding it */
 {
 int oldUmask = 00;
 oldUmask = umask(0);
 makeDirsOnPath(path);
 // restore umask
 umask(oldUmask);
 // now make the hub.txt with some basic information
-char *hubFile = catTwoStrings(path, "hub.txt");
-maybeTouchFile(hubFile);
-struct dyString *contents = dyStringNew(0);
-dyStringPrintf(contents, "hub %s\nemail %s\nshortLabel %s\nlongLabel %s\nuseOneFile on\n\ngenome %s\n\n", name, userName, name, name, db);
+char *hubFile = catTwoStrings(path, "/hub.txt");
+FILE *f = mustOpen(hubFile, "w");
+fprintf(stderr, "would write \"hub %s\nemail %s\nshortLabel %s\nlongLabel %s\nuseOneFile on\n\ngenome %s\n\n\" to %s", hubName, emailForUserName(userName), hubName, hubName, db, hubFile);
+//fprintf(f, "hub %s\nemail %s\nshortLabel %s\nlongLabel %s\nuseOneFile on\n\ngenome %s\n\n", hubName, emailForUserName(userName), hubName, hubName, db);
+carefulClose(&f);
 }
 
 void doCreateHub(struct cartJson *cj, struct hash *paramHash)
 /* Make a new hub.txt with the parameters from the JSON request */
 {
 char *userName = getUserName();
 if (userName)
     {
     struct jsonWrite *errors = jsonWriteNew();
     // verify the arguments:
     (void)cartJsonRequiredParam(paramHash, "createHub", errors, "doCreateHub");
-    // params is an object with everything necessary to create a hub: name and assembly
-    struct hash *params = jsonObjectVal(hashFindVal(paramHash, "createHub"), "createHub");
-    char *db = hashFindVal(params, "db");
-    char *name = hashFindVal(params, "name");
+    // paramHash is an object with everything necessary to create a hub: name and assembly
+    char *db = jsonStringVal(hashFindVal(paramHash, "db"), "db");
+    char *name = jsonStringVal(hashFindVal(paramHash, "name"), "name");
     fprintf(stderr, "creating hub '%s' for db '%s'\n", name, db);
     fflush(stderr);
     // check if this hub already exists, must have a directory and hub.txt already:
     char *path = prefixUserFile(userName, name);
     if (isDirectory(path))
         {
         // can't make a hub that already exists!
         }
     else
         {
         // good we can make a new directory and stuff a hub.txt in it
         // the directory needs to be 777, so ignore umask for now
+        writeHubText(path, userName, name, db);
         }
     }
 fprintf(stderr, "Status: 204 No Content\n\n");
 fflush(stdout);
 exit(0);
 }
 
 static void outFilesForUser()
 /* List out the currently stored files for the user and their sizes */
 {
 char *userName = getUserName();
 struct jsonWrite *jw = jsonWriteNew(); // the JSON to return for the client javascript
 jsonWriteObjectStart(jw, NULL);
 if (userName)
     {
     // the url for this user:
     jsonWriteString(jw, "userUrl", webDataDir(userName));
     jsonWriteListStart(jw, "fileList");
     struct hubSpace *file, *fileList = listFilesForUser(userName);
     for (file = fileList; file != NULL; file = file->next)
         {
         jsonWriteObjectStart(jw, NULL);
         jsonWriteString(jw, "fileName", file->fileName);
         jsonWriteNumber(jw, "fileSize", file->fileSize);
         jsonWriteString(jw, "fileType", file->fileType);
         jsonWriteString(jw, "hub", "temp");
         jsonWriteString(jw, "genome", file->db);
         jsonWriteString(jw, "createTime", file->creationTime);
         jsonWriteObjectEnd(jw);
         }
     jsonWriteListEnd(jw);
     }
 jsonWriteObjectEnd(jw);
 jsInlineF("var userFiles = %s;\n", dyStringCannibalize(&jw->dy));
 jsonWriteFree(&jw);
 }
 
 void doTrackHubWizard()
 /* Offer an upload form so users can upload all their hub files */
 {
 jsIncludeFile("utils.js", NULL);
 jsIncludeFile("ajax.js", NULL);
 jsIncludeFile("lodash.3.10.0.compat.min.js", NULL);
 jsIncludeFile("cart.js", NULL);
 jsIncludeFile("tus.js", NULL);
 jsIncludeFile("hgMyData.js", NULL);
 webIncludeResourceFile("../style/bootstrap.min.css");
 webIncludeResourceFile("../style/gb.css");
 puts("<link rel=\"stylesheet\" href=\"https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css\">\n");
 puts("<link rel=\"stylesheet\" type=\"text/css\" "
     "href=\"https://cdn.datatables.net/1.10.12/css/jquery.dataTables.min.css\">\n");
 puts("<script type=\"text/javascript\" "
     "src=\"https://cdn.datatables.net/1.10.12/js/jquery.dataTables.min.js\"></script>");
 puts("<div id='hubUpload' class='hubList'>\n");
 
 puts("<div class='row'>\n");
 puts("<div class='col-md-6'>\n");
 puts("<div class='row'>\n");
 puts("<div class='tabSection'>\n");
 puts("<h4>Create your own hub</h4>\n");
 puts("<p>After choosing files, click \"Create Hub\" to begin uploading the files to our server</p>\n");
 puts("<div class='buttonDiv' id='chooseAndSendFilesRow'>\n");
 puts("<button  id='btnForInput' class='button' for=\"chosenFiles\">Choose files</button>\n");
 puts("</div>\n"); // .buttonDiv
 puts("<div id='fileList' style=\"clear: right\"></div>\n");
 puts("</div>"); // .tabSection
 puts("</div>\n"); // row
 
 puts("<div class='row'>\n");
 puts("<div class='tabSection'>");
 puts("For information on making track hubs, see the following pages: \n "
     "<ul>\n"
     "<li><a href='../goldenPath/help/hubQuickStart.html' style='color:#121E9A' target=_blank>Quick Start Guide</a></li>\n"
     "<li><a href=\"../goldenPath/help/hgTrackHubHelp.html\" style='color:#121E9A' TARGET=_blank>Track Hub User's Guide</a></li>\n"
     "<li><a href=\"../goldenPath/help/hgTrackHubHelp#Hosting\" style='color:#121E9A' target=_blank>Where to Host Your Track Hub</a></li>\n"
     "<li><a href=\"../goldenPath/help/trackDb/trackDbHub.html\" style='color:#121E9A' target=_blank>Track Hub Settings Reference</a></li>\n"
     "<li><a href=\"../goldenPath/help/publicHubGuidelines.html\" style='color:#121E9A' target=_blank>Guidelines for Submitting a Public Hub</a></li>\n"
     "</ul>\n"
     "<BR>You may also <a href='../contacts.html' style='color:#121E9A'>contact us</a> if you have any "
     "issues or questions on hub development.");
 puts("</div>"); // .tabSection
 puts("</div>\n"); // col-md-6
 puts("</div>\n"); // row
 
 puts("<div id='chosenFilesSection' style=\"display: none\" class='col-md-6 tabSection'>");
 puts("<h4>Your uploaded hubs</h4>");
 webIncludeFile("inc/hgMyData.html");
 puts("</div>\n");
 puts("</div>\n"); // row
 puts("</div>\n"); // row
 
 // get the current files stored for this user
 outFilesForUser();
 jsInline("$(document).ready(function() {\nhubCreate.init();\n})");
 puts("</div>");
 }