jekyll-zeta 0.10.4 → 0.10.5

data/_includes/getmapdata.js

@@ -1,280 +1,17 @@
-
-(function () {
-  var g_id = 100;
-
-  function ymd2Date(ymd) {
-    const parts = ymd.split('-').map(Number);
-    if (parts.length !== 3) {
-      throw new Error(`Invalid date format: ${ymd}`);
-    }
-    const [year, month, day] = parts;
-    return new Date(year, month - 1, day); // month 从 0 开始
-  };
-
-  function normalizeYmd(ymd){
-    if (ymd) {
-      const arr = ymd.split('-')
-      return `${arr[0]}-${arr[1].padStart(2,'0')}-${arr[2].padStart(2,'0')}`
-    }
-
-    return ymd
-  }
-
-
-  function getConfigFromStr(str,obj){
-    if (str && str.startsWith('#')) {
-      // #color #121212
-      // #title 123
-      let arr = str.split(' ')
-      if(arr.length >= 2){
-        let key = arr[0].substring(1)
-        if(key ){
-          obj[key] = str.substring(key.length + 2).trim()
-          return 1
-        }
-      }
-    }
-    return 0
-  }
-
-
-
-  function date2ymd(t) {
-    let m = t.getMonth() + 1;
-    let d = t.getDate();
-    return `${t.getFullYear()}-${m < 10 ? "0" + m : m}-${d < 10 ? "0" + d : d}`;
-  }
-  /// 2025-01-01 描述，日期格式yyyy-mm-dd，空格后跟上 描述
-  function getDataFromSignleLine(str0,gData) {
-    if(!str0) return null
-    let str = str0.trim()
-    if (!str) return null
-
-    if(gData && getConfigFromStr(str,gData)) return null
-
-
-    var arr = str.split(" ")
-    var date0 = arr[0]
-    date0 = date0.replace('～','~')
-    if (gData && date0.indexOf("~") > 0) {
-      let arrRg = date0.split('~')
-      let beginYmd = arrRg[0]
-      let endYmd = arrRg[1]
-      let dateBegin = ymd2Date(normalizeYmd(beginYmd))
-      if (!dateBegin || isNaN(dateBegin)) {
-        
-        return
-      }
-      let rangCount = 7
-      if(endYmd){
-         let dend = ymd2Date(normalizeYmd(endYmd))
-         if (dend && !isNaN(dend)) {
-          rangCount = Math.floor((dend.getTime() - dateBegin.getTime())/ 86400000) + 1
-         }
-         
-      }else{
-        rangCount =  Math.floor((Date.now() - dateBegin.getTime())/ 86400000) + 1;
-        if(rangCount > 7) rangCount =7
-      }
- 
-      const desc = arr.slice(1).join(' ')
-      
-      let resultArr = []
-      const timeStampBegin =  dateBegin.getTime()
-      for (let i  = 0; i  < rangCount; i ++) {
-        const ymd = date2ymd(new Date(timeStampBegin + i * 86400000))
-        const newStr = ymd + ' ' + desc
-        const newEle = getDataFromSignleLine(newStr)
-        if(newEle){
-          resultArr.push(newEle)
-        }
-      }
-      return resultArr.length ? resultArr : null
-
-    }
-
-
-
-    let date = ''
-    if (date0) {
-      let ymd = date0.split("-")
-      if (ymd.length == 3) {
-        let year = ymd[0]
-        let month = ymd[1]
-        let day = ymd[2]
-
-        let nY = Number(year)
-        let nM = Number(month)
-        let nD = Number(month)
-        if (isNaN(nY) || isNaN(nD) || isNaN(nM) || nY < 1900 || nY > 2100 || nM < 1 || nM > 12 || nD < 1 || nD > 31) {
-          return null
-        }
-        date = year + "-" + month.padStart(2, '0') + "-" + day.padStart(2, '0')
-      }
-    }
-    else {
-      return null
-    }
-
-    if (!date) {
-      return null
-    }
-    var title = ""
-    let color = undefined
-    if (arr.length > 1) {
-      title = arr.slice(1).join(" ")
-
-      const regColor = /#[0-9a-fA-F]{6}/
-      let colorScaned = regColor.exec(title)
-      if (colorScaned && colorScaned.length) {
-        color = colorScaned[0]
-        title = title.replace(regColor,'')
-      }
-
-    }
-    return { date: date, title: title ,color}
-  }
-
-  function fillDataObj(data, item) {
-    if (!item) return
-    let y = item.date.substring(0, 4);
-    let m = item.date.substring(5, 7);
-    let c = data.allYear[y];
-    data.allYear[y] = c ? c + 1 : 1;
-
-    let yObj = data[y]
-    if (!yObj) {
-      yObj = {}
-      data[y] = yObj;
-    }
-
-    let arr = yObj[m]
-    if (!arr) {
-      arr = []
-      yObj[m] = arr
-    }
-    arr.push(item)
-
-  }
-
-
-  async function wait (t ) {
-    return new Promise(function(r){
-      setTimeout(() => {
-         r()
-      }, t );
-    })
-  }
-  
-  function parseDataAndCeateMap(strData,node) {
-   
-
-    let allYear = {}
-    let dataObj = { allYear: allYear };
- 
-    let Recent365Count = 0;
-    let nowDate = new Date
-    let Recent365YMD = `${nowDate.getFullYear() - 1}-${(nowDate.getMonth() + 1).toString().padStart(2, '0')}-${nowDate.getDate().toString().padStart(2, '0')}`
- 
-
-    strData.split("\n").forEach(function (str,idx) {
-      if(idx == 0) return 
-      let item = getDataFromSignleLine(str,dataObj)
-      if (item && Array.isArray(item)) {
-        item.forEach(e=>{
-          fillDataObj(dataObj, e)
-          if (e) {
-            if (e.date >= Recent365YMD) {
-              Recent365Count++
-            }
-          }
-        })
-      }else{
-        fillDataObj(dataObj, item)
-        if (item) {
-          if (item.date >= Recent365YMD) {
-            Recent365Count++
-          }
-        }
-      }
-      
-    })
-
-
-    if (dataObj.title ) {
-
-
-      let divTitle = document.createElement('div')
-      divTitle.className = 'custom-map-title'  
-      divTitle.innerText = dataObj.title || ''
-
-      let codeHolder = node.parentNode
-      codeHolder.insertBefore(divTitle,node)
-      
-    }
-    
-
-    let allYearArr = Object.keys(allYear).sort().reverse()
-
-
-    let RCT = dataObj['recent'];
-    let showRct = true
-    if (!RCT) {
-      showRct = Recent365Count && allYearArr.length > 1
-    }else{
-      showRct = RCT == '1'
-    }
-    if(showRct){
-      create_heatmap_lv('lmpRecent365' + g_id ++, '', dataObj, "Last 1Y", Recent365Count,node)
-    }
-    
-    for (let i = 0; i < allYearArr.length; i++) {
-      let y = allYearArr[i]
-      create_heatmap_lv('lmp' + y + g_id ++ , y, dataObj,undefined,undefined,node)
-    }
-
-    node.style.display = 'none'
-
-  
-
-  };
-
-  async function initData(){
-    let arrCodes = document.querySelectorAll('pre > code')
-    if (!arrCodes || arrCodes.length == 0) return
-
-    if (arrCodes.length > 0) {
-      for (let i  = 0; i  < arrCodes.length; i ++) {
-        const code = arrCodes[i ];
-        var strAll = code.textContent
-        if (!strAll.startsWith("#mapdata")) {
-          return 
-        }
-
-        parseDataAndCeateMap(strAll,code.parentNode.parentNode.parentNode)
- 
-        
-      }
-   
-    }
-  }
-
-  initData()
-
-  window['_after_dec_fun'] = function () {
-    let con = document.getElementById('loveiContainer')
-    if (!con) {
-      let decryptContent = document.getElementById('decryptContent')
-      if (!decryptContent) return
-      con = document.createElement('div')
-      con.id = 'loveiContainer'
-      decryptContent.insertBefore(con, decryptContent.firstChild)
-
-    }
-
-    initData()
-  }
-  window['_after_enc_fun'] = function () {
-    document.getElementById('loveiContainer').innerHTML = ''
-  }
-})();
+!function(){var t=100;function e(t){const e=t.split("-").map(Number);if(3!==e.length)throw new Error(`Invalid date format: ${t}`);const[n,r,l]=e;return new Date(n,r-1,l)}function n(t){if(t){
+const e=t.split("-");return`${e[0]}-${e[1].padStart(2,"0")}-${e[2].padStart(2,"0")}`}return t}function r(t){let e=t.getMonth()+1,n=t.getDate()
+;return`${t.getFullYear()}-${e<10?"0"+e:e}-${n<10?"0"+n:n}`}function l(t,i){if(!t)return null;let a=t.trim();if(!a)return null;if(i&&function(t,e){if(t&&t.startsWith("#")){let n=t.split(" ")
+;if(n.length>=2){let r=n[0].substring(1);if(r)return e[r]=t.substring(r.length+2).trim(),1}}return 0}(a,i))return null;var o=a.split(" "),u=o[0];if(u=u.replace("～","~"),i&&u.indexOf("~")>0){
+let t=u.split("~"),i=t[0],a=t[1],f=e(n(i));if(!f||isNaN(f))return;let s=7;if(a){let t=e(n(a));t&&!isNaN(t)&&(s=Math.floor((t.getTime()-f.getTime())/864e5)+1)
+}else s=Math.floor((Date.now()-f.getTime())/864e5)+1,s>7&&(s=7);const c=o.slice(1).join(" ");let d=[];const g=f.getTime();for(let t=0;t<s;t++){const e=l(r(new Date(g+864e5*t))+" "+c);e&&d.push(e)}
+return d.length?d:null}let f="";if(!u)return null;{let t=u.split("-");if(3==t.length){let e=t[0],n=t[1],r=t[2],l=Number(e),i=Number(n),a=Number(n)
+;if(isNaN(l)||isNaN(a)||isNaN(i)||l<1900||l>2100||i<1||i>12||a<1||a>31)return null;f=e+"-"+n.padStart(2,"0")+"-"+r.padStart(2,"0")}}if(!f)return null;var s="";let c;if(o.length>1){
+s=o.slice(1).join(" ");const t=/#[0-9a-fA-F]{6}/;let e=t.exec(s);e&&e.length&&(c=e[0],s=s.replace(t,""))}return{date:f,title:s,color:c}}function i(t,e){if(!e)return
+;let n=e.date.substring(0,4),r=e.date.substring(5,7),l=t.allYear[n];t.allYear[n]=l?l+1:1;let i=t[n];i||(i={},t[n]=i);let a=i[r];a||(a=[],i[r]=a),a.push(e)}function a(e,n){let r={},a={allYear:r
+},o=0,u=new Date,f=`${u.getFullYear()-1}-${(u.getMonth()+1).toString().padStart(2,"0")}-${u.getDate().toString().padStart(2,"0")}`;if(e.split("\n").forEach((function(t,e){if(0==e)return;let n=l(t,a)
+;n&&Array.isArray(n)?n.forEach((t=>{i(a,t),t&&t.date>=f&&o++})):(i(a,n),n&&n.date>=f&&o++)})),a.title){let t=document.createElement("div");t.className="custom-map-title",t.innerText=a.title||"",
+n.parentNode.insertBefore(t,n)}let s=Object.keys(r).sort().reverse(),c=a.recent,d=!0;d=c?"1"==c:o&&s.length>1,d&&create_heatmap_lv("lmpRecent365"+t++,"",a,"Last 1Y",o,n);for(let e=0;e<s.length;e++){
+let r=s[e];create_heatmap_lv("lmp"+r+t++,r,a,void 0,void 0,n)}n.style.display="none"}async function o(){let t=document.querySelectorAll("pre > code")
+;if(t&&0!=t.length&&t.length>0)for(let n=0;n<t.length;n++){const r=t[n];var e=r.textContent;if(!e.startsWith("#mapdata"))return;a(e,r.parentNode.parentNode.parentNode)}}o(),
+window._after_dec_fun=function(){let t=document.getElementById("loveiContainer");if(!t){let e=document.getElementById("decryptContent");if(!e)return;t=document.createElement("div"),
+t.id="loveiContainer",e.insertBefore(t,e.firstChild)}o()},window._after_enc_fun=function(){document.getElementById("loveiContainer").innerHTML=""}}();

data/_includes/heatmap.html

@@ -42,11 +42,10 @@
 
     {% assign MothStr = site.theme_config.heatMapMonth  -%}
     {%- assign HeatMapShowWeek = site.theme_config.heatMapShowWeek  -%}
-    {%- assign heatMapLoadCount = site.theme_config.heatMapLoadCount | default: 8  %}
+
     
-    const WeeKStartStr = "{{ site.theme_config.heatMapWeekStart | default: 0 }}" ;//  0 sunday 1 monday 2. tuesday ...
+    const WeeKStart = {{ site.theme_config.heatMapWeekStart | default: 1 }} ;//  0 sunday 1 monday 2. tuesday ...
 
-    const heatMapLoadCount = {{heatMapLoadCount}};
     var _MonthStr =  '{{ MothStr | default: "Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec" }}';
     var _showWeek =  '{{ HeatMapShowWeek | default: "Sun Mon Tue Wed Thu Fri Sat" }}';
     var _allyearurl =  '{{ "assets/dyn/allyear.json" | relative_url }}';
@@ -60,7 +59,7 @@
       endYear = '' + endYear + '-12-31'  
     }
     
-    const svgmap = createSVGMap(endYear)
+    const svgmap = createSVGMap(endYear,null,_MonthStr,_showWeek,WeeKStart)
 
     let father = document.getElementById(heatmapid)
     if (!father) {
@@ -70,9 +69,7 @@
     father.appendChild(svgmap.svg);
 
     const p = hm_getPostData(endYear,_allyearurl);
-    console.log(p)
     p.then(d=>{
-      console.log(d)
       svgmap.updateDays(d)
     })