diff options
| -rw-r--r-- | build-client.hxml | 1 | ||||
| -rw-r--r-- | build-server.hxml | 1 | ||||
| -rw-r--r-- | build/server.js | 25 | ||||
| -rw-r--r-- | res/client.js | 2 | ||||
| -rw-r--r-- | src/server/Logger.hx | 6 |
5 files changed, 25 insertions, 10 deletions
diff --git a/build-client.hxml b/build-client.hxml index 01f9365..6bae635 100644 --- a/build-client.hxml +++ b/build-client.hxml @@ -3,5 +3,6 @@ --class-path src
--main client.Main
-D analyzer-optimize
+-w -WDeprecatedEnumAbstract
--dce full
--js res/client.js
diff --git a/build-server.hxml b/build-server.hxml index c526317..31baeed 100644 --- a/build-server.hxml +++ b/build-server.hxml @@ -8,5 +8,6 @@ --class-path src
--main server.Main
-D analyzer-optimize
+-w -WDeprecatedEnumAbstract
--dce full
--js build/server.js
diff --git a/build/server.js b/build/server.js index 0d1a03e..b5b2902 100644 --- a/build/server.js +++ b/build/server.js @@ -1,4 +1,4 @@ -// Generated by Haxe 4.3.0 +// Generated by Haxe 4.3.3 (function ($global) { "use strict"; var $estr = function() { return js_Boot.__string_rec(this,''); },$hxEnums = $hxEnums || {},$_; function $extend(from, fields) { @@ -3924,18 +3924,27 @@ server_Logger.prototype = { } ,removeOldestLog: function(folder) { var _gthis = this; - var names = js_node_Fs.readdirSync(folder); - if(Lambda.count(names,function(item) { + var _this = js_node_Fs.readdirSync(folder); + var _g = []; + var _g1 = 0; + while(_g1 < _this.length) { + var v = _this[_g1]; + ++_g1; + if(sys_FileSystem.isDirectory("" + folder + "/" + v) ? false : StringTools.startsWith(v,".") ? false : StringTools.endsWith(v,".json")) { + _g.push(v); + } + } + if(Lambda.count(_g,function(item) { return _gthis.matchFileFormat.match(item); }) < this.maxCount) { return; } var minDate = 0.0; var fileName = null; - var _g = 0; - while(_g < names.length) { - var name = names[_g]; - ++_g; + var _g1 = 0; + while(_g1 < _g.length) { + var name = _g[_g1]; + ++_g1; var date = this.extractFileDate(name).getTime(); if(minDate == 0 || minDate > date) { minDate = date; @@ -4363,7 +4372,7 @@ server_Main.prototype = { this.serverMessage(client,"totalVideoLimitError"); return; } - if(this.config.userVideoLimit != 0 && ((client.group & 8) == 0) && this.videoList.itemsByUser(client) >= this.config.userVideoLimit) { + if(this.config.userVideoLimit != 0 && (client.group & 8) == 0 && this.videoList.itemsByUser(client) >= this.config.userVideoLimit) { this.serverMessage(client,"videoLimitPerUserError"); return; } diff --git a/res/client.js b/res/client.js index 7c2b695..432ac20 100644 --- a/res/client.js +++ b/res/client.js @@ -1,4 +1,4 @@ -// Generated by Haxe 4.3.1 +// Generated by Haxe 4.3.3 (function ($hx_exports, $global) { "use strict"; $hx_exports["client"] = $hx_exports["client"] || {}; $hx_exports["client"]["JsApi"] = $hx_exports["client"]["JsApi"] || {}; diff --git a/src/server/Logger.hx b/src/server/Logger.hx index c1d82d8..b3ebf53 100644 --- a/src/server/Logger.hx +++ b/src/server/Logger.hx @@ -58,7 +58,11 @@ class Logger { } function removeOldestLog(folder:String):Void { - final names = FileSystem.readDirectory(folder); + final names = FileSystem.readDirectory(folder).filter(name -> { + if (FileSystem.isDirectory('$folder/$name')) return false; + if (name.startsWith(".")) return false; + return name.endsWith(".json"); + }); if (names.count(item -> matchFileFormat.match(item)) < maxCount) return; var minDate = 0.0; var fileName:String = null; |