colwellkr/HummingBirdAnimeClient
1
0
Fork 0
forked from timw4mail/HummingBirdAnimeClient
Code Pull Requests Activity

Update header comments, add start of manga editing functionality

Browse Source
This commit is contained in:
Timothy Warren 2016-01-04 16:58:33 -05:00
parent 6b9be7e4d0
commit e9e16dd2b1
64 changed files with 332 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/config/base_config.php
View File

@ -6,7 +6,7 @@
* *
* @package HummingbirdAnimeClient * @package HummingbirdAnimeClient
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @link https://github.com/timw4mail/HummingBirdAnimeClient * @link https://github.com/timw4mail/HummingBirdAnimeClient
* @license MIT * @license MIT
*/ */

2
app/config/config.php
View File

@ -6,7 +6,7 @@
* *
* @package HummingbirdAnimeClient * @package HummingbirdAnimeClient
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @link https://github.com/timw4mail/HummingBirdAnimeClient * @link https://github.com/timw4mail/HummingBirdAnimeClient
* @license MIT * @license MIT
*/ */

2
app/config/database.php
View File

@ -6,7 +6,7 @@
* *
* @package HummingbirdAnimeClient * @package HummingbirdAnimeClient
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @link https://github.com/timw4mail/HummingBirdAnimeClient * @link https://github.com/timw4mail/HummingBirdAnimeClient
* @license MIT * @license MIT
*/ */

2
app/config/menus.php
View File

@ -6,7 +6,7 @@
* *
* @package HummingbirdAnimeClient * @package HummingbirdAnimeClient
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @link https://github.com/timw4mail/HummingBirdAnimeClient * @link https://github.com/timw4mail/HummingBirdAnimeClient
* @license MIT * @license MIT
*/ */

2
app/config/minify_config.php
View File

@ -6,7 +6,7 @@
* *
* @package HummingbirdAnimeClient * @package HummingbirdAnimeClient
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @link https://github.com/timw4mail/HummingBirdAnimeClient * @link https://github.com/timw4mail/HummingBirdAnimeClient
* @license MIT * @license MIT
*/ */

2
app/config/minify_css_groups.php
View File

@ -6,7 +6,7 @@
* *
* @package HummingbirdAnimeClient * @package HummingbirdAnimeClient
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @link https://github.com/timw4mail/HummingBirdAnimeClient * @link https://github.com/timw4mail/HummingBirdAnimeClient
* @license MIT * @license MIT
*/ */

2
app/config/minify_js_groups.php
View File

@ -6,7 +6,7 @@
* *
* @package HummingbirdAnimeClient * @package HummingbirdAnimeClient
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @link https://github.com/timw4mail/HummingBirdAnimeClient * @link https://github.com/timw4mail/HummingBirdAnimeClient
* @license MIT * @license MIT
*/ */

2
app/config/routes.php
View File

@ -6,7 +6,7 @@
* *
* @package HummingbirdAnimeClient * @package HummingbirdAnimeClient
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @link https://github.com/timw4mail/HummingBirdAnimeClient * @link https://github.com/timw4mail/HummingBirdAnimeClient
* @license MIT * @license MIT
*/ */

4
app/config/routing.php
View File

