support dora idle tasks

CHANGELOG.md

@@ -1,5 +1,9 @@
 ## CHANGE LOG
 
+## v7.8.0 (2024-08-20)
+
+- 支持闲时任务
+
 ## v7.7.0 (2023-12-25)
 
 - 支持归档直读存储类型

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)
 

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);
-}
+}

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)
 {

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
 }

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)

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);
     }
-}
+}

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

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

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