Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
Ygopro Arena Revive
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
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
Ygopro Arena Revive
Commits
5ca9b2c4
Commit
5ca9b2c4
authored
Feb 21, 2021
by
nanahira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
deckinfo
parent
22177d4d
Pipeline
#2464
passed with stages
in 59 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
168 additions
and
12 deletions
+168
-12
src/app.controller.ts
src/app.controller.ts
+23
-9
src/app.service.ts
src/app.service.ts
+132
-0
src/entities/ygodb/YGOProDatabaseDatas.ts
src/entities/ygodb/YGOProDatabaseDatas.ts
+6
-2
src/entities/ygodb/YGOProDatabaseTexts.ts
src/entities/ygodb/YGOProDatabaseTexts.ts
+7
-1
No files found.
src/app.controller.ts
View file @
5ca9b2c4
...
...
@@ -118,7 +118,14 @@ export class AppController {
const
result
=
await
this
.
appService
.
getRandomVote
(
userid
);
return
result
;
}
@
Get
(
'
deckinfo
'
)
async
getDeckInfo
(@
Query
()
query
,
@
Res
()
res
:
express
.
Response
)
{
if
(
!
query
.
name
)
{
res
.
status
(
404
).
send
(
'
deck name is required!
'
);
}
const
result
=
await
this
.
appService
.
getDeckInfo
(
query
);
res
.
status
(
result
.
code
).
json
(
result
);
}
@
Post
(
'
upload
'
)
uploadFile
(@
Req
()
req
:
express
.
Request
,
@
Res
()
res
:
express
.
Response
)
{
const
form
=
new
IncomingForm
();
...
...
@@ -147,14 +154,6 @@ export class AppController {
res
.
status
(
response
.
code
).
json
(
response
);
});
}
@
Get
(
'
deckinfo
'
)
async
getDeckInfo
(@
Query
()
query
,
@
Res
()
res
:
express
.
Response
)
{
if
(
!
query
.
name
)
{
res
.
status
(
404
).
send
(
'
deck name is required!
'
);
}
const
result
=
await
this
.
appService
.
getDeckInfo
(
query
);
res
.
status
(
result
.
code
).
json
(
result
);
}
@
Get
(
'
download/:id
'
)
downloadFile
(@
Param
(
'
id
'
)
filename
:
string
,
@
Res
()
res
:
express
.
Response
)
{
if
(
!
filename
)
{
...
...
@@ -163,4 +162,19 @@ export class AppController {
const
filepath
=
`upload/
${
filename
}
`
;
res
.
download
(
filepath
,
filename
);
}
@
Get
(
'
deckdata/:id
'
)
async
getDeckData
(
@
Param
(
'
id
'
)
filename
:
string
,
@
Res
()
res
:
express
.
Response
,
)
{
if
(
!
filename
)
{
res
.
status
(
400
).
end
(
'
Missing filename.
'
);
}
const
deck
=
await
this
.
appService
.
getDeckData
(
filename
);
if
(
!
deck
)
{
res
.
status
(
404
).
end
(
'
File not found.
'
);
}
res
.
json
({
deck
});
}
}
src/app.service.ts
View file @
5ca9b2c4
...
...
@@ -93,6 +93,13 @@ interface VoteOption {
percentage
:
number
;
}
interface
DeckInfoCard
{
id
:
number
;
num
:
number
;
name
?:
string
;
type
?:
string
;
}
@
Injectable
()
export
class
AppService
{
chineseDirtyFilter
:
Filter
;
...
...
@@ -1155,4 +1162,129 @@ export class AppService {
data
:
deck
,
};
}
private
async
fillCardInfo
(
item
:
DeckInfoCard
)
{
const
lang
=
'
cn
'
;
const
id
=
item
.
id
;
const
card
=
await
this
.
cndb
.
getRepository
(
YGOProDatabaseDatas
).
findOne
({
where
:
{
id
},
relations
:
[
'
texts
'
],
});
if
(
!
card
)
{
this
.
log
.
error
(
`Card
${
item
.
id
}
not found in database.`
);
item
.
name
=
'
Not found in database
'
;
item
.
type
=
'
怪兽
'
;
return
;
}
item
.
name
=
card
.
texts
.
name
;
item
.
type
=
getStringValueByMysticalNumber
(
lang
,
typeOffset
,
card
.
type
);
}
private
async
fillCardInfoBatch
(
arr
:
DeckInfoCard
[])
{
return
await
Promise
.
all
(
arr
.
map
((
item
)
=>
this
.
fillCardInfo
(
item
)));
}
async
getDeckData
(
filename
:
string
)
{
const
filepath
=
'
upload/
'
+
filename
;
let
contentsRaw
:
string
;
try
{
contentsRaw
=
await
fs
.
readFile
(
filepath
,
'
utf8
'
);
}
catch
(
e
)
{
return
null
;
}
const
contents
=
contentsRaw
.
split
(
/
\r?\n
/
);
const
mainCardArr
:
DeckInfoCard
[]
=
[];
const
extraCardArr
:
DeckInfoCard
[]
=
[];
const
sideCardArr
:
DeckInfoCard
[]
=
[];
const
masterCardArr
:
DeckInfoCard
[]
=
[];
const
trapCardArr
:
DeckInfoCard
[]
=
[];
const
spellCardArr
:
DeckInfoCard
[]
=
[];
const
mainOriginal
:
number
[]
=
[];
const
extraOriginal
:
number
[]
=
[];
const
sideOriginal
:
number
[]
=
[];
let
current
=
mainOriginal
;
_
.
each
(
contents
,
function
(
text
)
{
if
(
text
===
'
#main
'
)
{
current
=
mainOriginal
;
}
if
(
text
===
'
#extra
'
)
{
current
=
extraOriginal
;
}
if
(
text
===
'
!side
'
)
{
current
=
sideOriginal
;
}
if
(
text
===
'
#main
'
||
text
===
'
#extra
'
||
text
===
'
!side
'
)
{
return
;
}
if
(
text
.
indexOf
(
'
created
'
)
!==
-
1
)
{
return
;
}
if
(
text
.
trim
()
===
''
)
{
return
;
}
const
parsedText
=
parseInt
(
text
);
if
(
isNaN
(
parsedText
))
{
return
;
}
current
.
push
(
parsedText
);
});
const
main
=
_
.
countBy
(
mainOriginal
,
Math
.
floor
);
const
extra
=
_
.
countBy
(
extraOriginal
,
Math
.
floor
);
const
side
=
_
.
countBy
(
sideOriginal
,
Math
.
floor
);
_
.
each
(
main
,
function
(
value
,
key
)
{
mainCardArr
.
push
({
id
:
parseInt
(
key
),
num
:
value
,
});
});
_
.
each
(
extra
,
function
(
value
,
key
)
{
extraCardArr
.
push
({
id
:
parseInt
(
key
),
num
:
value
,
});
});
_
.
each
(
side
,
function
(
value
,
key
)
{
sideCardArr
.
push
({
id
:
parseInt
(
key
),
num
:
value
,
});
});
await
Promise
.
all
(
[
mainCardArr
,
sideCardArr
,
extraCardArr
].
map
((
arr
)
=>
this
.
fillCardInfoBatch
(
arr
),
),
);
for
(
const
item
of
mainCardArr
)
{
if
(
item
.
type
===
'
怪兽
'
)
{
masterCardArr
.
push
(
item
);
}
else
if
(
item
.
type
===
'
魔法
'
)
{
spellCardArr
.
push
(
item
);
}
else
if
(
item
.
type
===
'
陷阱
'
)
{
trapCardArr
.
push
(
item
);
}
else
{
masterCardArr
.
push
(
item
);
}
}
return
{
monster
:
masterCardArr
,
spells
:
spellCardArr
,
traps
:
trapCardArr
,
extra
:
extraCardArr
,
side
:
sideCardArr
,
};
}
}
src/entities/ygodb/YGOProDatabaseDatas.ts
View file @
5ca9b2c4
import
{
Column
,
Entity
}
from
'
typeorm
'
;
import
{
Column
,
Entity
,
OneToOne
}
from
'
typeorm
'
;
import
{
YGOProDatabaseTexts
}
from
'
./YGOProDatabaseTexts
'
;
@
Entity
(
'
datas
'
)
export
class
YGOProDatabaseDatas
{
@
Column
(
'
integer
'
,
{
primary
:
true
,
name
:
'
id
'
})
id
:
number
|
null
;
id
:
number
;
@
OneToOne
((
type
)
=>
YGOProDatabaseTexts
,
(
texts
)
=>
texts
.
datas
)
texts
:
YGOProDatabaseTexts
;
@
Column
(
'
integer
'
,
{
name
:
'
ot
'
,
nullable
:
true
})
ot
:
number
|
null
;
...
...
src/entities/ygodb/YGOProDatabaseTexts.ts
View file @
5ca9b2c4
import
{
Column
,
Entity
}
from
'
typeorm
'
;
import
{
Column
,
Entity
,
OneToOne
}
from
'
typeorm
'
;
import
{
YGOProDatabaseDatas
}
from
'
./YGOProDatabaseDatas
'
;
import
{
JoinColumn
}
from
'
typeorm
'
;
@
Entity
(
'
texts
'
)
export
class
YGOProDatabaseTexts
{
@
Column
(
'
integer
'
,
{
primary
:
true
,
name
:
'
id
'
})
id
:
number
;
@
OneToOne
((
type
)
=>
YGOProDatabaseDatas
,
(
datas
)
=>
datas
.
texts
)
@
JoinColumn
({
name
:
'
id
'
,
referencedColumnName
:
'
id
'
})
datas
:
YGOProDatabaseDatas
;
@
Column
(
'
text
'
,
{
name
:
'
name
'
,
nullable
:
true
})
name
:
string
|
null
;
...
...
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