mirror of
https://github.com/wallabag/wallabag.git
synced 2025-07-12 16:58:37 +00:00
french translation & pocket
This commit is contained in:
parent
fe8b37c137
commit
c10fcb3bbb
5 changed files with 54 additions and 3 deletions
|
@ -5,6 +5,10 @@ namespace Wallabag\ImportBundle\Controller;
|
|||
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
|
||||
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
|
||||
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
|
||||
use Wallabag\ImportBundle\Import\PocketImport;
|
||||
use Symfony\Component\HttpFoundation\Request;
|
||||
use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
|
||||
|
||||
|
||||
class PocketController extends Controller
|
||||
{
|
||||
|
@ -13,21 +17,33 @@ class PocketController extends Controller
|
|||
*/
|
||||
public function indexAction()
|
||||
{
|
||||
$pocket = $this->get('wallabag_import.pocket.import');
|
||||
$form = $this->createFormBuilder($pocket)
|
||||
->add('read', CheckboxType::class, array(
|
||||
'label' => 'Mark all as read',
|
||||
'required' => false,
|
||||
))
|
||||
->getForm();
|
||||
;
|
||||
|
||||
return $this->render('WallabagImportBundle:Pocket:index.html.twig', [
|
||||
'import' => $this->get('wallabag_import.pocket.import'),
|
||||
'has_consumer_key' => '' == trim($this->get('craue_config')->get('pocket_consumer_key')) ? false : true,
|
||||
'form' => $form->createView(),
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Route("/pocket/auth", name="import_pocket_auth")
|
||||
*/
|
||||
public function authAction()
|
||||
public function authAction(Request $request)
|
||||
{
|
||||
$requestToken = $this->get('wallabag_import.pocket.import')
|
||||
->getRequestToken($this->generateUrl('import', array(), UrlGeneratorInterface::ABSOLUTE_URL));
|
||||
|
||||
$this->get('session')->set('import.pocket.code', $requestToken);
|
||||
$markAsRead = $request->request->get('form')['read'];
|
||||
$this->get('session')->set('read', $markAsRead);
|
||||
|
||||
return $this->redirect(
|
||||
'https://getpocket.com/auth/authorize?request_token='.$requestToken.'&redirect_uri='.$this->generateUrl('import_pocket_callback', array(), UrlGeneratorInterface::ABSOLUTE_URL),
|
||||
|
@ -42,6 +58,7 @@ class PocketController extends Controller
|
|||
{
|
||||
$message = 'Import failed, please try again.';
|
||||
$pocket = $this->get('wallabag_import.pocket.import');
|
||||
$markAsRead = $this->get('session')->get('read');
|
||||
|
||||
// something bad happend on pocket side
|
||||
if (false === $pocket->authorize($this->get('session')->get('import.pocket.code'))) {
|
||||
|
@ -53,11 +70,13 @@ class PocketController extends Controller
|
|||
return $this->redirect($this->generateUrl('import_pocket'));
|
||||
}
|
||||
|
||||
if (true === $pocket->import()) {
|
||||
if (true === $pocket->setMarkAsRead($markAsRead)->import()) {
|
||||
$summary = $pocket->getSummary();
|
||||
$message = 'Import summary: '.$summary['imported'].' imported, '.$summary['skipped'].' already saved.';
|
||||
}
|
||||
|
||||
$this->get('session')->remove('read');
|
||||
|
||||
$this->get('session')->getFlashBag()->add(
|
||||
'notice',
|
||||
$message
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue