From: Christian Weiske Date: Thu, 21 Nov 2019 22:07:06 +0000 (+0100) Subject: working categories X-Git-Tag: v1.0.0~36 X-Git-Url: https://git.cweiske.de/stouyapi.git/commitdiff_plain/bda6c22fc5fa02a7b34f4a6e2602c0684dca3066?ds=sidebyside working categories --- diff --git a/bin/filters.php b/bin/filters.php new file mode 100644 index 0000000..adad0d2 --- /dev/null +++ b/bin/filters.php @@ -0,0 +1,61 @@ +genres) !== false) { + $filtered[] = $game; + } + } + return $filtered; +} + +function filterByPackageNames($origGames, $packageNames) +{ + $names = array_flip($packageNames); + $filtered = []; + foreach ($origGames as $game) { + if (isset($names[$game->packageName])) { + $filtered[] = $game; + } + } + return $filtered; +} + +function filterByPlayers($origGames, $numOfPlayers) +{ + $filtered = []; + foreach ($origGames as $game) { + if (array_search($numOfPlayers, $game->players) !== false) { + $filtered[] = $game; + } + } + return $filtered; +} + +function filterLastUpdated($origGames, $limit) +{ + $games = array_values($origGames); + usort( + $games, + function ($gameA, $gameB) { + return strtotime($gameB->latestRelease->date) - strtotime($gameA->latestRelease->date); + } + ); + + return array_slice($games, 0, $limit); +} + +function filterBestRated($origGames, $limit) +{ + $games = array_values($origGames); + usort( + $games, + function ($gameA, $gameB) { + return $gameB->rating->average - $gameA->rating->average; + } + ); + + return array_slice($games, 0, $limit); +} +?> diff --git a/bin/import-game-data.php b/bin/import-game-data.php index b1ec629..2952aba 100755 --- a/bin/import-game-data.php +++ b/bin/import-game-data.php @@ -6,36 +6,65 @@ * @link https://github.com/cweiske/ouya-game-data/ * @author Christian Weiske */ +ini_set('xdebug.halt_level', E_WARNING|E_NOTICE|E_USER_WARNING|E_USER_NOTICE); +require_once __DIR__ . '/filters.php'; if (!isset($argv[1])) { - error('Pass the path to a directory with game data json files'); + error('Pass the path to a "folders" file with game data json files folder names'); } -$gameDataDir = $argv[1]; -if (!is_dir($gameDataDir)) { - error('Given path is not a directory: ' . $gameDataDir); +$foldersFile = $argv[1]; +if (!is_file($foldersFile)) { + error('Given path is not a file: ' . $foldersFile); } +$GLOBALS['packagelists']['cweiskepicks'] = [ + 'de.eiswuxe.blookid2', + 'com.cosmos.babyloniantwins' +]; + $wwwDir = __DIR__ . '/../www/'; -$gameFiles = glob($gameDataDir . '/*.json'); +$baseDir = dirname($foldersFile); +$gameFiles = []; +foreach (file($foldersFile) as $line) { + $line = trim($line); + if (strlen($line)) { + if (strpos($line, '..') !== false) { + error('Path attack in ' . $folder); + } + $folder = $baseDir . '/' . $line; + if (!is_dir($folder)) { + error('Folder does not exist: ' . $folder); + } + $gameFiles = array_merge($gameFiles, glob($folder . '/*.json')); + } +} + $games = []; +$count = 0; foreach ($gameFiles as $gameFile) { $game = json_decode(file_get_contents($gameFile)); if ($game === null) { error('JSON invalid at ' . $gameFile); } addMissingGameProperties($game); - $games[$game->package] = $game; + $games[$game->packageName] = $game; writeJson( - 'api/v1/details-data/' . $game->package . '.json', + 'api/v1/details-data/' . $game->packageName . '.json', buildDetails($game) ); + /* this crashes babylonian twins + writeJson( + 'api/v1/games/' . $game->packageName . '/purchases', + "{}\n" + ); + */ writeJson( - 'api/v1/apps/' . $game->package . '.json', + 'api/v1/apps/' . $game->packageName . '.json', buildApps($game) ); - $latestRelease = getLatestRelease($game); + $latestRelease = $game->latestRelease; writeJson( 'api/v1/apps/' . $latestRelease->uuid . '.json', buildApps($game) @@ -45,24 +74,135 @@ foreach ($gameFiles as $gameFile) { 'api/v1/apps/' . $latestRelease->uuid . '-download.json', buildAppDownload($game, $latestRelease) ); - //exit(2); + if ($count++ > 20) { + //break; + } } writeJson('api/v1/discover.json', buildDiscover($games)); writeJson('api/v1/discover-data/home.json', buildDiscoverHome($games)); + +function buildDiscover(array $games) +{ + $data = [ + 'title' => 'DISCOVER', + 'rows' => [], + 'tiles' => [], + ]; + + addDiscoverRow( + $data, 'Last Updated', + filterLastUpdated($games, 10) + ); + addDiscoverRow( + $data, 'Best rated', + filterBestRated($games, 10) + ); + addDiscoverRow( + $data, "cweiske's picks", + filterByPackageNames($games, $GLOBALS['packagelists']['cweiskepicks']) + ); + + $players = [ + 1 => '1 player', + 2 => '2 players', + 3 => '3 players', + 4 => '4 players', + ]; + addDiscoverRow($data, '# of players', $players); + foreach ($players as $num => $title) { + writeJson( + 'api/v1/discover-data/' . categoryPath($title) . '.json', + buildDiscoverCategory($title, filterByPlayers($games, $num)) + ); + } + + $genres = getAllGenres($games); + sort($genres); + $genreChunks = array_chunk($genres, 4); + $first = true; + foreach ($genreChunks as $chunk) { + addDiscoverRow( + $data, $first ? 'Genres' : '', + $chunk + ); + $first = false; + } + + foreach ($genres as $genre) { + writeJson( + 'api/v1/discover-data/' . categoryPath($genre) . '.json', + buildDiscoverCategory($genre, filterByGenre($games, $genre)) + ); + } + + return $data; +} + +/** + * A genre category page + */ +function buildDiscoverCategory($name, $games) +{ + $data = [ + 'title' => $name, + 'rows' => [], + 'tiles' => [], + ]; + addDiscoverRow( + $data, 'Last Updated', + filterLastUpdated($games, 10) + ); + addDiscoverRow( + $data, 'Best rated', + filterBestRated($games, 10) + ); + + usort( + $games, + function ($gameA, $gameB) { + return strcmp($gameB->title, $gameA->title); + } + ); + $chunks = array_chunk($games, 4); + foreach ($chunks as $chunkGames) { + addDiscoverRow($data, '', $chunkGames); + } + + return $data; +} + +function buildDiscoverHome(array $games) +{ + //we do not want anything here for now + $data = [ + 'title' => 'home', + 'rows' => [ + [ + 'title' => 'FEATURED', + 'showPrice' => false, + 'ranked' => false, + 'tiles' => [], + ] + ], + 'tiles' => [], + ]; + return $data; +} + /** - * Build api/v1/apps/$package + * Build api/v1/apps/$packageName */ function buildApps($game) { - $latestRelease = getLatestRelease($game); + $latestRelease = $game->latestRelease; // http://cweiske.de/ouya-store-api-docs.htm#get-https-devs-ouya-tv-api-v1-apps-xxx return [ 'app' => [ - 'uuid' => $game->uuid, + 'uuid' => $latestRelease->uuid, 'title' => $game->title, 'overview' => $game->overview, 'description' => $game->description, @@ -86,7 +226,7 @@ function buildApps($game) 'publicSize' => $latestRelease->publicSize, 'nativeSize' => $latestRelease->nativeSize, - 'mainImageFullUrl' => $game->media->large, + 'mainImageFullUrl' => $game->media->discover, 'videoUrl' => $game->media->video, 'filepickerScreenshots' => $game->media->screenshots, 'mobileAppIcon' => null, @@ -118,17 +258,17 @@ function buildAppDownload($game, $release) */ function buildDetails($game) { - $latestRelease = getLatestRelease($game); + $latestRelease = $game->latestRelease; $mediaTiles = []; - if ($game->media->large) { + if ($game->media->discover) { $mediaTiles[] = [ 'type' => 'image', 'urls' => [ - 'thumbnail' => $game->media->large, - 'full' => $game->media->large, + 'thumbnail' => $game->media->discover, + 'full' => $game->media->discover, ], - 'fp_url' => $game->media->large, + 'fp_url' => $game->media->discover, ]; } if ($game->media->video) { @@ -174,7 +314,7 @@ function buildDetails($game) 'md5sum' => $latestRelease->md5sum, 'filename' => 'FIXME', 'errors' => '', - 'package' => $game->package, + 'package' => $game->packageName, 'versionCode' => $latestRelease->versionCode, 'state' => 'complete', ], @@ -208,58 +348,60 @@ function buildDetails($game) ]; } -function buildDiscover(array $games) +function addDiscoverRow(&$data, $title, $games) { - $data = [ - 'title' => 'DISCOVER', - 'rows' => [], - 'tiles' => [], - ]; - $tileMap = []; - - $rowAll = [ - 'title' => 'ALL GAMES', + $row = [ + 'title' => $title, 'showPrice' => false, 'ranked' => false, 'tiles' => [], ]; foreach ($games as $game) { - $tilePos = count($tileMap); - $data['tiles'][$tilePos] = buildDiscoverGameTile($game); - $tileMap[$game->package] = $tilePos; - - $rowAll['tiles'][] = $tilePos; + if (is_string($game)) { + //category link + $tilePos = count($data['tiles']); + $data['tiles'][$tilePos] = buildDiscoverCategoryTile($game); + + } else { + //game + $tilePos = findTile($data['tiles'], $game->packageName); + if ($tilePos === null) { + $tilePos = count($data['tiles']); + $data['tiles'][$tilePos] = buildDiscoverGameTile($game); + } + } + $row['tiles'][] = $tilePos; } - $data['rows'][] = $rowAll; + $data['rows'][] = $row; +} - return $data; +function findTile($tiles, $packageName) +{ + foreach ($tiles as $pos => $tile) { + if ($tile['package'] == $packageName) { + return $pos; + } + } + return null; } -function buildDiscoverHome(array $games) +function buildDiscoverCategoryTile($title) { - //we do not want anything here for now - $data = [ - 'title' => 'home', - 'rows' => [ - [ - 'title' => 'FEATURED', - 'showPrice' => false, - 'ranked' => false, - 'tiles' => [], - ] - ], - 'tiles' => [], + return [ + 'url' => 'ouya://launcher/discover/' . categoryPath($title), + 'image' => '', + 'title' => $title, + 'type' => 'discover' ]; - return $data; } function buildDiscoverGameTile($game) { - $latestRelease = getLatestRelease($game); + $latestRelease = $game->latestRelease; return [ 'gamerNumbers' => $game->players, 'genres' => $game->genres, - 'url' => 'ouya://launcher/details?app=' . $game->package, + 'url' => 'ouya://launcher/details?app=' . $game->packageName, 'latestVersion' => [ 'apk' => [ 'md5sum' => $latestRelease->md5sum, @@ -271,7 +413,7 @@ function buildDiscoverGameTile($game) 'promotedProduct' => null, 'premium' => $game->premium, 'type' => 'app', - 'package' => $game->package, + 'package' => $game->packageName, 'updated_at' => strtotime($latestRelease->date), 'updatedAt' => $latestRelease->date, 'title' => $game->title, @@ -284,6 +426,20 @@ function buildDiscoverGameTile($game) ]; } +function categoryPath($title) +{ + return str_replace(['/', '\\', ' '], '_', $title); +} + +function getAllGenres($games) +{ + $genres = []; + foreach ($games as $game) { + $genres = array_merge($genres, $game->genres); + } + return array_unique($genres); +} + function addMissingGameProperties($game) { if (!isset($game->overview)) { @@ -324,6 +480,8 @@ function addMissingGameProperties($game) $game->rating->count = 0; } + $game->latestRelease = null; + $latestReleaseTimestamp = 0; foreach ($game->releases as $release) { if (!isset($release->publicSize)) { $release->publicSize = 0; @@ -331,6 +489,15 @@ function addMissingGameProperties($game) if (!isset($release->nativeSize)) { $release->nativeSize = 0; } + + $releaseTimestamp = strtotime($release->date); + if ($releaseTimestamp > $latestReleaseTimestamp) { + $game->latestRelease = $release; + $latestReleaseTimestamp = $releaseTimestamp; + } + } + if ($game->latestRelease === null) { + error('No latest release for ' . $game->packageName); } if (!isset($game->media->video)) { @@ -356,21 +523,6 @@ function addMissingGameProperties($game) } } -function getLatestRelease($game) -{ - $latestRelease = null; - foreach ($game->releases as $release) { - if ($release->latest ?? false) { - $latestRelease = $release; - break; - } - } - if ($latestRelease === null) { - error('No latest release for ' . $game->package); - } - return $latestRelease; -} - function writeJson($path, $data) { global $wwwDir;