1.增加图片信息，预览、下载原图

pixiv/pixiv.sh

@@ -67,6 +67,16 @@ function upload(){
         fi
 }
 
+function fileSizeStr(){
+     fileSize=$1
+     if [[ $fileSize -gt 1048576 ]]
+     then
+        echo "`echo "scale=2;$fileSize/1048576"|bc`MB"
+     else
+        echo "$((fileSize/1024))KB"
+     fi
+}
+
 basePath=`cat $config_file|jq -r .basePath`
 if [ ! -f $basePath ]
 then
@@ -190,6 +200,7 @@ do
                 page_small_url=`echo $small_url | sed -e"s/p0/p$page/"`
                 original_file_name=`echo $page_original_url | egrep -o "$pid.*"`
                 webp_file_name=`echo $original_file_name|sed 's/jpg/webp/'|sed 's/png/webp/'`
+
                 if [ "`cat $db_file|grep $original_file_name`" != "$original_file_name" ]
                 then
                         echo "download image file name=$original_file_name,url=$page_original_url"
@@ -199,7 +210,7 @@ do
                         fi
                         if [ `du -b  $original_file_name|awk '{print $1}'` -gt $maxFileSize ]
                         then
-                           echo "图片：$original_file_name 体积：`du -h $original_file_name|awk '{print $1}'` 超过 $maxFileSize_M,需要压缩"     
+                           echo "图片：$original_file_name 体积：$original_file_size 超过 $maxFileSize_M,需要压缩"     
                            scp -i ~/.ssh/$CompressHost  -P $CompressPort $original_file_name $CompressUser@$CompressHost:$CompressPath/$original_file_name
                            ssh -i ~/.ssh/$CompressHost -p $CompressPort $CompressUser@$CompressHost "cd $CompressPath;jpegoptim --size=$maxFileSize_M $original_file_name"
                            scp -i ~/.ssh/$CompressHost  -P $CompressPort $CompressUser@$CompressHost:$CompressPath/$original_file_name $original_file_name
@@ -225,7 +236,12 @@ do
    
                 if [ $page -eq 0 ]
                 then
-                        media="$media,{\"type\":\"photo\",\"media\":\"attach://$webp_file_name\",\"parse_mode\":\"HTML\",\"caption\":\"$rank_info\n<a href=\\\"$artworkLink\\\">$title</a>\n<a href=\\\"https://www.pixiv.net/users/$userId\\\">$userName</a>\n$tag\"}"
+                        info_file=$original_file_name.info
+                        original_image_info=`curl -v --output $info_file https://$bucketname.$Host/$original_file_name?x-oss-process=image/info`
+                        FileSize=$(fileSizeStr $(cat $info_file|jq -r  .FileSize.value))
+                        ImageHeight=$(cat $info_file|jq -r  .ImageHeight.value)
+                        ImageWidth=$(cat $info_file|jq -r  .ImageWidth.value)
+                        media="$media,{\"type\":\"photo\",\"media\":\"attach://$webp_file_name\",\"parse_mode\":\"HTML\",\"caption\":\"$rank_info\n<a href=\\\"$artworkLink\\\">$title</a>\n<a href=\\\"https://www.pixiv.net/users/$userId\\\">$userName</a>\n$tag\n原图分辨率：${ImageWidth}X${ImageHeight}(宽X高)，文件体积：$FileSize，<a href=\\\"https://$bucketname.$Host/$original_file_name\\\">预览原图</a>  <a href=\\\"https://$bucketname.$accelerateHost/$original_file_name\\\">加速下载原图</a>\"}"
                         fileList="$fileList -F $webp_file_name=@$webp_file_name"
                         fileCount=$((fileCount + 1))
                         fileSize=`du $webp_file_name | awk '{print $1}'`
@@ -248,10 +264,7 @@ do
         done
 done
 
-hasSend=$today.hasSend
-if [ ! -f $hasSend ]
-then
-        touch $hasSend
-        next_expected_at=`curl -v https://cronitor.io/api/monitors/$CronitorJobName -u $CronitorKey:''|jq .next_expected_at`
-        curl -v -d chat_id=$chat_id -d text="以上就是$today日榜前${length}名作品，本次推送完毕，下次推送时间预计是`date -d @$next_expected_at '+%Y-%m-%d %H:%M:%S'`，如有问题请联系管理员。 #date$_today  #日期$_today " $baseApi/sendMessage
-fi
+
+next_expected_at=`curl -v https://cronitor.io/api/monitors/$CronitorJobName -u $CronitorKey:''|jq .next_expected_at`
+curl -v -d chat_id=$chat_id -d text="以上就是$today日榜前${length}名作品，本次推送完毕，下次推送时间预计是`date -d @$next_expected_at '+%Y-%m-%d %H:%M:%S'`，如有问题请联系管理员。 #date$_today  #日期$_today " $baseApi/sendMessage
+