删除json模块默认的pcall封装，修改几个用到了的地方

Author: MrZ626

file.lua

@@ -52,11 +52,8 @@ function FILE.load(path,args)
                 error("FILE.load: Compile error: "..err_mes)
             end
         elseif mode=='json' then
-            local res=JSON.decode(s)
-            if res then
-                return res
-            end
-            error("FILE.load: Decode error")
+            local res,data=pcall(JSON.decode,s)
+            return res and data or error("FILE.load: Decode error")
         elseif mode=='string' then
             return s
         else
@@ -75,7 +72,7 @@ end
 function FILE.save(data,path,args)
     if not args then args='' end
     if STRING.sArg(args,'-d') and fs.getInfo(path) then
-        error("FILE.save: Duplicate")
+        error("FILE.save: File already exist")
     end
 
     if type(data)=='table' then
@@ -86,13 +83,12 @@ function FILE.save(data,path,args)
                 data='return'..TABLE.dumpDeflate(data)
             end
             if not data then
-                error("FILE.save: Encode error")
+                error("FILE.save: Luaon-encoding error")
             end
         else
-            data=JSON.encode(data)
-            if not data then
-                error("FILE.save: Encode error")
-            end
+            local res
+            res,data=pcall(JSON.encode,data)
+            assert(res,"FILE.save: Json-encoding error")
         end
     else
         data=tostring(data)

http.lua

@@ -102,7 +102,9 @@ function HTTP.request(arg)
 
     if arg.body~=nil then
         assertf(type(arg.body)=='table',"HTTP.request(arg): arg.body need table, got %s",arg.body)