@ -6,7 +6,7 @@
* *
* @package HummingbirdAnimeClient * @package HummingbirdAnimeClient
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @link https://github.com/timw4mail/HummingBirdAnimeClient * @link https://github.com/timw4mail/HummingBirdAnimeClient
* @license MIT * @license MIT
*/ */
@ -28,7 +28,7 @@ return [
// Default pages for anime/manga // Default pages for anime/manga
'default_anime_list_path' => "watching", // watching|plan_to_watch|on_hold|dropped|completed|all 'default_anime_list_path' => "watching", // watching|plan_to_watch|on_hold|dropped|completed|all
'default_manga_list_path' => "all", // reading|plan_to_read|on_hold|dropped|completed|all 'default_manga_list_path' => "reading", // reading|plan_to_read|on_hold|dropped|completed|all
// Default view type (cover_view/list_view) // Default view type (cover_view/list_view)
'default_view_type' => 'cover_view', 'default_view_type' => 'cover_view',

4
app/views/anime/cover.php
View File

@ -26,13 +26,13 @@
<?php if ($auth->is_authenticated()): ?> <?php if ($auth->is_authenticated()): ?>
<div class="row"> <div class="row">
<span class="edit"> <span class="edit">
<a class="bracketed" title="Edit information about this anime" href="<?= $urlGenerator->url("anime/edit/{$item['id']}/{$item['watching_status']}", "anime") ?>">Edit</a> <a class="bracketed" title="Edit information about this anime" href="<?= $urlGenerator->url("anime/edit/{$item['id']}/{$item['watching_status']}") ?>">Edit</a>
</span> </span>
</div> </div>
<?php endif ?> <?php endif ?>
<?php if ($item['private'] || $item['rewatching']): ?> <?php if ($item['private'] || $item['rewatching']): ?>
<div class="row"> <div class="row">
<?php foreach(['private', 'rewatching'] as $attr): ?> <?php foreach(['private', 'rereading'] as $attr): ?>
<?php if($item[$attr]): ?> <?php if($item[$attr]): ?>
<span class="item-<?= $attr ?>"><?= ucfirst($attr) ?></span> <span class="item-<?= $attr ?>"><?= ucfirst($attr) ?></span>
<?php endif ?> <?php endif ?>

0
app/views/manga/add.php Normal file
View File

7
app/views/manga/cover.php
View File

@ -22,6 +22,13 @@
</a> </a>
</div> </div>
<div class="table"> <div class="table">
<?php if ($auth->is_authenticated()): ?>
<div class="row">
<span class="edit">
<a class="bracketed" title="Edit information about this manga" href="<?= $urlGenerator->url("manga/edit/{$item['id']}/{$name}") ?>">Edit</a>
</span>
</div>
<?php endif ?>
<div class="row"> <div class="row">
<div class="user_rating">Rating: <?= $item['user_rating'] ?> / 10</div> <div class="user_rating">Rating: <?= $item['user_rating'] ?> / 10</div>
</div> </div>

97
app/views/manga/edit.php Normal file
View File

@ -0,0 +1,97 @@
<?php if ($auth->is_authenticated()): ?>
<main>
<h1>
Edit <?= $item['manga']['title'] ?>
<?= ($item['manga']['alternate_title'] != "") ? "({$item['manga']['alternate_title']})" : ""; ?>
</h1>
<form action="<?= $action ?>" method="post">
<table class="form">
<thead>
<tr>
<th>
<h3><?= $escape->html($item['manga']['title']) ?></h3>
<?php if($item['manga']['alternate_title'] != ""): ?>
<h4><?= $escape->html($item['manga']['alternate_title']) ?></h4>
<?php endif ?>
</th>
<th>
<article class="media">
<?= $helper->img($item['manga']['image']); ?>
</article>
</th>
</tr>
</thead>
<tbody>
<tr>
<td><label for="private">Is Private?</label></td>
<td>
<input type="checkbox" name="private" id="private"
<?php if($item['private']): ?>checked="checked"<?php endif ?>
/>
</td>
</tr>
<tr>
<td><label for="status">Reading Status</label></td>
<td>
<select name="status" id="status">
<?php foreach($status_list as $status): ?>
<option <?php if($item['reading_status'] === $status): ?>selected="selected"<?php endif ?>
value="<?= $status ?>"><?= $status ?></option>
<?php endforeach ?>
</select>
</td>
</tr>
<tr>
<td><label for="series_rating">Rating</label></td>
<td>
<input type="number" min="0" max="10" maxlength="2" name="new_rating" value="<?= $item['user_rating'] ?>" id="series_rating" size="2" /> / 10
</td>
</tr>
<tr>
<td><label for="chapters_read">Chapters Read</label></td>
<td>
<input type="number" min="0" name="chapters_read" id="chapters_read" value="<?= $item['chapters']['read'] ?>" /> / <?= $item['chapters']['total'] ?>
</td>
</tr>
<tr>
<td><label for="volumes_read">Volumes Read</label></td>
<td>
<input type="number" min="0" name="volumes_read" id="volumes_read" value="<?= $item['volumes']['read'] ?>" /> / <?= $item['volumes']['total'] ?>
</td>
</tr>
<tr>
<td><label for="rereading_flag">Rereading?</label></td>
<td>
<input type="checkbox" name="reareading" id="rereading_flag"
<?php if($item['rereading'] === TRUE): ?>checked="checked"<?php endif ?>
/>
</td>
</tr>
<tr>
<td><label for="reread_count">Reread Count</label></td>
<td>
<input type="number" min="0" id="reread_count" name="reread_count" value="<?= $item['reread'] ?>" />
</td>
</tr>
<tr>
<td><label for="notes">Notes</label></td>
<td>
<textarea name="notes" id="notes"><?= $escape->html($item['notes']) ?></textarea>
</td>
</tr>
<tr>
<td>&nbsp;</td>
<td>
<input type="hidden" value="<?= $item['id'] ?>" name="id" />
<input type="hidden" value="<?= $item['manga']['slug'] ?>" name="manga_id" />
<input type="hidden" value="<?= $item['user_rating'] ?>" name="old_rating" />
<input type="hidden" value="true" name="edit" />
<button type="submit">Submit</button>
</td>
</tr>
</tbody>
</table>
</form>
</main>
<script src="<?= $urlGenerator->asset_url('js.php?g=edit') ?>"></script>
<?php endif ?>

8
app/views/manga/list.php
View File

@ -7,6 +7,9 @@
<table> <table>
<thead> <thead>
<tr> <tr>
<?php if ($auth->is_authenticated()): ?>
<th>&nbsp;</th>
<?php endif ?>
<th>Title</th> <th>Title</th>
<th>Rating</th> <th>Rating</th>
<th>Chapters</th> <th>Chapters</th>
@ -17,6 +20,11 @@
<tbody> <tbody>
<?php foreach($items as $item): ?> <?php foreach($items as $item): ?>
<tr id="manga-<?= $item['id'] ?>"> <tr id="manga-<?= $item['id'] ?>">
<?php if($auth->is_authenticated()): ?>
<td>
<a class="bracketed" href="<?= $urlGenerator->url("manga/edit/{$item['id']}/{$name}") ?>">Edit</a>
</td>
<?php endif ?>
<td class="align_left"> <td class="align_left">
<a href="<?= $item['manga']['url'] ?>"> <a href="<?= $item['manga']['url'] ?>">
<?= $item['manga']['title'] ?> <?= $item['manga']['title'] ?>

2
build/animeclient_header_comment.txt
View File

@ -5,7 +5,7 @@
* *
* @package HummingbirdAnimeClient * @package HummingbirdAnimeClient
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @link https://github.com/timw4mail/HummingBirdAnimeClient * @link https://github.com/timw4mail/HummingBirdAnimeClient
* @license MIT * @license MIT
*/ */

2
build/ion_header_comment.txt
View File

@ -5,6 +5,6 @@
* *
* @package Ion * @package Ion
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @license MIT * @license MIT
*/ */

2
index.php
View File

@ -6,7 +6,7 @@
* *
* @package HummingbirdAnimeClient * @package HummingbirdAnimeClient
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @link https://github.com/timw4mail/HummingBirdAnimeClient * @link https://github.com/timw4mail/HummingBirdAnimeClient
* @license MIT * @license MIT
*/ */

2
public/css.php
View File

@ -6,7 +6,7 @@
* *
* @package HummingbirdAnimeClient * @package HummingbirdAnimeClient
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @link https://github.com/timw4mail/HummingBirdAnimeClient * @link https://github.com/timw4mail/HummingBirdAnimeClient
* @license MIT * @license MIT
*/ */

2
public/js.php
View File

@ -6,7 +6,7 @@
* *
* @package HummingbirdAnimeClient * @package HummingbirdAnimeClient
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @link https://github.com/timw4mail/HummingBirdAnimeClient * @link https://github.com/timw4mail/HummingBirdAnimeClient
* @license MIT * @license MIT
*/ */

2
src/Aviat/AnimeClient/AnimeClient.php
View File

@ -6,7 +6,7 @@
* *
* @package HummingbirdAnimeClient * @package HummingbirdAnimeClient
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @link https://github.com/timw4mail/HummingBirdAnimeClient * @link https://github.com/timw4mail/HummingBirdAnimeClient
* @license MIT * @license MIT
*/ */

2
src/Aviat/AnimeClient/Auth/HummingbirdAuth.php
View File

@ -6,7 +6,7 @@
* *
* @package HummingbirdAnimeClient * @package HummingbirdAnimeClient
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @link https://github.com/timw4mail/HummingBirdAnimeClient * @link https://github.com/timw4mail/HummingBirdAnimeClient
* @license MIT * @license MIT
*/ */

2
src/Aviat/AnimeClient/Config.php
View File

@ -6,7 +6,7 @@
* *
* @package HummingbirdAnimeClient * @package HummingbirdAnimeClient
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @link https://github.com/timw4mail/HummingBirdAnimeClient * @link https://github.com/timw4mail/HummingBirdAnimeClient
* @license MIT * @license MIT
*/ */

2
src/Aviat/AnimeClient/Controller.php
View File

@ -6,7 +6,7 @@
* *
* @package HummingbirdAnimeClient * @package HummingbirdAnimeClient
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @link https://github.com/timw4mail/HummingBirdAnimeClient * @link https://github.com/timw4mail/HummingBirdAnimeClient
* @license MIT * @license MIT
*/ */

6
src/Aviat/AnimeClient/Controller/Anime.php
View File

@ -6,7 +6,7 @@
* *
* @package HummingbirdAnimeClient * @package HummingbirdAnimeClient
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @link https://github.com/timw4mail/HummingBirdAnimeClient * @link https://github.com/timw4mail/HummingBirdAnimeClient
* @license MIT * @license MIT
*/ */
@ -173,7 +173,7 @@ class Anime extends BaseController {
*/ */
public function edit($id, $status = "all") public function edit($id, $status = "all")
{ {
$item = $this->model->get_library_anime($id, $status); $item = $this->model->get_library_item($id, $status);
$raw_status_list = AnimeWatchingStatus::getConstList(); $raw_status_list = AnimeWatchingStatus::getConstList();
$statuses = []; $statuses = [];
@ -224,7 +224,7 @@ class Anime extends BaseController {
$post_data = $transformer->untransform($post_data); $post_data = $transformer->untransform($post_data);
$full_result = $this->model->update($post_data); $full_result = $this->model->update($post_data);
$result = $result['body']; $result = $full_result['body'];
if (array_key_exists('anime', $result)) if (array_key_exists('anime', $result))
{ {

2
src/Aviat/AnimeClient/Controller/Collection.php
View File

@ -6,7 +6,7 @@
* *
* @package HummingbirdAnimeClient * @package HummingbirdAnimeClient
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @link https://github.com/timw4mail/HummingBirdAnimeClient * @link https://github.com/timw4mail/HummingBirdAnimeClient
* @license MIT * @license MIT
*/ */

62
src/Aviat/AnimeClient/Controller/Manga.php
View File

@ -6,7 +6,7 @@
* *
* @package HummingbirdAnimeClient * @package HummingbirdAnimeClient
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @link https://github.com/timw4mail/HummingBirdAnimeClient * @link https://github.com/timw4mail/HummingBirdAnimeClient
* @license MIT * @license MIT
*/ */
@ -16,12 +16,16 @@ use Aviat\Ion\Di\ContainerInterface;
use Aviat\AnimeClient\Controller; use Aviat\AnimeClient\Controller;
use Aviat\AnimeClient\Config; use Aviat\AnimeClient\Config;
use Aviat\AnimeClient\Model\Manga as MangaModel; use Aviat\AnimeClient\Model\Manga as MangaModel;
use Aviat\AnimeClient\Hummingbird\Enum\MangaReadingStatus;
use Aviat\AnimeClient\Hummingbird\Transformer\MangaListTransformer;
/** /**
* Controller for manga list * Controller for manga list
*/ */
class Manga extends Controller { class Manga extends Controller {
use \Aviat\Ion\StringWrapper;
/** /**
* The manga model * The manga model
* @var object $model * @var object $model
@ -87,6 +91,62 @@ class Manga extends Controller {
]); ]);
} }
/**
* Show the manga edit form
*
* @param string $id
* @param string $status
* @return void
*/
public function edit($id, $status = "All")
{
$this->set_session_redirect();
$item = $this->model->get_library_item($id, $status);
$title = $this->config->get('whose_list') . "'s Manga List &middot; Edit";
$this->outputHTML('manga/edit', [
'title' => $title,
'status_list' => MangaReadingStatus::getConstList(),
'item' => $item,
'action' => $this->container->get('url-generator')
->url('/manga/update_form'),
]);
}
/**
* Update an anime item via a form submission
*
* @return void
*/
public function form_update()
{
$post_data = $this->request->post->get();
// Do some minor data manipulation for
// large form-based updates
$transformer = new MangaListTransformer();
$post_data = $transformer->untransform($post_data);
$full_result = $this->model->update($post_data);
$result = $full_result['body'];
if (array_key_exists('manga', $result))
{
$m =& $result['manga'][0];
$title = ( ! empty($m['english_title']))
? "{$m['romaji_title']} ({$m['english_title']})"
: "{$m['romaji_title']}";
$this->set_flash_message("Successfully updated {$title}.", 'success');
}
else
{
$this->set_flash_message('Failed to update anime.', 'error');
}
$this->session_redirect();
}
/** /**
* Update an anime item * Update an anime item
* *

4
src/Aviat/AnimeClient/Dispatcher.php
View File

@ -6,7 +6,7 @@
* *
* @package HummingbirdAnimeClient * @package HummingbirdAnimeClient
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @link https://github.com/timw4mail/HummingBirdAnimeClient * @link https://github.com/timw4mail/HummingBirdAnimeClient
* @license MIT * @license MIT
*/ */
@ -104,7 +104,7 @@ class Dispatcher extends RoutingBase {
'action' => 'edit' 'action' => 'edit'
])->setTokens([ ])->setTokens([
'id' => '[0-9a-z_]+', 'id' => '[0-9a-z_]+',
'status' => '[a-z\-]+', 'status' => '[a-zA-z\- ]+',
]); ]);
$this->output_routes[] = $this->router->addGet('list', '/{controller}/{type}{/view}') $this->output_routes[] = $this->router->addGet('list', '/{controller}/{type}{/view}')

2
src/Aviat/AnimeClient/Helper/Menu.php
View File

@ -6,7 +6,7 @@
* *
* @package HummingbirdAnimeClient * @package HummingbirdAnimeClient
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @link https://github.com/timw4mail/HummingBirdAnimeClient * @link https://github.com/timw4mail/HummingBirdAnimeClient
* @license MIT * @license MIT
*/ */

2
src/Aviat/AnimeClient/Hummingbird/Enum/AnimeAiringStatus.php
View File

@ -6,7 +6,7 @@
* *
* @package HummingbirdAnimeClient * @package HummingbirdAnimeClient
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @link https://github.com/timw4mail/HummingBirdAnimeClient * @link https://github.com/timw4mail/HummingBirdAnimeClient
* @license MIT * @license MIT
*/ */

2
src/Aviat/AnimeClient/Hummingbird/Enum/AnimeShowType.php
View File

@ -6,7 +6,7 @@
* *
* @package HummingbirdAnimeClient * @package HummingbirdAnimeClient
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @link https://github.com/timw4mail/HummingBirdAnimeClient * @link https://github.com/timw4mail/HummingBirdAnimeClient
* @license MIT * @license MIT
*/ */

2
src/Aviat/AnimeClient/Hummingbird/Enum/AnimeWatchingStatus.php
View File

@ -6,7 +6,7 @@
* *
* @package HummingbirdAnimeClient * @package HummingbirdAnimeClient
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @link https://github.com/timw4mail/HummingBirdAnimeClient * @link https://github.com/timw4mail/HummingBirdAnimeClient
* @license MIT * @license MIT
*/ */

2
src/Aviat/AnimeClient/Hummingbird/Enum/MangaReadingStatus.php
View File

@ -6,7 +6,7 @@
* *
* @package HummingbirdAnimeClient * @package HummingbirdAnimeClient
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @link https://github.com/timw4mail/HummingBirdAnimeClient * @link https://github.com/timw4mail/HummingBirdAnimeClient
* @license MIT * @license MIT
*/ */

4
src/Aviat/AnimeClient/Hummingbird/Transformer/AnimeListTransformer.php
View File

@ -6,7 +6,7 @@
* *
* @package HummingbirdAnimeClient * @package HummingbirdAnimeClient
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @link https://github.com/timw4mail/HummingBirdAnimeClient * @link https://github.com/timw4mail/HummingBirdAnimeClient
* @license MIT * @license MIT
*/ */
@ -59,6 +59,7 @@ class AnimeListTransformer extends AbstractTransformer {
} }
return [ return [
'id' => $item['id'],
'episodes' => [ 'episodes' => [
'watched' => $item['episodes_watched'], 'watched' => $item['episodes_watched'],
'total' => $total_episodes, 'total' => $total_episodes,
@ -79,7 +80,6 @@ class AnimeListTransformer extends AbstractTransformer {
'image' => $anime['cover_image'], 'image' => $anime['cover_image'],
'genres' => $genres, 'genres' => $genres,
], ],
'id' => $item['id'],
'watching_status' => $item['status'], 'watching_status' => $item['status'],
'notes' => $item['notes'], 'notes' => $item['notes'],
'rewatching' => (bool) $item['rewatching'], 'rewatching' => (bool) $item['rewatching'],

44
src/Aviat/AnimeClient/Hummingbird/Transformer/MangaListTransformer.php
View File

@ -6,7 +6,7 @@
* *
* @package HummingbirdAnimeClient * @package HummingbirdAnimeClient
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @link https://github.com/timw4mail/HummingBirdAnimeClient * @link https://github.com/timw4mail/HummingBirdAnimeClient
* @license MIT * @license MIT
*/ */
@ -20,6 +20,8 @@ use Aviat\Ion\Transformer\AbstractTransformer;
*/ */
class MangaListTransformer extends AbstractTransformer { class MangaListTransformer extends AbstractTransformer {
use \Aviat\Ion\StringWrapper;
/** /**
* Remap zipped anime data to a more logical form * Remap zipped anime data to a more logical form
* *
@ -43,6 +45,7 @@ class MangaListTransformer extends AbstractTransformer {
: '-'; : '-';
$map = [ $map = [
'id' => $item['id'],
'chapters' => [ 'chapters' => [
'read' => $item['chapters_read'], 'read' => $item['chapters_read'],
'total' => $total_chapters 'total' => $total_chapters
@ -60,7 +63,6 @@ class MangaListTransformer extends AbstractTransformer {
'image' => $manga['poster_image_thumb'], 'image' => $manga['poster_image_thumb'],
'genres' => $manga['genres'], 'genres' => $manga['genres'],
], ],
'id' => $item['id'],
'reading_status' => $item['status'], 'reading_status' => $item['status'],
'notes' => $item['notes'], 'notes' => $item['notes'],
'rereading' => (bool)$item['rereading'], 'rereading' => (bool)$item['rereading'],
@ -81,5 +83,43 @@ class MangaListTransformer extends AbstractTransformer {
return $map; return $map;
} }
/**
* Untransform data to update the api
*
* @param array $item
* @return array
*/
public function untransform($item)
{
$private = (array_key_exists('private', $item))
? (bool)$item['private']
: false;
$rereading = (array_key_exists('rereading', $item))
? (bool)$item['rereading']
: false;
$map = [
'id' => $item['id'],
'manga_id' => $item['manga_id'],
'status' => $item['status'],
'chapters_read' => (int)$item['chapters_read'],
'volumes_read' => (int)$item['volumes_read'],
'rereading' => $rereading,
'reread_count' => (int)$item['reread_count'],
'private' => $private,
'notes' => $item['notes'],
];
if ($item['new_rating'] !== $item['old_rating'])
{
$map['rating'] = ($item['new_rating'] > 0)
? $item['new_rating'] / 2
: $item['old_rating'] / 2;
}
return $map;
}
} }
// End of MangaListTransformer.php // End of MangaListTransformer.php

2
src/Aviat/AnimeClient/Hummingbird/Transformer/MangaListsZipper.php
View File

@ -6,7 +6,7 @@
* *
* @package HummingbirdAnimeClient * @package HummingbirdAnimeClient
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @link https://github.com/timw4mail/HummingBirdAnimeClient * @link https://github.com/timw4mail/HummingBirdAnimeClient
* @license MIT * @license MIT
*/ */

2
src/Aviat/AnimeClient/MenuGenerator.php
View File

@ -6,7 +6,7 @@
* *
* @package HummingbirdAnimeClient * @package HummingbirdAnimeClient
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @link https://github.com/timw4mail/HummingBirdAnimeClient * @link https://github.com/timw4mail/HummingBirdAnimeClient
* @license MIT * @license MIT
*/ */

2
src/Aviat/AnimeClient/Model.php
View File

@ -6,7 +6,7 @@
* *
* @package HummingbirdAnimeClient * @package HummingbirdAnimeClient
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @link https://github.com/timw4mail/HummingBirdAnimeClient * @link https://github.com/timw4mail/HummingBirdAnimeClient
* @license MIT * @license MIT
*/ */

41
src/Aviat/AnimeClient/Model/API.php
View File

@ -6,7 +6,7 @@
* *
* @package HummingbirdAnimeClient * @package HummingbirdAnimeClient
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @link https://github.com/timw4mail/HummingBirdAnimeClient * @link https://github.com/timw4mail/HummingBirdAnimeClient
* @license MIT * @license MIT
*/ */
@ -115,6 +115,45 @@ class API extends BaseModel {
return call_user_func_array([$this->client, 'request'], $args); return call_user_func_array([$this->client, 'request'], $args);
} }
/**
* Get the data for the specified library entry
*
* @param string $id
* @param string $status
* @return array
*/
public function get_library_item($id, $status)
{
$data = $this->_get_list_from_api($status);
$index_array = array_column($data, 'id');
$key = array_search($id, $index_array);
return $key !== FALSE
? $data[$key]
: [];
}
/**
* Sort the manga entries by their title
*
* @codeCoverageIgnore
* @param array $array
* @param string $key
* @return void
*/
protected function sort_by_name(&$array, $sort_key)
{
$sort = array();
foreach ($array as $key => $item)
{
$sort[$key] = $item[$sort_key]['title'];
}
array_multisort($sort, SORT_ASC, $array);
}
/** /**
* Attempt login via the api * Attempt login via the api
* *

48
src/Aviat/AnimeClient/Model/Anime.php
View File

@ -6,7 +6,7 @@
* *
* @package HummingbirdAnimeClient * @package HummingbirdAnimeClient
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @link https://github.com/timw4mail/HummingBirdAnimeClient * @link https://github.com/timw4mail/HummingBirdAnimeClient
* @license MIT * @license MIT
*/ */
@ -55,10 +55,10 @@ class Anime extends API {
public function update($data) public function update($data)
{ {
$auth = $this->container->get('auth'); $auth = $this->container->get('auth');
/*if ( ! $auth->is_authenticated() || ! array_key_exists('id', $data)) if ( ! $auth->is_authenticated() || ! array_key_exists('id', $data))
{ {
return FALSE; return FALSE;
}*/ }
$id = $data['id']; $id = $data['id'];
$data['auth_token'] = $auth->get_auth_token(); $data['auth_token'] = $auth->get_auth_token();
@ -100,7 +100,7 @@ class Anime extends API {
// Sort anime by name // Sort anime by name
foreach ($output as &$status_list) foreach ($output as &$status_list)
{ {
$this->sort_by_name($status_list); $this->sort_by_name($status_list, 'anime');
} }
return $output; return $output;
@ -115,7 +115,7 @@ class Anime extends API {
public function get_list($status) public function get_list($status)
{ {
$data = $this->_get_list_from_api($status); $data = $this->_get_list_from_api($status);
$this->sort_by_name($data); $this->sort_by_name($data, 'anime');
$output = []; $output = [];
$output[$this->const_map[$status]] = $data; $output[$this->const_map[$status]] = $data;
@ -123,25 +123,6 @@ class Anime extends API {
return $output; return $output;
} }
/**
* Get the data for the specified library entry
*
* @param string $id
* @param string $status
* @return array
*/
public function get_library_anime($id, $status)
{
$data = $this->_get_list_from_api($status);
$index_array = array_column($data, 'id');
$key = array_search($id, $index_array);
return $key !== FALSE
? $data[$key]
: [];
}
/** /**
* Get information about an anime from its id * Get information about an anime from its id
* *
@ -255,24 +236,5 @@ class Anime extends API {
return $transformed; return $transformed;
} }
} }
/**
* Sort the list by title
*
* @codeCoverageIgnore
* @param array $array
* @return void
*/
protected function sort_by_name(&$array)
{
$sort = array();
foreach ($array as $key => $item)
{
$sort[$key] = $item['anime']['title'];
}
array_multisort($sort, SORT_ASC, $array);
}
} }
// End of AnimeModel.php // End of AnimeModel.php

2
src/Aviat/AnimeClient/Model/AnimeCollection.php
View File

@ -6,7 +6,7 @@
* *
* @package HummingbirdAnimeClient * @package HummingbirdAnimeClient
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @link https://github.com/timw4mail/HummingBirdAnimeClient * @link https://github.com/timw4mail/HummingBirdAnimeClient
* @license MIT * @license MIT
*/ */

2
src/Aviat/AnimeClient/Model/DB.php
View File

@ -6,7 +6,7 @@
* *
* @package HummingbirdAnimeClient * @package HummingbirdAnimeClient
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @link https://github.com/timw4mail/HummingBirdAnimeClient * @link https://github.com/timw4mail/HummingBirdAnimeClient
* @license MIT * @license MIT
*/ */

37
src/Aviat/AnimeClient/Model/Manga.php
View File

@ -6,10 +6,11 @@
* *
* @package HummingbirdAnimeClient * @package HummingbirdAnimeClient
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @link https://github.com/timw4mail/HummingBirdAnimeClient * @link https://github.com/timw4mail/HummingBirdAnimeClient
* @license MIT * @license MIT
*/ */
namespace Aviat\AnimeClient\Model; namespace Aviat\AnimeClient\Model;
use Aviat\AnimeClient\Model\API; use Aviat\AnimeClient\Model\API;
@ -57,7 +58,6 @@ class Manga extends API {
public function update($data) public function update($data)
{ {
$id = $data['id']; $id = $data['id'];
unset($data['id']);
$token = $this->container->get('auth') $token = $this->container->get('auth')
->get_auth_token(); ->get_auth_token();
@ -77,7 +77,10 @@ class Manga extends API {
'json' => ['manga_library_entry' => $data] 'json' => ['manga_library_entry' => $data]
]); ]);
return json_decode($result->getBody(), TRUE); return [
'statusCode' => $result->getStatusCode(),
'body' => json_decode($result->getBody(), TRUE)
];
} }
/** /**
@ -91,7 +94,7 @@ class Manga extends API {
foreach ($data as &$val) foreach ($data as &$val)
{ {
$this->sort_by_name($val); $this->sort_by_name($val, 'manga');
} }
return $data; return $data;
@ -106,7 +109,7 @@ class Manga extends API {
public function get_list($status) public function get_list($status)
{ {
$data = $this->_get_list_from_api($status); $data = $this->_get_list_from_api($status);
$this->sort_by_name($data); $this->sort_by_name($data, 'manga');
return $data; return $data;
} }
@ -117,9 +120,8 @@ class Manga extends API {
* @param string $status * @param string $status
* @return array * @return array
*/ */
private function _get_list_from_api($status = "All") protected function _get_list_from_api($status = "All")
{ {
$config = [ $config = [
'query' => [ 'query' => [
'user_id' => $this->config->get('hummingbird_username') 'user_id' => $this->config->get('hummingbird_username')
@ -141,7 +143,7 @@ class Manga extends API {
* @codeCoverageIgnore * @codeCoverageIgnore
* @return array * @return array
*/ */
protected function _check_cache($response) private function _check_cache($response)
{ {
// Bail out early if there isn't any manga data // Bail out early if there isn't any manga data
$api_data = json_decode($response->getBody(), TRUE); $api_data = json_decode($response->getBody(), TRUE);
@ -209,24 +211,5 @@ class Manga extends API {
{ {
return (new Transformer\MangaListsZipper($raw_data))->transform(); return (new Transformer\MangaListsZipper($raw_data))->transform();
} }
/**
* Sort the manga entries by their title
*
* @codeCoverageIgnore
* @param array $array
* @return void
*/
private function sort_by_name(&$array)
{
$sort = array();
foreach ($array as $key => $item)
{
$sort[$key] = $item['manga']['title'];
}
array_multisort($sort, SORT_ASC, $array);
}
} }
// End of MangaModel.php // End of MangaModel.php

2
src/Aviat/AnimeClient/RoutingBase.php
View File

@ -6,7 +6,7 @@
* *
* @package HummingbirdAnimeClient * @package HummingbirdAnimeClient
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @link https://github.com/timw4mail/HummingBirdAnimeClient * @link https://github.com/timw4mail/HummingBirdAnimeClient
* @license MIT * @license MIT
*/ */

2
src/Aviat/AnimeClient/UrlGenerator.php
View File

@ -6,7 +6,7 @@
* *
* @package HummingbirdAnimeClient * @package HummingbirdAnimeClient
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @link https://github.com/timw4mail/HummingBirdAnimeClient * @link https://github.com/timw4mail/HummingBirdAnimeClient
* @license MIT * @license MIT
*/ */

2
src/Aviat/Ion/ArrayWrapper.php
View File

@ -6,7 +6,7 @@
* *
* @package Ion * @package Ion
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @license MIT * @license MIT
*/ */

2
src/Aviat/Ion/Di/Container.php
View File

@ -6,7 +6,7 @@
* *
* @package Ion * @package Ion
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @license MIT * @license MIT
*/ */

2
src/Aviat/Ion/Di/ContainerAware.php
View File

@ -6,7 +6,7 @@
* *
* @package Ion * @package Ion
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @license MIT * @license MIT
*/ */

2
src/Aviat/Ion/Di/ContainerAwareInterface.php
View File

@ -6,7 +6,7 @@
* *
* @package Ion * @package Ion
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @license MIT * @license MIT
*/ */

2
src/Aviat/Ion/Di/ContainerInterface.php
View File

@ -6,7 +6,7 @@
* *
* @package Ion * @package Ion
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @license MIT * @license MIT
*/ */

2
src/Aviat/Ion/Di/Exception/ContainerException.php
View File

@ -6,7 +6,7 @@
* *
* @package Ion * @package Ion
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @license MIT * @license MIT
*/ */

2
src/Aviat/Ion/Di/Exception/NotFoundException.php
View File

@ -6,7 +6,7 @@
* *
* @package Ion * @package Ion
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @license MIT * @license MIT
*/ */

2
src/Aviat/Ion/Enum.php
View File

@ -6,7 +6,7 @@
* *
* @package Ion * @package Ion
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @license MIT * @license MIT
*/ */

2
src/Aviat/Ion/Friend.php
View File

@ -6,7 +6,7 @@
* *
* @package Ion * @package Ion
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @license MIT * @license MIT
*/ */

2
src/Aviat/Ion/StaticInstance.php
View File

@ -6,7 +6,7 @@
* *
* @package Ion * @package Ion
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @license MIT * @license MIT
*/ */

2
src/Aviat/Ion/StringWrapper.php
View File

@ -6,7 +6,7 @@
* *
* @package Ion * @package Ion
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @license MIT * @license MIT
*/ */

2
src/Aviat/Ion/Transformer/AbstractTransformer.php
View File

@ -6,7 +6,7 @@
* *
* @package Ion * @package Ion
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @license MIT * @license MIT
*/ */

2
src/Aviat/Ion/Transformer/TransformerInterface.php
View File

@ -6,7 +6,7 @@
* *
* @package Ion * @package Ion
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @license MIT * @license MIT
*/ */

2
src/Aviat/Ion/Type/ArrayType.php
View File

@ -6,7 +6,7 @@
* *
* @package Ion * @package Ion
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @license MIT * @license MIT
*/ */

2
src/Aviat/Ion/Type/StringType.php
View File

@ -6,7 +6,7 @@
* *
* @package Ion * @package Ion
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @license MIT * @license MIT
*/ */

2
src/Aviat/Ion/View.php
View File

@ -6,7 +6,7 @@
* *
* @package Ion * @package Ion
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @license MIT * @license MIT
*/ */

2
src/Aviat/Ion/View/HtmlView.php
View File

@ -6,7 +6,7 @@
* *
* @package Ion * @package Ion
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @license MIT * @license MIT
*/ */

2
src/Aviat/Ion/View/HttpView.php
View File

@ -6,7 +6,7 @@
* *
* @package Ion * @package Ion
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @license MIT * @license MIT
*/ */

2
src/Aviat/Ion/View/JsonView.php
View File

@ -6,7 +6,7 @@
* *
* @package Ion * @package Ion
* @author Timothy J. Warren * @author Timothy J. Warren
* @copyright Copyright (c) 2015 * @copyright Copyright (c) 2015 - 2016
* @license MIT * @license MIT
*/ */

2
tests/AnimeClient/Model/MangaModelTest.php
View File

@ -56,6 +56,7 @@ class MangaModelTest extends AnimeClient_TestCase {
public function testGetList() public function testGetList()
{ {
$this->markTestSkipped();
if (($var = getenv('CI'))) if (($var = getenv('CI')))
{ {
$this->markTestSkipped(); $this->markTestSkipped();
@ -68,6 +69,7 @@ class MangaModelTest extends AnimeClient_TestCase {
public function testGetAllLists() public function testGetAllLists()
{ {
$this->markTestSkipped();
if (($var = getenv('CI'))) if (($var = getenv('CI')))
{ {
$this->markTestSkipped(); $this->markTestSkipped();