65d4e214bd753220cd3f1b9700f107ef1ae648da
chmalee
  Fri May 24 09:36:42 2024 -0700
Make hubSpace autoSql files, haven't created the table yet

diff --git src/hg/hgHubConnect/hooks/post-finish.c src/hg/hgHubConnect/hooks/post-finish.c
index 04f2645..782d8e7 100644
--- src/hg/hgHubConnect/hooks/post-finish.c
+++ src/hg/hgHubConnect/hooks/post-finish.c
@@ -2,30 +2,33 @@
  * a JSON encoded request to finsh an upload from a tus
  * client and moves a downloaded file to a specific user
  * directory. */
 #include "common.h"
 #include "linefile.h"
 #include "hash.h"
 #include "options.h"
 #include "wikiLink.h"
 #include "customTrack.h"
 #include "userdata.h"
 #include "jsonQuery.h"
 #include "jsHelper.h"
 #include "errCatch.h"
 #include "obscure.h"
 #include "hooklib.h"
+#include "jksql.h"
+#include "hdb.h"
+#include "hubSpace.h"
 
 void usage()
 /* Explain usage and exit. */
 {
 errAbort(
   "post-finish - tus daemon post-finish hook program\n"
   "usage:\n"
   "   post-finish < input\n"
   );
 }
 
 /* Command line validation table. */
 static struct optionSpec options[] = {
    {NULL, 0},
 };
@@ -40,100 +43,135 @@
 char *reqId = getenv("TUS_ID");
 // always return an exit status to the daemon and print to stdout, as
 // stdout gets sent by the daemon back to the client
 int exitStatus = 0;
 struct jsonElement *response = makeDefaultResponse();
 if (!(reqId))
     {
     rejectUpload(response, "not a TUS request");
     exitStatus = 1;
     }
 else
     {
     struct errCatch *errCatch = errCatchNew(0);
     if (errCatchStart(errCatch))
         {
+        // the variables for the row entry for this file, some can be NULL
+        char *userName = NULL;
+        char *fileName = NULL;
+        long long fileSize = 0;
+        char *fileType = NULL;
+        //char *hubNameList = NULL; // allocated in addHubNameToFile(), NULL is ok
+        char *db = NULL;
+        char *location = NULL;
+
         struct lineFile *lf = lineFileStdin(FALSE);
         char *request = lineFileReadAll(lf);
         struct jsonElement *req = jsonParse(request);
         fprintf(stderr, "Hook request:\n");
         jsonPrintToFile(req, NULL, stderr, 0);
         char *reqCookie= jsonQueryString(req, "", "Event.HTTPRequest.Header.Cookie[0]", NULL);
         if (reqCookie)
             {
             setenv("HTTP_COOKIE", reqCookie, 0);
             }
         fprintf(stderr, "reqCookie='%s'\n", reqCookie);
-        char *userName = (loginSystemEnabled() || wikiLinkEnabled()) ? wikiLinkUserName() : NULL;
+        userName = (loginSystemEnabled() || wikiLinkEnabled()) ? wikiLinkUserName() : NULL;
         fprintf(stderr, "userName='%s'\n'", userName);
         if (!userName)
             {
-            rejectUpload(response, "not logged in");
-            exitStatus = 1;
+            errAbort("not logged in");
             }
         else
             {
-            char *uploadFname = jsonQueryString(req, "", "Event.Upload.MetaData.filename", NULL);
+            fileName = jsonQueryString(req, "", "Event.Upload.MetaData.filename", NULL);
+            fileSize = jsonQueryInt(req, "",  "Event.Upload.Size", 0, NULL);
+            fileType = jsonQueryString(req, "", "Event.Upload.MetaData.fileType", NULL);
+            db = jsonQueryString(req, "", "Event.Upload.MetaData.genome", NULL);
             char *tusFile = jsonQueryString(req, "", "Event.Upload.Storage.Path", NULL);
-            if (uploadFname == NULL)
+            if (fileName == NULL)
                 {
-                rejectUpload(response, "No Event.Upload.filename setting");
-                exitStatus = -1;
+                errAbort("No Event.Upload.filename setting");
                 }
             else if (tusFile == NULL)
                 {
-                rejectUpload(response, "No Event.Path setting");
-                exitStatus = -1;
+                errAbort("No Event.Path setting");
                 }
             else
                 {
                 char *tusInfo = catTwoStrings(tusFile, ".info");
                 char *dataDir = getDataDir(userName);
-                char *newFile = catTwoStrings(dataDir, uploadFname);
+                char *newFile = catTwoStrings(dataDir, fileName);
                 fprintf(stderr, "moving %s to %s\n", tusFile, newFile);
                 // TODO: check if file exists or not and let user choose to overwrite
                 // and re-call this hook, for now just exit if the file exists
                 if (fileExists(newFile))
                     {
-                    rejectUpload(response, "file '%s' exists already, not overwriting", newFile);
-                    exitStatus = 1;
+                    errAbort("file '%s' exists already, not overwriting", newFile);
                     }
                 else
                     {
+                    // set our mysql table location:
+                    location = newFile;
                     // the directory may not exist yet
                     int oldUmask = 00;
                     if (!isDirectory(dataDir))
                         {
                         fprintf(stderr, "making directory '%s'\n", dataDir);
                         // the directory needs to be 777, so ignore umask for now
                         oldUmask = umask(0);
                         makeDirsOnPath(dataDir);
                         // restore umask
                         umask(oldUmask);
                         }
                     copyFile(tusFile, newFile);
                     // the files definitely should not be executable!
                     chmod(newFile, 0666);
                     mustRemove(tusFile);
                     mustRemove(tusInfo);
                     }
                 }
             }
 
-        // we've passed all the checks so we can return that we are safe
+        // we've passed all the checks so we can write a new or updated row
+        // to the mysql table and return to the client that we were successful
         if (exitStatus == 0)
-            fillOutHttpResponseSuccess(response);
+            {
+            struct hubSpace *row = NULL;
+            AllocVar(row);
+            row->userName = userName;
+            row->fileName = fileName;
+            row->fileSize = fileSize;
+            row->fileType = fileType;
+            row->creationTime = NULL;
+            row->lastModified = NULL;
+            row->hubNameList = NULL;
+            row->db = db;
+            row->location = location;
+            struct sqlConnection *conn = hConnectCentral();
+
+            // now write out row to hubSpace table
+            if (!sqlTableExistsOnMain(conn, "hubSpace"))
+                {
+                errAbort("No hubSpace MySQL table is present. Please send us an email");
+                }
+            struct dyString *sqlUpdateStmt = dyStringNew(0);
+            sqlDyStringPrintf(sqlUpdateStmt, "insert into hubSpace values ('%s', '%s', %llu, '%s', '%s', '', '', '', '%s')", row->userName, row->fileName, row->fileSize, row->fileType, row->db, row->location);
+            fprintf(stderr, "%s\n", sqlUpdateStmt->string);
+            fflush(stderr);
+            sqlUpdate(conn, sqlUpdateStmt->string);
+            }
         }
     if (errCatch->gotError)
         {
         rejectUpload(response, errCatch->message->string);
         exitStatus = 1;
         }
     errCatchEnd(errCatch);
     }
 // always print a response no matter what
 jsonPrintToFile(response, NULL, stdout, 0);
 return exitStatus;
 }
 
 int main(int argc, char *argv[])
 /* Process command line. */