-        arg.body=JSON.encode(arg.body)
+        local res
+        res,arg.body=pcall(JSON.encode,arg.body)
+        assert(res,"HTTP.request(arg): arg.body json-encoding error")
         if not arg.headers then arg.headers={} end
         TABLE.cover({
             ['Content-Type']="application/json",

init.lua

@@ -164,6 +164,7 @@ FILE=       require'Zenitha.file'
 SCR=        require'Zenitha.screen'
 GC=         require'Zenitha.gcExtend'
 TCP=        require'Zenitha.tcp'
+MIDI=       require'Zenitha.midi'
 
 -- Love-based modules (complex, with update/draw)
 HTTP=       require'Zenitha.http'

midi.lua

@@ -0,0 +1,178 @@
+---@class Zenitha.MIDI.Event
+---@field tick number tick
+---@field type number midi-type number
+---@field name string readable event type name
+---@field channel number? For all event except MetaEvent
+---@field note number? NoteStart & NoteEnd
+---@field velocity number? NoteStart & NoteEnd
+---@field control number? ControlChange
+---@field value number? ControlChange & ProgramChange & PitchBend
+---@field subType number? MetaEvent
+---@field data string MetaEvent
+
+---@class Zenitha.MIDI
+---@field midFormat number
+---@field trackCount number
+---@field tickPerQuarterNote number
+---@field beatPerMinute number
+---
+---@field tracks Zenitha.MIDI.Event[]
+---@field trackHeads number[]
+---@field time number
+local MIDI={}
+MIDI.__index=MIDI
+
+local r={0}
+for i=1,12 do r[i+1]=r[i]+2^(7*i) end -- Starting value of N-byte VLQ
+local function VLQ(str)
+    local e=1
+    while str:byte(e)>127 do e=e+1 end
+    if e==1 then
+        return str:byte(),str:sub(2)
+    else
+        local sum=0
+        for i=1,e do
+            sum=sum*2^7+str:byte(i)%128
+        end
+        return sum+r[e],str:sub(e+1)
+    end
+end
+
+local read=STRING.readChars
+function MIDI.newSong(sData)
+    local Song={}
+
+    local sec
+    assert(type(sData)=='string',"file not found")
+
+    sec,sData=read(sData,8)
+    assert(sec=="MThd\0\0\0\6","not a midi file")
+
+    sec,sData=read(sData,2)
+    Song.midFormat=STRING.binNum(sec)
+
+    sec,sData=read(sData,2)
+    Song.trackCount=STRING.binNum(sec)
+
+    sec,sData=read(sData,2)
+    Song.tickPerQuarterNote=STRING.binNum(sec)
+
+    Song.tracks={}
+    for _=1,Song.trackCount do
+        print("TRACK ".._..":")
+        local track={}
+        sec,sData=read(sData,4)
+        assert(sec=="MTrk","not a midi track")
+
+        sec,sData=read(sData,4)
+        local trackDataLen=STRING.binNum(sec)
+        local tData
+        tData,sData=read(sData,trackDataLen)
+
+        local now=0
+        repeat
+            ---@type Zenitha.MIDI.Event
+            local event={tick=now}
+            local dt
+            dt,tData=VLQ(tData)
+            now=now+dt
+
+            sec,tData=read(tData,1)
+            event.type=sec:byte()
+            if event.type>=0x90 and event.type<=0x9F then
+                event.name="NoteStart"
+                event.channel=event.type-0x90
+                sec,tData=read(tData,2)
+                event.note=sec:byte(1)
+                event.velocity=sec:byte(2)
+                print("NoteStart",event.note)
+            elseif event.type>=0x80 and event.type<=0x8F then
+                event.name="NoteEnd"
+                event.channel=event.type-0x80
+                sec,tData=read(tData,2)
+                event.note=sec:byte(1)
+                event.velocity=sec:byte(2)
+                print("NoteEnd",event.note)
+            elseif event.type>=0xB0 and event.type<=0xBF then
+                event.name="ControlChange"
+                event.channel=event.type-0xB0
+                sec,tData=read(tData,2)
+                event.control=sec:byte(1)
+                event.value=sec:byte(2)
+                print("ControlChange",event.control)
+            elseif event.type>=0xC0 and event.type<=0xCF then
+                event.name="ProgramChange"
+                event.channel=event.type-0xC0
+                sec,tData=read(tData,1)
+                event.value=sec:byte()
+                print("ProgramChange",event.value)
+            elseif event.type>=0xE0 and event.type<=0xEF then
+                event.name="PitchBend"
+                event.channel=event.type-0xE0
+                sec,tData=read(tData,2)
+                event.value=STRING.binNum(sec)
+                print("PitchBend",event.value)
+            elseif event.type==0xFF then
+                event.name="MetaEvent"
+                event.subType,tData=VLQ(tData)
+                local len
+                len,tData=VLQ(tData)
+                event.data,tData=read(tData,len)
+                print("MetaEvent",event.subType)
+            else
+                print("UNK",event.type)
+            end
+            if event.name then
+                table.insert(track,event)
+            end
+        until #tData==0
+        table.insert(Song.tracks,track)
+    end
+    assert(#Song.tracks==Song.trackCount,"redundancy track")
+    assert(#sData==0,"redundancy data")
+
+    Song.time=0
+    Song.trackHeads=TABLE.new(1,Song.trackCount)
+    Song.beatPerMinute=120
+
+    return setmetatable(Song,MIDI)
+end
+
+function MIDI:seek(t)
+    self.time=t
+    for i=1,#self.trackHeads do
+        local p=1
+        self.trackHeads[i]=p
+    end
+end
+
+function MIDI:reset()
+    self.time=0
+    for i=1,#self.trackHeads do
+        self.trackHeads[i]=1
+    end
+end
+
+function MIDI:doEvent(event)
+    -- print(event.name)
+end
+
+function MIDI:update(dt)
+    self.time=self.time+dt
+    local tick=self.time*self.beatPerMinute/60*self.tickPerQuarterNote
+    for i=1,self.trackCount do
+        local head=self.trackHeads[i]
+        while true do
+            local event=self.tracks[i][head]
+            if event and tick>=event.tick then
+                self:doEvent(event)
+                head=head+1
+            else
+                break
+            end
+        end
+        self.trackHeads[i]=head
+    end
+end
+
+return MIDI