support dora idle tasks

qiniu · Aug 20, 2024 · f2ea8f4 · f2ea8f4
1 parent 65f7cb8
commit f2ea8f4
Show file tree

Hide file tree

Showing 32 changed files with 335 additions and 72 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## CHANGE LOG
 
+## v7.8.0 (2024-08-20)
+
+- 支持闲时任务
+
 ## v7.7.0 (2023-12-25)
 
 - 支持归档直读存储类型

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,7 +8,7 @@ CMAKE_POLICY(SET CMP0074 NEW)
 SET(PROJECT_NAME qiniu)
 
 # 建立项目
-PROJECT(${PROJECT_NAME} VERSION 7.7.0 LANGUAGES C)
+PROJECT(${PROJECT_NAME} VERSION 7.8.0 LANGUAGES C)
 
 set(CMAKE_C_STANDARD 99)
 

diff --git a/examples/fop_video_avthumb.c b/examples/fop_video_avthumb.c
@@ -43,7 +43,16 @@ int main(int argc, char **argv) {
 
     char *fops[] = {avthumbMp4Fop, vframeJpgFop};
 
-    Qiniu_Error error = Qiniu_FOP_Pfop(&client, &pfopRet, bucket, key, fops, 2, pipeline, notifyURL, force);
+    Qiniu_FOP_PfopParams params = {
+        .bucket = bucket,
+        .key = key,
+        .pipeline = pipeline,
+        .notifyURL = notifyURL,
+        .fops = fops,
+        .fopCount = 2,
+        .force = force,
+    };
+    Qiniu_Error error = Qiniu_FOP_Pfop_v2(&client, &pfopRet, &params);
     if (error.code != 200) {
         printf("video file pfop %s:%s error.\n", bucket, key);
         debug_log(&client, error);
@@ -52,7 +61,37 @@ int main(int argc, char **argv) {
         printf("video file pfop %s:%s success, persistentId: %s .\n\n", bucket, key, pfopRet.persistentId);
     }
 
+    Qiniu_FOP_PrefopRet prefopRet;
+    Qiniu_FOP_PrefopItemRet prefopItemRet[2];
+    Qiniu_ItemCount itemsCount;
+    error = Qiniu_FOP_Prefop(&client, &prefopRet, (Qiniu_FOP_PrefopItemRet *)&prefopItemRet, &itemsCount, pfopRet.persistentId, 2);
+    if (error.code != 200)
+    {
+        debug_log(&client, error);
+    }
+    else
+    {
+        printf("ID: %s\n", prefopRet.id);
+        printf("Code: %d\n", prefopRet.code);
+        printf("Desc: %s\n", prefopRet.desc);
+        printf("InputBucket: %s\n", prefopRet.inputBucket);
+        printf("InputKey: %s\n", prefopRet.inputKey);
+        printf("Type: %d\n", prefopRet.type);
+
+        for (Qiniu_ItemCount i = 0; i < itemsCount; i++)
+        {
+            printf("\tIndex: %d\n", i);
+            printf("\tCmd: %s\n", prefopItemRet[i].cmd);
+            printf("\tCode: %d\n", prefopItemRet[i].code);
+            printf("\tDesc: %s\n", prefopItemRet[i].desc);
+            printf("\tError: %s\n", prefopItemRet[i].error);
+            printf("\tHash: %s\n", prefopItemRet[i].hash);
+            printf("\tKey: %s\n", prefopItemRet[i].key);
+            printf("\tReturnOld: %d\n", prefopItemRet[i].returnOld);
+        }
+    }
+
     Qiniu_Free(avthumbMp4Fop);
     Qiniu_Free(vframeJpgFop);
     Qiniu_Client_Cleanup(&client);
-}
+}
diff --git a/qiniu/base.c b/qiniu/base.c
@@ -130,7 +130,7 @@ static char *Qiniu_escape(const char *s, escapeMode mode, Qiniu_Bool *fesc)
 {
 	int spaceCount = 0;
 	int hexCount = 0;
-	int i, j, len = strlen(s);
+	size_t i, j, len = strlen(s);
 	int c;
 	char *t;
 
@@ -674,8 +674,7 @@ Qiniu_Writer Qiniu_FILE_Writer(FILE *fp)
 /*============================================================================*/
 /* func Qiniu_Copy */
 
-Qiniu_Error Qiniu_OK = {
-	200, "OK"};
+Qiniu_Error Qiniu_OK = {200, "OK"};
 
 Qiniu_Error Qiniu_Copy(Qiniu_Writer w, Qiniu_Reader r, void *buf, size_t n, Qiniu_Int64 *ret)
 {

diff --git a/qiniu/base.h b/qiniu/base.h
@@ -43,7 +43,9 @@ typedef off_t Qiniu_Off_T;
 
 #endif
 
+#if defined(_WIN32)
 #pragma pack(1)
+#endif
 
 #ifdef __cplusplus
 extern "C"
@@ -357,7 +359,9 @@ typedef struct stat Qiniu_FileInfo;
 
 	/*============================================================================*/
 
+#if defined(_WIN32)
 #pragma pack()
+#endif
 
 #ifdef __cplusplus
 }

diff --git a/qiniu/base_io.c b/qiniu/base_io.c
@@ -135,7 +135,7 @@ static ssize_t Qiniu_ReadBuf_ReadAt(Qiniu_ReadBuf *self, void *buf, size_t n, Qi
 		n = max & (~(size_t)0L);
 	}
 	memcpy(buf, self->buf + off, n);
-	return n;
+	return (ssize_t)n;
 }
 
 Qiniu_Reader Qiniu_BufReader(Qiniu_ReadBuf *self, const char *buf, size_t bytes)

diff --git a/qiniu/cdn.c b/qiniu/cdn.c
@@ -13,7 +13,7 @@ char *Qiniu_CDN_CreateTimestampAntiLeechURL(const char *host, const char *fileNa
     char *queryStrEscaped = NULL;
 
     char expireHex[20];
-    sprintf(expireHex, "%0llx", deadline);
+    snprintf(expireHex, 20, "%0llx", deadline);
 
     if (queryStr != NULL && strcmp("", queryStr) != 0) {
         queryStrEscaped = Qiniu_PathEscape(queryStr, &queryStrEscapeOk);
@@ -611,4 +611,4 @@ void Qiniu_Free_CDNLogListRet(Qiniu_CDN_LogListRet *ret) {
         }
         Qiniu_Free(ret->data);
     }
-}
+}
diff --git a/qiniu/cdn.h b/qiniu/cdn.h
@@ -14,6 +14,10 @@
 #include "macro.h"
 #include "http.h"
 
+#if defined(_WIN32)
+#pragma pack(1)
+#endif
+
 #ifdef __cplusplus
  extern "C"
  {
@@ -164,6 +168,10 @@ QINIU_DLLAPI extern void Qiniu_Free_CDNLogListRet(Qiniu_CDN_LogListRet *ret);
 
 //=====================================================================
 
+#if defined(_WIN32)
+#pragma pack()
+#endif
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/qiniu/conf.h b/qiniu/conf.h
@@ -13,6 +13,10 @@
 #include "macro.h"
 #include "base.h"
 
+#if defined(_WIN32)
+#pragma pack(1)
+#endif
+
 #ifdef __cplusplus
 extern "C"
 {
@@ -64,6 +68,10 @@ extern "C"
 	// 不再推荐使用，建议使用 Qiniu_Use_Region("cn-east-2") 方法替代
 	QINIU_DLLAPI extern void Qiniu_Use_Zone_Cn_East_2(Qiniu_Bool useHttps);
 
+#if defined(_WIN32)
+#pragma pack()
+#endif
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/qiniu/emu_posix.h b/qiniu/emu_posix.h
@@ -14,6 +14,10 @@
 
 #include "macro.h"
 
+#if defined(_WIN32)
+#pragma pack(1)
+#endif
+
 #ifdef __cplusplus
 extern "C"
 {
@@ -51,6 +55,10 @@ QINIU_DLLAPI extern char* Qiniu_Posix_strndup(const char *, size_t n);
 
 /*============================================================================*/
 
+#if defined(_WIN32)
+#pragma pack()
+#endif
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/qiniu/fop.c b/qiniu/fop.c
@@ -13,8 +13,7 @@
 #include "private/region.h"
 #include "../cJSON/cJSON.h"
 
-Qiniu_Error Qiniu_FOP_Pfop(Qiniu_Client *self, Qiniu_FOP_PfopRet *ret, const char *bucket, const char *key,
-                           char *fops[], int fopCount, const char *pipeline, const char *notifyURL, int force)
+Qiniu_Error Qiniu_FOP_Pfop_v2(Qiniu_Client *self, Qiniu_FOP_PfopRet *ret, Qiniu_FOP_PfopParams *params)
 {
     Qiniu_Error err;
     cJSON *root;
@@ -25,6 +24,7 @@ Qiniu_Error Qiniu_FOP_Pfop(Qiniu_Client *self, Qiniu_FOP_PfopRet *ret, const cha
     char *encodedNotifyURL = NULL;
     char *encodedPipeline = NULL;
     char *forceStr = NULL;
+    char *typeStr = NULL;
     char *url = NULL;
     char *body = NULL;
     Qiniu_Bool escapeBucketOk;
@@ -34,39 +34,48 @@ Qiniu_Error Qiniu_FOP_Pfop(Qiniu_Client *self, Qiniu_FOP_PfopRet *ret, const cha
     Qiniu_Bool escapeNotifyURLOk;
 
     // Add encoded bucket
-    encodedBucket = Qiniu_QueryEscape(bucket, &escapeBucketOk);
-    encodedKey = Qiniu_QueryEscape(key, &escapeKeyOk);
-    fopsStr = Qiniu_String_Join(";", fops, fopCount);
+    encodedBucket = Qiniu_QueryEscape(params->bucket, &escapeBucketOk);
+    encodedKey = Qiniu_QueryEscape(params->key, &escapeKeyOk);
+    fopsStr = Qiniu_String_Join(";", params->fops, params->fopCount);
     encodedFops = Qiniu_QueryEscape(fopsStr, &escapeFopsOk);
     Qiniu_Free(fopsStr);
 
-    if (pipeline)
+    if (params->pipeline)
     {
-        encodedPipeline = Qiniu_QueryEscape(pipeline, &escapePipelineOk);
+        encodedPipeline = Qiniu_QueryEscape(params->pipeline, &escapePipelineOk);
     }
     else
     {
         encodedPipeline = "";
     }
-    if (notifyURL)
+    if (params->notifyURL)
     {
-        encodedNotifyURL = Qiniu_QueryEscape(notifyURL, &escapeNotifyURLOk);
+        encodedNotifyURL = Qiniu_QueryEscape(params->notifyURL, &escapeNotifyURLOk);
     }
     else
     {
         encodedNotifyURL = "";
     }
-    if (force == 1)
+    if (params->force == 1)
     {
         forceStr = "1";
     }
     else
     {
         forceStr = "0";
     }
+    if (params->type == 1)
+    {
+        typeStr = "1";
+    }
+    else
+    {
+        typeStr = "0";
+    }
 
     body = Qiniu_String_Concat("bucket=", encodedBucket, "&key=", encodedKey, "&fops=", encodedFops,
-                               "&pipeline=", encodedPipeline, "&notifyURL=", encodedNotifyURL, "&force=", forceStr, NULL);
+                               "&pipeline=", encodedPipeline, "&notifyURL=", encodedNotifyURL, "&force=", forceStr,
+                               "&type=", typeStr, NULL);
     if (escapeBucketOk)
     {
         Qiniu_Free(encodedBucket);
@@ -82,23 +91,22 @@ Qiniu_Error Qiniu_FOP_Pfop(Qiniu_Client *self, Qiniu_FOP_PfopRet *ret, const cha
         Qiniu_Free(encodedFops);
     }
 
-    if (pipeline && escapePipelineOk)
+    if (params->pipeline && escapePipelineOk)
     {
         Qiniu_Free(encodedPipeline);
     }
 
-    if (notifyURL && escapeNotifyURLOk)
+    if (params->notifyURL && escapeNotifyURLOk)
     {
         Qiniu_Free(encodedNotifyURL);
     }
 
     const char *apiHost;
-    err = _Qiniu_Region_Get_Api_Host(self, NULL, bucket, &apiHost);
+    err = _Qiniu_Region_Get_Api_Host(self, NULL, NULL, &apiHost);
     if (err.code != 200)
     {
         goto error;
     }
-
     url = Qiniu_String_Concat2(apiHost, "/pfop/");
     err = Qiniu_Client_CallWithBuffer(
         self,
@@ -116,4 +124,84 @@ Qiniu_Error Qiniu_FOP_Pfop(Qiniu_Client *self, Qiniu_FOP_PfopRet *ret, const cha
     Qiniu_Free(body);
     Qiniu_Free(url);
     return err;
+}
+
+Qiniu_Error Qiniu_FOP_Pfop(Qiniu_Client *self, Qiniu_FOP_PfopRet *ret, const char *bucket, const char *key,
+                           char *fops[], int fopCount, const char *pipeline, const char *notifyURL, int force)
+{
+    Qiniu_FOP_PfopParams params;
+    Qiniu_Zero(params);
+    params.bucket = bucket;
+    params.key = key;
+    params.fops = (char **)fops;
+    params.fopCount = fopCount;
+    params.pipeline = pipeline;
+    params.notifyURL = notifyURL;
+    params.force = force;
+    return Qiniu_FOP_Pfop_v2(self, ret, &params);
 } // Qiniu_FOP_Pfop
+
+Qiniu_Error Qiniu_FOP_Prefop(Qiniu_Client *self, Qiniu_FOP_PrefopRet *ret, Qiniu_FOP_PrefopItemRet *itemsRet, Qiniu_ItemCount *itemsCount, const char *persistentId, Qiniu_ItemCount maxItemsCount)
+{
+    Qiniu_Error err;
+    cJSON *root, *items, *item;
+    Qiniu_ItemCount curIndex;
+    char *encodedPersistentId = NULL;
+    char *url = NULL;
+    Qiniu_ReadBuf emptyBodyBuf = {NULL, 0, 0};
+    Qiniu_Reader emptyBody = Qiniu_BufReader(&emptyBodyBuf, 0, 0);
+    Qiniu_Bool escapePersistentIdOk;
+
+    encodedPersistentId = Qiniu_QueryEscape(persistentId, &escapePersistentIdOk);
+
+    const char *apiHost;
+    err = _Qiniu_Region_Get_Api_Host(self, NULL, NULL, &apiHost);
+    if (err.code != 200)
+    {
+        goto error;
+    }
+    url = Qiniu_String_Concat(apiHost, "/status/get/prefop?id=", encodedPersistentId, NULL);
+    if (escapePersistentIdOk)
+    {
+        Qiniu_Free(encodedPersistentId);
+    }
+
+    err = Qiniu_Client_CallWithMethod(
+        self,
+        &root,
+        url,
+        emptyBody,
+        0,
+        "application/x-www-form-urlencoded",
+        "GET",
+        NULL);
+    if (err.code != 200)
+    {
+        goto error;
+    }
+
+    ret->id = Qiniu_Json_GetString(root, "id", NULL);
+    ret->code = Qiniu_Json_GetInt(root, "code", 0);
+    ret->desc = Qiniu_Json_GetString(root, "desc", NULL);
+    ret->inputBucket = Qiniu_Json_GetString(root, "inputBucket", NULL);
+    ret->inputKey = Qiniu_Json_GetString(root, "inputBucket", NULL);
+    ret->type = Qiniu_Json_GetInt(root, "type", 0);
+
+    *itemsCount = Qiniu_Json_GetArraySize(root, "items", 0);
+    items = Qiniu_Json_GetObjectItem(root, "items", 0);
+    for (curIndex = 0; curIndex < *itemsCount && curIndex < maxItemsCount; curIndex++)
+    {
+        item = cJSON_GetArrayItem(items, curIndex);
+        itemsRet[curIndex].cmd = Qiniu_Json_GetString(item, "cmd", NULL);
+        itemsRet[curIndex].code = Qiniu_Json_GetInt(item, "code", 0);
+        itemsRet[curIndex].desc = Qiniu_Json_GetString(item, "desc", NULL);
+        itemsRet[curIndex].error = Qiniu_Json_GetString(item, "error", NULL);
+        itemsRet[curIndex].hash = Qiniu_Json_GetString(item, "hash", NULL);
+        itemsRet[curIndex].key = Qiniu_Json_GetString(item, "key", NULL);
+        itemsRet[curIndex].returnOld = Qiniu_Json_GetInt(item, "returnOld", 0);
+    }
+
+error:
+    Qiniu_Free(url);
+    return err;
+}