[game-data-packager] 01/01: add assert to make file size mandatory in yaml, fix various glitches found
Alexandre Detiste
detiste-guest at moszumanska.debian.org
Fri Apr 3 23:04:59 UTC 2015
This is an automated email from the git hooks/post-receive script.
detiste-guest pushed a commit to branch master
in repository game-data-packager.
commit 1e76da0f36e81f2fb2fa765456f0ea234625621e
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date: Sat Apr 4 01:02:58 2015 +0200
add assert to make file size mandatory in yaml, fix various glitches found
this is a follow-up to 'heretic: add missing file size'
---
data/doom2.yaml | 2 +-
data/doom3.yaml | 12 ++++++++++++
data/hacx.yaml | 2 +-
data/ja.yaml | 2 ++
data/quake.yaml | 1 +
data/quake2.yaml | 17 +++++++++++++++--
data/strife.yaml | 1 +
data/syndicate.yaml | 1 -
data/theme-hospital.yaml | 2 +-
data/tyrian.yaml | 3 +++
data/wolf3d.yaml | 6 +++---
game_data_packager/__init__.py | 6 ++++++
12 files changed, 46 insertions(+), 9 deletions(-)
diff --git a/data/doom2.yaml b/data/doom2.yaml
index b5b02a6..a0e21f6 100644
--- a/data/doom2.yaml
+++ b/data/doom2.yaml
@@ -320,7 +320,7 @@ md5sums: |
77464c420be047460fdf01a927679e18 catwalk.txt
e7c273033376824edf95e1328261e7de catwalk.wad
30e17b85fb58f45bfd54076bca1d6c4f combine.txt
- 77c179948df47a7a613bd1181c959892 combine.was
+ 77c179948df47a7a613bd1181c959892 combine.wad
055cb6078dc8c02d687a46cff0efdf99 fistula.txt
cbf714b499ebdef2682990eaf93fdb5f fistula.wad
c4804663d959554267e031f020f024a6 garrison.txt
diff --git a/data/doom3.yaml b/data/doom3.yaml
index 479dd43..c26fcb5 100644
--- a/data/doom3.yaml
+++ b/data/doom3.yaml
@@ -922,6 +922,18 @@ cksums: |
_ 238594 cdoom/fan_extras/cdoomsource_131/game/Player.cpp
_ 24420 cdoom/fan_extras/cdoomsource_131/game/Player.h
_ 19831 cdoom/fan_extras/cdoomsource_131/game/PlayerView.cpp
+ _ 7020 cdoom/fan_extras/cdoomsource_131/game/Sound.cpp
+ _ 46810 cdoom/fan_extras/cdoomsource_131/game/Target.cpp
+ _ 12712 cdoom/fan_extras/cdoomsource_131/game/Target.h
+ _ 141644 cdoom/fan_extras/cdoomsource_131/game/ai/AI.cpp
+ _ 64019 cdoom/fan_extras/cdoomsource_131/game/gamesys/SysCmds.cpp
+ _ 30523 cdoom/fan_extras/cdoomsource_131/game/gamesys/SysCvar.cpp
+ _ 6489 cdoom/fan_extras/cdoomsource_131/game/gamesys/SysCvar.h
+ _ 2803 cdoom/fan_extras/cdoomsource_131/readme.txt
+ _ 343424 cdoom/fan_extras/classicdoom_001_1280x1024.jpg
+ _ 659523 cdoom/fan_extras/wallpaper1.jpg
+ _ 1027454 cdoom/fan_extras/wallpaper2.jpg
+ _ 127737 cdoom/fan_extras/wallpaper3.jpg
_ 4587 base/D3BFGConfig.cfg
_ 9064 base/_common.crc
diff --git a/data/hacx.yaml b/data/hacx.yaml
index 0e28d8c..826236e 100644
--- a/data/hacx.yaml
+++ b/data/hacx.yaml
@@ -45,7 +45,7 @@ files:
cksums: |
_ 7731658 hacx12.zip
- _ 4192 hack.txt
+ _ 4192 hacx.txt
_ 19321722 hacx.wad
_ 22102200 hacx.wad_1.1
_ 21951805 hacx.wad_1.0
diff --git a/data/ja.yaml b/data/ja.yaml
index 75a75c0..0e77523 100644
--- a/data/ja.yaml
+++ b/data/ja.yaml
@@ -171,6 +171,8 @@ cksums: |
_ 6242 license.txt
2369534339 196079221 Jedi_Knight_jediacademydemo.exe
1245905322 196080485 GHJediAcademy.zip
+ _ 859 ui/demo_ingame.txt
+ _ 1158 ui/demo_menus.txt
md5sums: |
e17ee714ce9632f401960abb1b22fa4a base/assets0.pk3
diff --git a/data/quake.yaml b/data/quake.yaml
index c88eb91..4010ccd 100644
--- a/data/quake.yaml
+++ b/data/quake.yaml
@@ -267,6 +267,7 @@ files:
rogue/pak0.pak_mp2_cd:
look_for: [rogue/pak0.pak]
rogue/pak0.pak_steam:
+ size: 37875279
look_for: [rogue/pak0.pak]
rogue/pak0.pak_mp12_cd:
size: 37875279
diff --git a/data/quake2.yaml b/data/quake2.yaml
index 9580382..d3dbb5f 100644
--- a/data/quake2.yaml
+++ b/data/quake2.yaml
@@ -450,6 +450,7 @@ files:
download:
idstuff-mirrors:
path: quake2
+ size: 39015499
sha256: 7ace5a43983f10d6bdc9d9b6e17a1032ba6223118d389bd170df89b945a04a1e
provides:
- Manual.html
@@ -644,6 +645,7 @@ files:
download:
idstuff-mirrors:
path: quake2
+ size: 19267584
sha256: f82197c8c8089202a4b3a85d8833b0c2e827a709d205c760369407c212488baa
provides:
- Commercial Exploitation.doc
@@ -857,7 +859,6 @@ files:
- baseq2/players/male/w_sshotgun.md2
- baseq2/players/male/weapon.md2
- baseq2/players/male/weapon.pcx
- - ctf/ctf2.ico
- ctf/pak0.pak
- ctf/readme.txt
- ctf/server.cfg
@@ -1619,6 +1620,19 @@ cksums: |
# pak0.pak as seen in Fabian Greffrath's copy (#776059)
639175200 194965474 baseq2/pak0.pak_6be3f40
+ # files from the demo
+ _ 5073 quake2_manual/customer_support.html_3.14_demo
+ _ 49951322 baseq2/pak0.pak_demo
+ _ 8963 license.txt_3.14_demo
+ _ 20919 quake2_manual/credits.html_3.14_demo
+ _ 13079 quake2_manual/technical_information.html_3.14_demo
+ _ 62410 readme.txt_3.14_demo
+ _ 3675 release.txt_3.14_demo
+
+ _ 36277 baseq2/players/female/doomgal.pcx
+ _ 1803 baseq2/players/female/doomgal_i.pcx
+ _ 64705 baseq2/players/male/skin.pcx
+
# Mission Pack 2
1872384946 45736 rogue/docs/readme.htm
1358637215 25729 rogue/docs/release.htm
@@ -1904,7 +1918,6 @@ md5sums: |
46967dbfad628470a7bc344b20086d53 baseq2/players/male/w_sshotgun.md2
e9a5e9b2df9bf2fa5e53794f929419af baseq2/players/male/weapon.md2
0758d59ebfcb5931bda2b0985faf98a9 baseq2/players/male/weapon.pcx
- 59b0e6e7cd5e8b1eb2c3c5208adebce9 ctf/ctf2.ico
1f6bd3d4c08f7ed8c037b12fcffd2eb5 ctf/pak0.pak
9e5a0bc728d8e06a65244f8065d68c09 ctf/readme.txt
de2e8781bca657e62d4ad5e4b763cc7a ctf/server.cfg
diff --git a/data/strife.yaml b/data/strife.yaml
index 1d4dd28..61622a1 100644
--- a/data/strife.yaml
+++ b/data/strife.yaml
@@ -35,6 +35,7 @@ files:
cksums: |
_ 10493652 strife0.wad_teaser
_ 9934413 strife0.wad
+ _ 4851519 strife11.zip
_ 28372168 strife1.wad_1.0
_ 28377364 strife1.wad
_ 27319149 voices.wad
diff --git a/data/syndicate.yaml b/data/syndicate.yaml
index ca3292d..2f61523 100644
--- a/data/syndicate.yaml
+++ b/data/syndicate.yaml
@@ -1164,7 +1164,6 @@ md5sums: |
b0ee8ce42f322984923e61e98552b863 syngame.xmi
sha1sums: |
f9720895cd59692d22c6a4362d81397218ead80f col01.dat
- ae1f1f3a9c9b594170536f997703a67e6da2cda5 cursors/cursors.png
c4859bba0ddc854a37179e48c5ce809600f6c132 game01.dat
6aaddc0fee1382844d191bc77a0083f186107436 game02.dat
7b094cebd11cc6b7391a4b35f47ef376e2a7998c game03.dat
diff --git a/data/theme-hospital.yaml b/data/theme-hospital.yaml
index 22ba2d9..a954a8a 100644
--- a/data/theme-hospital.yaml
+++ b/data/theme-hospital.yaml
@@ -2444,7 +2444,7 @@ cksums: |
_ 5284 data/watch01v.dat_demo
_ 81 data/watch01v.tab
_ 108 data/watch01v.tab_demo
- _ 3 datam/demo.dat_demo
+ _ 3 datam/demo.dat
_ 79261 datam/mblk-0.dat
_ 1356 datam/mblk-0.tab
_ 149898 datam/mele-1.ani
diff --git a/data/tyrian.yaml b/data/tyrian.yaml
index 39db627..ccb4870 100644
--- a/data/tyrian.yaml
+++ b/data/tyrian.yaml
@@ -219,6 +219,9 @@ files:
unpack:
format: zip
+cksums: |
+ _ 7869 license.doc
+
md5sums: |
3f2476d9ff29a06cf9fb85d52302222a cubetxt1.dat
2b199deeccab1042fb02b46c47c2a8d0 cubetxt2.dat
diff --git a/data/wolf3d.yaml b/data/wolf3d.yaml
index 41a548d..e767b7a 100644
--- a/data/wolf3d.yaml
+++ b/data/wolf3d.yaml
@@ -306,7 +306,7 @@ cksums: |
96628160 402 maphead.wl6_1.1
4125294541 150746 gamemaps.wl6_1.1
# needed patch
- 2597251681 402 mpahead.wl6_1.2
+ 2597251681 402 maphead.wl6_1.2
1031424741 150758 gamemaps.wl6_1.2
# v1.0 shareware
@@ -451,7 +451,7 @@ sha256sums: |
16e21eab17af2062019cc85cc271f887191301d1aa6de04b1afac5998aad9d9c audiohed.wl6
2cc23cb811df16e656f1fea25cd2629859c1ec9997d35bc3b1776594094b67ef audiot.wl6
3df9f2ad54c601e79ab117c8175477b5d96571ba9e290cb9cd7d910abfeaae56 gamemaps.wl6
- 289e04f47128a5ba19f9b3f912b4048e26dc16c6fa00205ead51efb1d8e23c69 mapthead.wl6
+ 289e04f47128a5ba19f9b3f912b4048e26dc16c6fa00205ead51efb1d8e23c69 maphead.wl6
114f66d40e16f19f6866a30378178b7b85f26f02f948b85e91d9dc4d07a3a63e vgadict.wl6_steam
26b4bd0a79c757a48c9c6bf943d82d4a6afbda341ee68eeedf532470e79a7f5b vgagraph.wl6_steam
4ba3b8faedce7de2f0a9928affeaae45b3faefea6893d411f079d3ca1e8afa0b vgahead.wl6_steam
@@ -474,7 +474,7 @@ sha256sums: |
b1ccea3648c5737afdcc9966ee2e99d9189c48958b61d8ff7b4a8a4fc8e962c7 maphead.wl6_1.1
5f3ce493027bf2ddd29ca0f112e4ceb09df8736fc22719bc5575689847c0c645 gamemaps.wl6_1.1
13f125200d944fc83a28705e8fbc29024a6f2dbbb05e4a382846c18a6f80aca3 maphead.wl6_1.2
- 9c9e7feecc0b9804f5201b38e17311db2dbda7d956d7cab076cc9367f03789af gamepas.wl6_1.2
+ 9c9e7feecc0b9804f5201b38e17311db2dbda7d956d7cab076cc9367f03789af gamemaps.wl6_1.2
b86d2e697b4c3235ec4395e9ff6d3fecc281403a8faa972a4264ed071ccc944f AUDIOHED.WL1_1.0
c4f4ead90e8cff5d7bcfa28dc906c9cbc69268a7c44ea4a9d2598e17862b3428 AUDIOT.WL1_1.0
de61761d847d1808303f324ee648ed2addc3aa10acc04304c63b7ca9ee153d4a MAPHEAD.WL1_1.0
diff --git a/game_data_packager/__init__.py b/game_data_packager/__init__.py
index 14d658e..64aaf3c 100644
--- a/game_data_packager/__init__.py
+++ b/game_data_packager/__init__.py
@@ -696,6 +696,12 @@ class GameData(object):
assert wanted.sha1 is None, wanted.name
assert wanted.sha256 is None, wanted.name
assert wanted.size is None, wanted.name
+ # FIXME: find out file size and add to yaml
+ else:
+ assert wanted.size or filename in (
+ 'hipnotic/pak0.pak_qdq_glquake_compat'
+ 'resource.1_106_cd'
+ ), (self.shortname, wanted.name)
def __enter__(self):
return self
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git
More information about the Pkg-games-commits
mailing list