Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
S
srvpro
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
3
Merge Requests
3
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
srvpro
Commits
29bc2c1d
Commit
29bc2c1d
authored
Feb 20, 2018
by
nanahira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
move duel log path to another file
parent
2be5040b
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
35 additions
and
25 deletions
+35
-25
config.deckstats.json
config.deckstats.json
+1
-0
data/default_config.json
data/default_config.json
+0
-1
data/default_data.json
data/default_data.json
+4
-0
ygopro-server.coffee
ygopro-server.coffee
+13
-11
ygopro-server.js
ygopro-server.js
+17
-13
No files found.
config.deckstats.json
0 → 100644
View file @
29bc2c1d
{
"deckpath"
:
"./decks_save"
,
"dbfile"
:
"./ygopro/cards.cdb"
}
\ No newline at end of file
data/default_config.json
View file @
29bc2c1d
...
@@ -92,7 +92,6 @@
...
@@ -92,7 +92,6 @@
"replay_archive_tool"
:
"7z"
,
"replay_archive_tool"
:
"7z"
,
"show_ip"
:
false
,
"show_ip"
:
false
,
"show_info"
:
true
,
"show_info"
:
true
,
"duel_log"
:
[],
"password"
:
"123456"
,
"password"
:
"123456"
,
"port"
:
7933
"port"
:
7933
},
},
...
...
data/default_data.json
View file @
29bc2c1d
...
@@ -23,5 +23,9 @@
...
@@ -23,5 +23,9 @@
"我们来做朋友吧!"
"我们来做朋友吧!"
]
]
}
}
},
"duel_log"
:
{
"file"
:
"./config/duel_log.json"
,
"duel_log"
:
[]
}
}
}
}
\ No newline at end of file
ygopro-server.coffee
View file @
29bc2c1d
...
@@ -62,6 +62,12 @@ try
...
@@ -62,6 +62,12 @@ try
olddialogues
.
dialogues
=
oldconfig
.
dialogues
olddialogues
.
dialogues
=
oldconfig
.
dialogues
fs
.
writeFileSync
(
olddialogues
.
file
,
JSON
.
stringify
(
olddialogues
,
null
,
2
))
fs
.
writeFileSync
(
olddialogues
.
file
,
JSON
.
stringify
(
olddialogues
,
null
,
2
))
delete
oldconfig
.
dialogues
delete
oldconfig
.
dialogues
if
oldconfig
.
modules
.
tournament_mode
and
oldconfig
.
modules
.
tournament_mode
.
duel_log
oldduellog
=
{}
oldduellog
.
file
=
'./config/duel_log.json'
oldduellog
.
duel_log
=
oldconfig
.
modules
.
tournament_mode
.
duel_log
fs
.
writeFileSync
(
oldduellog
.
file
,
JSON
.
stringify
(
oldduellog
,
null
,
2
))
delete
oldconfig
.
oldduellog
oldbadwords
=
{}
oldbadwords
=
{}
if
oldconfig
.
ban
.
badword_level0
if
oldconfig
.
ban
.
badword_level0
oldbadwords
.
level0
=
oldconfig
.
ban
.
badword_level0
oldbadwords
.
level0
=
oldconfig
.
ban
.
badword_level0
...
@@ -131,6 +137,11 @@ try
...
@@ -131,6 +137,11 @@ try
catch
catch
badwords
=
default_data
.
badwords
badwords
=
default_data
.
badwords
setting_save
(
badwords
)
setting_save
(
badwords
)
try
duel_log
=
require
(
'./config/duel_log.json'
)
catch
duel_log
=
default_data
.
duel_log
setting_save
(
duel_log
)
try
try
cppversion
=
parseInt
(
fs
.
readFileSync
(
'ygopro/gframe/game.cpp'
,
'utf8'
).
match
(
/PRO_VERSION = ([x\dABCDEF]+)/
)[
1
],
'16'
)
cppversion
=
parseInt
(
fs
.
readFileSync
(
'ygopro/gframe/game.cpp'
,
'utf8'
).
match
(
/PRO_VERSION = ([x\dABCDEF]+)/
)[
1
],
'16'
)
...
@@ -156,16 +167,6 @@ if settings.modules.cloud_replay.enabled
...
@@ -156,16 +167,6 @@ if settings.modules.cloud_replay.enabled
if
settings
.
modules
.
windbot
.
enabled
if
settings
.
modules
.
windbot
.
enabled
windbots
=
require
(
settings
.
modules
.
windbot
.
botlist
).
windbots
windbots
=
require
(
settings
.
modules
.
windbot
.
botlist
).
windbots
if
settings
.
modules
.
tournament_mode
.
enabled
duel_log
=
{}
clearlog
=
()
->
duel_log
=
{}
duel_log
.
file
=
'duel_log.'
+
moment
().
format
(
'YYYY-MM-DD HH-mm-ss'
)
+
'.json'
duel_log
.
duel_log
=
[]
setting_save
(
duel_log
)
return
clearlog
()
# 组件
# 组件
ygopro
=
require
'./ygopro.js'
ygopro
=
require
'./ygopro.js'
roomlist
=
require
'./roomlist.js'
if
settings
.
modules
.
http
.
websocket_roomlist
roomlist
=
require
'./roomlist.js'
if
settings
.
modules
.
http
.
websocket_roomlist
...
@@ -2069,7 +2070,8 @@ if settings.modules.http
...
@@ -2069,7 +2070,8 @@ if settings.modules.http
return
return
else
else
response
.
writeHead
(
200
)
response
.
writeHead
(
200
)
clearlog
()
duel_log
.
duel_log
=
[]
setting_save
(
duel_log
)
response
.
end
(
addCallback
(
u
.
query
.
callback
,
"[{name:'Success'}]"
))
response
.
end
(
addCallback
(
u
.
query
.
callback
,
"[{name:'Success'}]"
))
else
if
_
.
startsWith
(
u
.
pathname
,
'/api/replay'
)
and
settings
.
modules
.
tournament_mode
.
enabled
else
if
_
.
startsWith
(
u
.
pathname
,
'/api/replay'
)
and
settings
.
modules
.
tournament_mode
.
enabled
...
...
ygopro-server.js
View file @
29bc2c1d
// Generated by CoffeeScript 1.12.7
// Generated by CoffeeScript 1.12.7
(
function
()
{
(
function
()
{
var
Cloud_replay_ids
,
ROOM_all
,
ROOM_bad_ip
,
ROOM_ban_player
,
ROOM_connected_ip
,
ROOM_find_by_name
,
ROOM_find_by_port
,
ROOM_find_by_title
,
ROOM_find_or_create_ai
,
ROOM_find_or_create_by_name
,
ROOM_find_or_create_random
,
ROOM_players_banned
,
ROOM_players_oppentlist
,
ROOM_unwelcome
,
ROOM_validate
,
Room
,
_
,
addCallback
,
badwords
,
ban_user
,
bunyan
,
c
learlog
,
config
,
cppversion
,
crypto
,
date
,
default_config
,
default_data
,
dialogues
,
duel_log
,
e
,
exec
,
execFile
,
fs
,
geoip
,
get_memory_usage
,
http
,
http_server
,
https
,
https_server
,
lflists
,
list
,
load_dialogues
,
load_tips
,
log
,
memory_usage
,
merge
,
moment
,
net
,
oldbadwords
,
oldconfig
,
olddialogues
,
oldtips
,
options
,
os
,
path
,
pgClient
,
pg_client
,
pg_query
,
redis
,
redisdb
,
report_to_big_brother
,
request
,
requestListener
,
roomlist
,
setting_change
,
setting_save
,
settings
,
spawn
,
spawnSync
,
tips
,
url
,
users_cache
,
wait_room_start
,
wait_room_start_arena
,
windbot_bin
,
windbot_parameters
,
windbot_process
,
windbots
,
ygopro
,
zlib
;
var
Cloud_replay_ids
,
ROOM_all
,
ROOM_bad_ip
,
ROOM_ban_player
,
ROOM_connected_ip
,
ROOM_find_by_name
,
ROOM_find_by_port
,
ROOM_find_by_title
,
ROOM_find_or_create_ai
,
ROOM_find_or_create_by_name
,
ROOM_find_or_create_random
,
ROOM_players_banned
,
ROOM_players_oppentlist
,
ROOM_unwelcome
,
ROOM_validate
,
Room
,
_
,
addCallback
,
badwords
,
ban_user
,
bunyan
,
c
onfig
,
cppversion
,
crypto
,
date
,
default_config
,
default_data
,
dialogues
,
duel_log
,
e
,
exec
,
execFile
,
fs
,
geoip
,
get_memory_usage
,
http
,
http_server
,
https
,
https_server
,
lflists
,
list
,
load_dialogues
,
load_tips
,
log
,
memory_usage
,
merge
,
moment
,
net
,
oldbadwords
,
oldconfig
,
olddialogues
,
oldduellog
,
oldtips
,
options
,
os
,
path
,
pgClient
,
pg_client
,
pg_query
,
redis
,
redisdb
,
report_to_big_brother
,
request
,
requestListener
,
roomlist
,
setting_change
,
setting_save
,
settings
,
spawn
,
spawnSync
,
tips
,
url
,
users_cache
,
wait_room_start
,
wait_room_start_arena
,
windbot_bin
,
windbot_parameters
,
windbot_process
,
windbots
,
ygopro
,
zlib
;
net
=
require
(
'
net
'
);
net
=
require
(
'
net
'
);
...
@@ -80,6 +80,13 @@
...
@@ -80,6 +80,13 @@
fs
.
writeFileSync
(
olddialogues
.
file
,
JSON
.
stringify
(
olddialogues
,
null
,
2
));
fs
.
writeFileSync
(
olddialogues
.
file
,
JSON
.
stringify
(
olddialogues
,
null
,
2
));
delete
oldconfig
.
dialogues
;
delete
oldconfig
.
dialogues
;
}
}
if
(
oldconfig
.
modules
.
tournament_mode
&&
oldconfig
.
modules
.
tournament_mode
.
duel_log
)
{
oldduellog
=
{};
oldduellog
.
file
=
'
./config/duel_log.json
'
;
oldduellog
.
duel_log
=
oldconfig
.
modules
.
tournament_mode
.
duel_log
;
fs
.
writeFileSync
(
oldduellog
.
file
,
JSON
.
stringify
(
oldduellog
,
null
,
2
));
delete
oldconfig
.
oldduellog
;
}
oldbadwords
=
{};
oldbadwords
=
{};
if
(
oldconfig
.
ban
.
badword_level0
)
{
if
(
oldconfig
.
ban
.
badword_level0
)
{
oldbadwords
.
level0
=
oldconfig
.
ban
.
badword_level0
;
oldbadwords
.
level0
=
oldconfig
.
ban
.
badword_level0
;
...
@@ -174,6 +181,13 @@
...
@@ -174,6 +181,13 @@
setting_save
(
badwords
);
setting_save
(
badwords
);
}
}
try
{
duel_log
=
require
(
'
./config/duel_log.json
'
);
}
catch
(
error1
)
{
duel_log
=
default_data
.
duel_log
;
setting_save
(
duel_log
);
}
try
{
try
{
cppversion
=
parseInt
(
fs
.
readFileSync
(
'
ygopro/gframe/game.cpp
'
,
'
utf8
'
).
match
(
/PRO_VERSION =
([
x
\d
ABCDEF
]
+
)
/
)[
1
],
'
16
'
);
cppversion
=
parseInt
(
fs
.
readFileSync
(
'
ygopro/gframe/game.cpp
'
,
'
utf8
'
).
match
(
/PRO_VERSION =
([
x
\d
ABCDEF
]
+
)
/
)[
1
],
'
16
'
);
setting_change
(
settings
,
"
version
"
,
cppversion
);
setting_change
(
settings
,
"
version
"
,
cppversion
);
...
@@ -216,17 +230,6 @@
...
@@ -216,17 +230,6 @@
windbots
=
require
(
settings
.
modules
.
windbot
.
botlist
).
windbots
;
windbots
=
require
(
settings
.
modules
.
windbot
.
botlist
).
windbots
;
}
}
if
(
settings
.
modules
.
tournament_mode
.
enabled
)
{
duel_log
=
{};
clearlog
=
function
()
{
duel_log
=
{};
duel_log
.
file
=
'
duel_log.
'
+
moment
().
format
(
'
YYYY-MM-DD HH-mm-ss
'
)
+
'
.json
'
;
duel_log
.
duel_log
=
[];
setting_save
(
duel_log
);
};
clearlog
();
}
ygopro
=
require
(
'
./ygopro.js
'
);
ygopro
=
require
(
'
./ygopro.js
'
);
if
(
settings
.
modules
.
http
.
websocket_roomlist
)
{
if
(
settings
.
modules
.
http
.
websocket_roomlist
)
{
...
@@ -2627,7 +2630,8 @@
...
@@ -2627,7 +2630,8 @@
return
;
return
;
}
else
{
}
else
{
response
.
writeHead
(
200
);
response
.
writeHead
(
200
);
clearlog
();
duel_log
.
duel_log
=
[];
setting_save
(
duel_log
);
response
.
end
(
addCallback
(
u
.
query
.
callback
,
"
[{name:'Success'}]
"
));
response
.
end
(
addCallback
(
u
.
query
.
callback
,
"
[{name:'Success'}]
"
));
}
}
}
else
if
(
_
.
startsWith
(
u
.
pathname
,
'
/api/replay
'
)
&&
settings
.
modules
.
tournament_mode
.
enabled
)
{
}
else
if
(
_
.
startsWith
(
u
.
pathname
,
'
/api/replay
'
)
&&
settings
.
modules
.
tournament_mode
.
enabled
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment