JeroenED
/
libpairtwo
mirror of https://github.com/JeroenED/libpairtwo.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Added even more fields

This commit is contained in:
Jeroen De Meerleer 2019-09-25 14:33:52 +02:00
parent 44175fd47d
commit 1e65525b27
Signed by: JeroenED
GPG Key ID: 28CCCB8F62BFADD6
2 changed files with 38 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/Readers/Swar4.php
View File

@ -22,6 +22,7 @@ use JeroenED\Libpairtwo\Player;
use JeroenED\Libpairtwo\Tournament; use JeroenED\Libpairtwo\Tournament;
use JeroenED\Libpairtwo\Enums\Gender; use JeroenED\Libpairtwo\Enums\Gender;
use JeroenED\Libpairtwo\Enums\Title; use JeroenED\Libpairtwo\Enums\Title;
use JeroenED\Libpairtwo\Enums\Result;
/** /**
* Class Swar4 * Class Swar4
@ -162,8 +163,7 @@ class Swar4 implements ReaderInterface
$player->setBinaryData('InscriptionNo', $this->readData('Int', $swshandle)); $player->setBinaryData('InscriptionNo', $this->readData('Int', $swshandle));
$player->setBinaryData('Rank', $this->readData('Int', $swshandle)); $player->setBinaryData('Rank', $this->readData('Int', $swshandle));
$player->setBinaryData('CatIndex', $this->readData('Int', $swshandle)); $player->setBinaryData('CatIndex', $this->readData('Int', $swshandle));
echo ''; $this->readData('String', $swshandle); $player->setDateOfBirth($this->readData('Date', $swshandle));
//$player->setDateOfBirth($this->readData('Date', $swshandle));
switch ($this->readData('Int', $swshandle)) { switch ($this->readData('Int', $swshandle)) {
case 1: case 1:
$gender = Gender::Male; $gender = Gender::Male;
@ -176,48 +176,42 @@ class Swar4 implements ReaderInterface
break; break;
} }
$player->setGender(new Gender($gender)); $player->setGender(new Gender($gender));
$player->setNation($this->readData('String', $swshandle)); $player->setNation($this->readData('String', $swshandle));
//echo ftell($swshandle);
//echo $this->readData('Int', $swshandle); exit;
$player->setId('Nation', $this->readData('Int', $swshandle)); $player->setId('Nation', $this->readData('Int', $swshandle));
echo $player->getId('Nation');
$player->setId('Fide', $this->readData('Int', $swshandle)); $player->setId('Fide', $this->readData('Int', $swshandle));
$player->setBinaryData('Affliation', $this->readData('Int', $swshandle)); $player->setBinaryData('Affliation', $this->readData('Int', $swshandle));
$player->setElo('Nation', $this->readData('Int', $swshandle)); $player->setElo('Nation', $this->readData('Int', $swshandle));
$player->setElo('Fide', $this->readData('Int', $swshandle)); $player->setElo('Fide', $this->readData('Int', $swshandle));
exit;
switch ($this->readData('Int', $swshandle)) { switch ($this->readData('Int', $swshandle)) {
case 1: case 1:
$title = Title::NM;
break;
case 2:
$title = Title::WCM; $title = Title::WCM;
break; break;
case 3: case 2:
$title = Title::WFM; $title = Title::WFM;
break; break;
case 4: case 3:
$title = Title::CM; $title = Title::CM;
break; break;
case 5: case 4:
$title = Title::WIM; $title = Title::WIM;
break; break;
case 6: case 5:
$title = Title::FM; $title = Title::FM;
break; break;
case 7: case 6:
$title = Title::WGM; $title = Title::WGM;
break; break;
case 8: case 7:
$title = Title::HM; $title = Title::HM;
break; break;
case 9: case 8:
$title = Title::IM; $title = Title::IM;
break; break;
case 10: case 9:
$title = Title::HG; $title = Title::HG;
break; break;
case 11: case 10:
$title = Title::GM; $title = Title::GM;
break; break;
case 0: case 0:
@ -228,27 +222,27 @@ class Swar4 implements ReaderInterface
$player->setTitle(new Title($title)); $player->setTitle(new Title($title));
$player->setId('Club', $this->readData('Int', $swshandle)); $player->setId('Club', $this->readData('Int', $swshandle));
$player->setId('ClubName', $this->readData('String', $swshandle)); $player->setBinaryData('ClubName', $this->readData('String', $swshandle));
$player->setBinaryData('NoOfMatchesNoBye', $this->readData('Int', $swshandle)); $player->setBinaryData('NoOfMatchesNoBye', $this->readData('Int', $swshandle));
$player->setBinaryData('Points', $this->readData('Int', $swshandle)); // To Calculate by libpairtwo $player->setBinaryData('Points', $this->readData('Int', $swshandle)); // To Calculate by libpairtwo
$player->setBinaryData('AmericanPoints', $this->readData('Int', $swshandle)); // To Calculate by libpairtwo $player->setBinaryData('AmericanPoints', $this->readData('Int', $swshandle)); // To Calculate by libpairtwo
for ($i = 0; $i < 5; $i++) { for ($t = 0; $t < 5; $t++) {
$player->setBinaryData('Tiebreak_' . $i, $this->readData('Int', $swshandle)); // To Calculate by libpairtwo $player->setBinaryData('Tiebreak_' . $t, $this->readData('Int', $swshandle)); // To Calculate by libpairtwo
} }
$player->setBinaryData('Performance', $this->readData('Int', $swshandle)); // To Calculate by libpairtwo $player->setBinaryData('Performance', $this->readData('Int', $swshandle)); // To Calculate by libpairtwo
$player->setBinaryData('Absent', $this->readData('Int', $swshandle)); $player->setBinaryData('Absent', $this->readData('Int', $swshandle));
$player->setBinaryData('AbsentRounds', $this->readData('String', $swshandle)); $player->setBinaryData('AbsentRounds', $this->readData('String', $swshandle));
$player->setBinaryData('ExtraPoints', $this->readData('Int', $swshandle)); $player->setBinaryData('ExtraPoints', $this->readData('Int', $swshandle));
$player->setBinaryData('SpecialPoints', $this->readData('Int', $swshandle));
$player->setBinaryData('AllocatedRounds', $this->readData('Int', $swshandle)); $player->setBinaryData('AllocatedRounds', $this->readData('Int', $swshandle));
$player->setBinaryData('[RONDE]', $this->readData('String', $swshandle)); $player->setBinaryData('[RONDE]', $this->readData('String', $swshandle));
if ($player->getBinaryData('AllocatedRounds') != 0) { if ($player->getBinaryData('AllocatedRounds') != 0) {
for ($j = 0; $j < $player->getBinaryData('AllocatedRounds'); $j++) { for ($j = 0; $j < $player->getBinaryData('AllocatedRounds'); $j++) {
$this->getTournament()->setBinaryData('Pairing_' . $pt . '_player', count($this->getTournament()->getPlayers())); $this->getTournament()->setBinaryData('Pairing_' . $pt . '_player', $i);
$this->getTournament()->setBinaryData('Pairing_' . $pt . '_round', $this->readData('Int', $swshandle)); $this->getTournament()->setBinaryData('Pairing_' . $pt . '_round', $this->readData('Int', $swshandle));
$this->getTournament()->setBinaryData('Pairing_' . $pt . '_table', $this->readData('Int', $swshandle)); $this->getTournament()->setBinaryData('Pairing_' . $pt . '_table', $this->readData('Int', $swshandle));
$this->getTournament()->setBinaryData('Pairing_' . $pt . '_opponent', $this->readData('Int', $swshandle)); $this->getTournament()->setBinaryData('Pairing_' . $pt . '_opponent', $this->readData('Int', $swshandle) - 1);
$this->getTournament()->setBinaryData('Pairing_' . $pt . '_result', $this->readData('Hex', $swshandle)); $this->getTournament()->setBinaryData('Pairing_' . $pt . '_result', $this->readData('Hex', $swshandle));
$this->getTournament()->setBinaryData('Pairing_' . $pt . '_color', $this->readData('Int', $swshandle)); $this->getTournament()->setBinaryData('Pairing_' . $pt . '_color', $this->readData('Int', $swshandle));
$this->getTournament()->setBinaryData('Pairing_' . $pt . '_float', $this->readData('Int', $swshandle)); $this->getTournament()->setBinaryData('Pairing_' . $pt . '_float', $this->readData('Int', $swshandle));
@ -262,17 +256,20 @@ class Swar4 implements ReaderInterface
} }
$ptn = 0; $ptn = 0;
while ('' !== $this->getTournament()->getBinaryData('Pairing_' . $ptn . '_round')) { while (null !== $this->getTournament()->getBinaryData('Pairing_' . $ptn . '_round')) {
$pairing = new Pairing(); $pairing = new Pairing();
$pairing->setPlayer($this->getTournament()->getPlayerById($this->getTournament()->getBinaryData('Pairing_' . $ptn . '_player'))); $pairing->setPlayer($this->getTournament()->getPlayerById($this->getTournament()->getBinaryData('Pairing_' . $ptn . '_player')));
$pairing->setRound($this->getTournament()->getBinaryData('Pairing_' . $ptn . '_round')); $pairing->setRound($this->getTournament()->getBinaryData('Pairing_' . $ptn . '_round'));
$pairing->setOpponent($this->getTournament()->getPlayerById($this->getTournament()->getBinaryData('Pairing_' . $ptn . '_opponent'))); if($this->getTournament()->getBinaryData('Pairing_' . $ptn . '_opponent') != 4294967294) {
$pairing->setOpponent($this->getTournament()->getPlayerById($this->getTournament()->getBinaryData('Pairing_' . $ptn . '_opponent')));
}
//echo $ptn . ' ' . $this->getTournament()->getBinaryData('Pairing_' . $ptn . '_round') . ' ' . $pairing->getPlayer()->getName() . ' - ' . $opponent . ' ' . $this->getTournament()->getBinaryData('Pairing_' . $ptn . '_result') . PHP_EOL;
switch ($this->getTournament()->getBinaryData('Pairing_' . $ptn . '_result')) { switch ($this->getTournament()->getBinaryData('Pairing_' . $ptn . '_result')) {
case 1: case '1000':
$result = Result::lost; $result = Result::lost;
break; break;
case 2: case '01':
$result = Result::absent; $result = Result::absent;
break; break;
case 3: case 3:
@ -416,11 +413,14 @@ class Swar4 implements ReaderInterface
* Returns binary data that was read out the swar file but was not needed immediately * Returns binary data that was read out the swar file but was not needed immediately
* *
* @param string $Key * @param string $Key
* @return bool|DateTime|int|string * @return bool|DateTime|int|string|null
*/ */
public function getBinaryData(string $Key) public function getBinaryData(string $Key)
{ {
return $this->BinaryData[$Key]; if (isset($this->BinaryData[$Key])) {
return $this->BinaryData[$Key];
}
return null;
} }
/** /**
@ -442,6 +442,10 @@ class Swar4 implements ReaderInterface
*/ */
public function convertStringToDate(string $string): \DateTime public function convertStringToDate(string $string): \DateTime
{ {
return DateTime::createFromFormat('d/m/Y', $string); if (strlen($string) == 10) {
return DateTime::createFromFormat('d/m/Y', $string);
} elseif (strlen($string) == 8) {
return DateTime::createFromFormat('Ymd', $string);
}
} }
} }

4
tests/ReadSws_test.php
View File

@ -27,8 +27,8 @@ use JeroenED\Libpairtwo\IOFactory;
require_once '../vendor/autoload.php'; require_once '../vendor/autoload.php';
$sws = IOFactory::createReader('Pairtwo-6'); $sws = IOFactory::createReader('Swar-4');
$sws->read('../res/testsws.sws'); $sws->read('../res/testswar.swar');
echo "Release: " . $sws->getRelease() . PHP_EOL; echo "Release: " . $sws->getRelease() . PHP_EOL;
echo "Name: " . $sws->getTournament()->getName() . PHP_EOL; echo "Name: " . $sws->getTournament()->getName() . PHP_EOL;