biz9-logic 4.8.298 → 4.8.300

package/biz9_config

@@ -1,4 +1,4 @@
-VERSION='7.7.8'
+VERSION='7.8.0'
 TITLE='BiZ9-Logic';
 REPO='git@github.com:biz9framework/biz9-logic.git';
 BRANCH='main';

package/index.js

@@ -5,9 +5,6 @@ License GNU General Public License v3.0
 Description: BiZ9 Framework: Logic-JS
 */
 const moment = require('moment');
-const path = require('path');
-const { exec } = require('child_process');
-const sharp = require('sharp');
 const { get_new_item_main,get_data_config_main,get_cloud_url_main,get_biz_item_main,get_cloud_filter_obj_main,get_new_full_item_main } = require('./main');
 const { Log,Str,DateTime,Num,Obj } = require('/home/think2/www/doqbox/biz9-framework/biz9-utility/code');
 class Message {
@@ -1899,144 +1896,15 @@ class App_Logic {
 		return app;
 	}
 }
-
 class Image_Logic {
 	static get_url = (host,image_filename,size) =>{
 		return host+"/"+size + "_"+image_filename;
 	}
-	static get_new_by_base64 = (base64) =>{
-		return DataItem.get_new(DataType.IMAGE,0,
-			{
-				mime_type:!Str.check_is_null(Str.get_file_type_from_base64(base64)) ? Str.get_file_type_from_base64(base64).mimeType : 'image/jpeg',
-				extension:!Str.check_is_null(Str.get_file_type_from_base64(base64)) ? Str.get_file_type_from_base64(base64).extension : 'jpeg',
-				image_filename:!Str.check_is_null(Str.get_file_type_from_base64(base64)) ? Str.get_guid()+"."+Str.get_file_type_from_base64(base64).extension : 'not_found.jpeg',
-				buffer:!Str.check_is_null(Str.get_file_type_from_base64(base64)) ? Buffer.from(base64.split(';base64,').pop(), 'base64') : null,
-		});
-	}
- 	static get_cloud_flare_batch_token = (cloud_flare_account_id,cloud_flare_api_token) => {
-        return new Promise((callback) => {
-            let data_batch,error=null;
-            const url = "https://api.cloudflare.com/client/v4/accounts/"+cloud_flare_account_id+"/images/v1/batch_token";
-            const headers = {
-                "Accept": "application/json",
-                "Authorization": "Bearer " +cloud_flare_api_token
-            };
-            let curlCommand = `curl -s -H "Accept: ${headers.Accept}"`;
-            if (headers.Authorization) {
-                curlCommand += ` -H "Authorization: ${headers.Authorization}"`;
-            }
-            curlCommand += ` "${url}"`;
-            exec(curlCommand,async(err,stdout,stderr) => {
-                if (err) {
-                    err = `1 Error executing curl command: ${error.message}`;
-                    console.error(err);
-                    error=Log.append(error,err);
-                    return;
-                }
-                if (stderr) {
-                    err = `2 Curl stderr: ${stderr}`;
-                    console.error(err);
-                    error=Log.append(error,err);
-                    return;
-                }
-                try {
-                    const jsonData =await JSON.parse(stdout);
-                    data_batch =  jsonData.result.token;
-                    if(data_batch!== null){
-                        callback([error,data_batch]);
-                    }
-                } catch (parseError) {
-                    console.error(`Error parsing JSON response: ${parseError.message}`);
-                    console.log('Raw Response:', stdout);
-                    callback([parseError,null]);
-                }
-            });
-        });
-    };
- 	static post_cloud_flare_batch_image = (cloud_flare_api_token,batch_token,image_filename,item_file_path) => {
-        let error = null;
-        return new Promise((callback) => {
-            async.series([
-                async function(call){
-                    const post_url = "https://batch.imagedelivery.net/images/v1";
-                    const headers = {
-                        "Accept": "application/json",
-                        "Authorization": "Bearer " +batch_token
-                    };
-                    let curlCommand = `curl -s -H "Accept: ${headers.Accept}"`;
-                    curlCommand += ` -H "Authorization: ${headers.Authorization}"`;
-                    curlCommand += " -H X-Auth-Key: "+ cloud_flare_api_token;
-                    curlCommand += " -F requireSignedURLs=false";
-                    curlCommand += " -F id="+image_filename;
-                    curlCommand += " -F file=@"+item_file_path;
-                    curlCommand += ` "${post_url}"`;
-                    exec(curlCommand, (err, stdout, stderr) => {
-                        if (err) {
-                            err = `Error executing curl command: ${err.message}`;
-                            console.error(err);
-                            error=Log.append(error,err);
-                        }
-                        if (stderr) {
-                            err = `Curl stderr: ${stderr}`;
-                            console.error(err);
-                            error=Log.append(error,err);
-                        }
-                        try {
-                            const jsonData = JSON.parse(stdout);
-                            console.log('cool');
-                            console.log(jsonData);
-                            console.log('bean');
-                            if(jsonData!== null){
-                                callback([error,jsonData]);
-                            }
-                        } catch (parseError) {
-                            console.error(`Error parsing JSON response: ${parseError.message}`);
-                            console.log('Raw Response:', stdout);
-                            error=Log.append(error,parseError);
-                            callback([error,null]);
-                        }
-                    });
-                },
-            ])
-        });
-    };
-
- 	static post_write = (buffer,size,path_filename,is_square) => {
-        return new Promise((callback) => {
-            let data,error=null;
-            if(is_square){
-            sharp(buffer)
-                .resize(size)
-                .toFile(path_filename,(err, info) => {
-                    if(err){
-                        error=Log.append(error,'Error thumb saving file:');
-                        console.error('Error thumb saving file:', err);
-                    }
-                    if(info!==null){
-                        callback([error,true]);
-                    }
-                });
-            }else{
-            sharp(buffer)
-                .resize(size,size,{fit:sharp.fit.fill,quality:100})
-                .toFile(path_filename,(err, info) => {
-                    if(err){
-                        error=Log.append(error,'Error thumb saving file:');
-                        console.error('Error thumb saving file:', err);
-                    }
-                    if(info!==null){
-                        callback([error,true]);
-                    }
-                });
-            }
-        });
-
-	}
-	static get_process_list = (upload_dir,image_filename) =>{
+static get_process_list = (upload_dir,image_filename) =>{
 		 return [
 			{
 				image_filename:FieldType.IMAGE_SIZE_THUMB+"_"+image_filename,
-				path_filename:path.join(upload_dir,FieldType.IMAGE_SIZE_THUMB+"_"+image_filename),
+				path_filename:upload_dir+"/"+FieldType.IMAGE_SIZE_THUMB+"_"+image_filename,
 				size:250,
 				is_square:false,
 				post_file:false,
@@ -2044,7 +1912,7 @@ class Image_Logic {
 			},
 			{
 				image_filename:FieldType.IMAGE_SIZE_MID+"_"+image_filename,
-				path_filename:path.join(upload_dir,FieldType.IMAGE_SIZE_MID+"_"+image_filename),
+				path_filename:upload_dir+"/"+FieldType.IMAGE_SIZE_MID+"_"+image_filename,
 				size:720,
 				is_square:false,
 				post_file:false,
@@ -2052,7 +1920,7 @@ class Image_Logic {
 			},
 			{
 				image_filename:FieldType.IMAGE_SIZE_LARGE+"_"+image_filename,
-				path_filename:path.join(upload_dir,FieldType.IMAGE_SIZE_LARGE+"_"+image_filename),
+				path_filename:upload_dir+"/"+FieldType.IMAGE_SIZE_LARGE+"_"+image_filename,
 				size:1000,
 				is_square:false,
 				post_file:false,
@@ -2060,7 +1928,7 @@ class Image_Logic {
 			},
 			{
 				image_filename:FieldType.IMAGE_SIZE_SQUARE_THUMB+"_"+image_filename,
-				path_filename:path.join(upload_dir,FieldType.IMAGE_SIZE_SQUARE_THUMB+"_"+image_filename),
+				path_filename:upload_dir+"/"+FieldType.IMAGE_SIZE_SQUARE_THUMB+"_"+image_filename,
 				size:250,
 				is_square:true,
 				post_file:false,
@@ -2068,7 +1936,7 @@ class Image_Logic {
 			},
 			{
 				image_filename:FieldType.IMAGE_SIZE_SQUARE_MID+"_"+image_filename,
-				path_filename:path.join(upload_dir,FieldType.IMAGE_SIZE_SQUARE_MID+"_"+image_filename),
+				path_filename:upload_dir+"/"+FieldType.IMAGE_SIZE_SQUARE_MID+"_"+image_filename,
 				size:720,
 				is_square:true,
 				post_file:false,
@@ -2076,7 +1944,7 @@ class Image_Logic {
 			},
 			{
 				image_filename:FieldType.IMAGE_SIZE_SQUARE_LARGE+"_"+image_filename,
-				path_filename:path.join(upload_dir,FieldType.IMAGE_SIZE_SQUARE_LARGE+"_"+image_filename),
+				path_filename:upload_dir+"/"+FieldType.IMAGE_SIZE_SQUARE_LARGE+"_"+image_filename,
 				size:1000,
 				is_square:true,
 				post_file:false,
@@ -2084,10 +1952,6 @@ class Image_Logic {
 			},
 		];
 	}
-	static get_process_square_list = (upload_dir,image_filename,path) =>{
-		 return [
-				];
-	}
 }
 module.exports = {
 	App_Logic,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "biz9-logic",
-  "version": "4.8.298",
+  "version": "4.8.300",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/test.js

@@ -1,6 +1,6 @@
 const path = require('path');
 const series = require('async-series');
-const {DataItem,DataType,Url,Obj,BiZ_Url,Cat,Stock,Schedule,Storage,Business,Product,Service,Event,Template,Page,Category,Review,Blog_Post,Faq_Logic,Category_Url,Blank_Url,Blank_Logic,Item_Logic,Service_Logic,Template_Logic,Page_Logic,Product_Logic,Event_Logic,Blog_Post_Logic,Content_Logic,Category_Logic,Team_Logic,Business_Logic,PageType,Sub_Item_Logic,Page_Url,Review_Logic,User_Logic,Field_Logic,Order_Logic,Cart_Logic,Faq_Url,App_Logic,FieldType,Product_Url,Gallery_Logic} = require('./index');
+const {DataItem,DataType,Url,Obj,BiZ_Url,Cat,Stock,Schedule,Storage,Business,Product,Service,Event,Template,Page,Category,Review,Blog_Post,Faq_Logic,Category_Url,Blank_Url,Blank_Logic,Item_Logic,Service_Logic,Template_Logic,Page_Logic,Product_Logic,Event_Logic,Blog_Post_Logic,Content_Logic,Category_Logic,Team_Logic,Business_Logic,PageType,Sub_Item_Logic,Page_Url,Review_Logic,User_Logic,Field_Logic,Order_Logic,Cart_Logic,Faq_Url,App_Logic,FieldType,Product_Url,Gallery_Logic,Image_Logic} = require('./index');
 const {Log,Num} = require('biz9-utility');
 const {Scriptz}= require('biz9-scriptz');
 
@@ -36,17 +36,18 @@ describe("connect", () => {
                 //console.log(gallery);
                 //console.log('ITEM-END');
                 console.log('cool');
-                console.log(DataType.get_title(DataType.TEMPLATE,true));
+                console.log(Image_Logic.get_process_list('upload/photos','apple'));
+                //console.log(DataType.get_title(DataType.TEMPLATE,true));
                 //console.log(FieldType.get_title(FieldType.USER_ROLE_ADMIN));
-                console.log('bbbbbb');
-                let page = Page_Logic.get_test();
+                //console.log('bbbbbb');
+                //let page = Page_Logic.get_test();
                 //page[Item_Logic.get_field_value_title(FieldType.ITEM_FIELD_VALUE_TYPE_TEXT,1)] = 'apple';
                 //page[Item_Logic.get_field_value_title(FieldType.ITEM_FIELD_VALUE_TYPE_LIST,1,1)] = 'cool';
                 //page[Item_Logic.get_field_value_title('list',1,2)] = 'apple';
                 //page[Item_Logic.get_field_value_title('list',1,3)] = 'sauce';
                 //Log.w('page',page);
                 //Log.w('text_1_value',Item_Logic.get_field_value_value(FieldType.ITEM_FIELD_VALUE_TYPE_TEXT,page,1));
-                Log.w('list_1_value',Item_Logic.get_field_value_value(FieldType.ITEM_FIELD_VALUE_TYPE_LIST,page,1));
+                //Log.w('list_1_value',Item_Logic.get_field_value_value(FieldType.ITEM_FIELD_VALUE_TYPE_LIST,page,1));
 
 
                 //console.log(Page_Logic.get_page_value_field_title('text',1));