v/PrintABrick
1
0
Fork 0
mirror of https://github.com/ToxicCrack/PrintABrick.git synced 2025-05-16 04:10:09 -07:00
Code Issues Projects Releases Wiki Activity

re-enabled importing colors from rebrickable

Browse Source
This commit is contained in:
Daniel 2020-03-20 13:16:29 +01:00
parent 4746b980ed
commit 5ab756aad1
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/AppBundle/Service/SetService.php
View File

@ -166,7 +166,7 @@ class SetService
/** @var Inventory_Part $inventoryPart */ /** @var Inventory_Part $inventoryPart */
foreach ($inventoryParts as $inventoryPart) { foreach ($inventoryParts as $inventoryPart) {
if ($model = $inventoryPart->getPart()->getModel()) { if ($model = $inventoryPart->getPart()->getModel()) {
$color = $inventoryPart->getCOlor(); $color = $inventoryPart->getColor();
if (!isset($colors[$color->getId()]['color'])) { if (!isset($colors[$color->getId()]['color'])) {
$colors[$color->getId()]['color'] = $color; $colors[$color->getId()]['color'] = $color;

29
src/LoaderBundle/Service/RebrickableLoader.php
View File

@ -52,6 +52,7 @@ class RebrickableLoader extends BaseLoader
'Loading CSV files into database...', 'Loading CSV files into database...',
]); ]);
$this->loadColorTable($this->csvFile['colors']);
$this->loadCategoryTable($this->csvFile['part_categories']); $this->loadCategoryTable($this->csvFile['part_categories']);
$this->loadPartTable($this->csvFile['parts']); $this->loadPartTable($this->csvFile['parts']);
$this->loadThemeTable($this->csvFile['themes']); $this->loadThemeTable($this->csvFile['themes']);
@ -70,7 +71,7 @@ class RebrickableLoader extends BaseLoader
} catch (\Exception $e) { } catch (\Exception $e) {
// $this->writeOutput(['Rollback back']); // $this->writeOutput(['Rollback back']);
// $connection->rollBack(); // $connection->rollBack();
echo $e->getMessage();
throw new LoadingRebrickableFailedException(); throw new LoadingRebrickableFailedException();
} }
} }
@ -80,7 +81,7 @@ class RebrickableLoader extends BaseLoader
*/ */
private function loadCsvFiles() private function loadCsvFiles()
{ {
$array = ['inventories', 'inventory_parts', 'inventory_sets', 'sets', 'themes', 'parts', 'part_categories']; $array = ['inventories', 'inventory_parts', 'inventory_sets', 'sets', 'themes', 'parts', 'part_categories', 'colors'];
$this->writeOutput([ $this->writeOutput([
'<fg=cyan>------------------------------------------------------------------------------</>', '<fg=cyan>------------------------------------------------------------------------------</>',
@ -103,15 +104,15 @@ class RebrickableLoader extends BaseLoader
private function truncateTables() private function truncateTables()
{ {
$query = ' $query = '
DELETE FROM rebrickable_inventory_parts; TRUNCATE rebrickable_inventory_parts;
DELETE FROM rebrickable_inventory_sets; TRUNCATE rebrickable_inventory_sets;
DELETE FROM rebrickable_inventory; TRUNCATE rebrickable_inventory;
DELETE FROM rebrickable_set; TRUNCATE rebrickable_set;
DELETE FROM rebrickable_theme; TRUNCATE rebrickable_theme;
DELETE FROM rebrickable_part; TRUNCATE rebrickable_part;
DELETE FROM rebrickable_category; TRUNCATE rebrickable_category;
TRUNCATE color;
'; ';
return $this->em->getConnection()->prepare($query)->execute(); return $this->em->getConnection()->prepare($query)->execute();
} }
@ -189,8 +190,8 @@ class RebrickableLoader extends BaseLoader
return $this->loadCsvFile($csv, 'rebrickable_category', '(`id`,`name`)'); return $this->loadCsvFile($csv, 'rebrickable_category', '(`id`,`name`)');
} }
// private function loadColorTable($csv) private function loadColorTable($csv)
// { {
// return $this->loadCsvFile($csv, 'color', '(`id`,`name`,`rgb`, @var) SET transparent = IF(@var=\'t\',1,0)'); return $this->loadCsvFile($csv, 'color', '(`id`,`name`,`rgb`, @var) SET transparent = IF(@var=\'t\',1,0)');
// } }
} }