Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
S
simple_sitemap
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Custom Issue Tracker
Custom Issue Tracker
Labels
Merge Requests
3
Merge Requests
3
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Analytics
Analytics
Code Review
Insights
Issue
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
project
simple_sitemap
Commits
a58154a3
Commit
a58154a3
authored
Sep 18, 2018
by
Pawel G
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix plugin interfaces
parent
9b81940e
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
33 additions
and
24 deletions
+33
-24
simple_sitemap.services.yml
simple_sitemap.services.yml
+3
-3
src/Plugin/simple_sitemap/SitemapGenerator/SitemapGeneratorInterface.php
...le_sitemap/SitemapGenerator/SitemapGeneratorInterface.php
+10
-3
src/Plugin/simple_sitemap/UrlGenerator/UrlGeneratorInterface.php
...gin/simple_sitemap/UrlGenerator/UrlGeneratorInterface.php
+6
-2
src/Queue/QueueWorker.php
src/Queue/QueueWorker.php
+12
-12
src/Queue/SimplesitemapQueue.php
src/Queue/SimplesitemapQueue.php
+2
-4
No files found.
simple_sitemap.services.yml
View file @
a58154a3
...
@@ -39,11 +39,11 @@ services:
...
@@ -39,11 +39,11 @@ services:
-
'
@simple_sitemap.manager'
-
'
@simple_sitemap.manager'
-
'
@state'
-
'
@state'
-
'
@module_handler'
-
'
@module_handler'
-
'
@simple_sitemap.
element_
queue'
-
'
@simple_sitemap.queue'
-
'
@lock'
-
'
@lock'
simple_sitemap.
element_
queue
:
simple_sitemap.queue
:
class
:
Drupal\simple_sitemap\Queue\
Element
Queue
class
:
Drupal\simple_sitemap\Queue\
Simplesitemap
Queue
public
:
false
public
:
false
arguments
:
arguments
:
-
'
simple_sitemap_elements'
-
'
simple_sitemap_elements'
...
...
src/Plugin/simple_sitemap/SitemapGenerator/SitemapGeneratorInterface.php
View file @
a58154a3
...
@@ -8,10 +8,17 @@ namespace Drupal\simple_sitemap\Plugin\simple_sitemap\SitemapGenerator;
...
@@ -8,10 +8,17 @@ namespace Drupal\simple_sitemap\Plugin\simple_sitemap\SitemapGenerator;
*/
*/
interface
SitemapGeneratorInterface
{
interface
SitemapGeneratorInterface
{
public
function
generate
(
array
$links
);
function
setSitemapVariant
(
$sitemap_variant
);
public
function
generateIndex
(
);
function
setSettings
(
array
$settings
);
public
function
remove
(
);
function
generate
(
array
$links
);
function
generateIndex
();
function
publish
();
function
remove
();
function
invalidateCache
();
}
}
src/Plugin/simple_sitemap/UrlGenerator/UrlGeneratorInterface.php
View file @
a58154a3
...
@@ -8,7 +8,11 @@ namespace Drupal\simple_sitemap\Plugin\simple_sitemap\UrlGenerator;
...
@@ -8,7 +8,11 @@ namespace Drupal\simple_sitemap\Plugin\simple_sitemap\UrlGenerator;
*/
*/
interface
UrlGeneratorInterface
{
interface
UrlGeneratorInterface
{
public
function
generate
(
$data_set
s
);
function
setSettings
(
array
$setting
s
);
public
function
getDataSets
();
function
setSitemapVariant
(
$sitemap_variant
);
function
getDataSets
();
function
generate
(
$data_set
);
}
}
src/Queue/QueueWorker.php
View file @
a58154a3
...
@@ -42,9 +42,9 @@ class QueueWorker {
...
@@ -42,9 +42,9 @@ class QueueWorker {
protected
$lock
;
protected
$lock
;
/**
/**
* @var
array|\Drupal\simple_sitemap\Queue\Element
Queue
* @var
\Drupal\simple_sitemap\Queue\Simplesitemap
Queue
*/
*/
protected
$
elementQueue
=
[]
;
protected
$
queue
;
/**
/**
* @var string|null
* @var string|null
...
@@ -87,20 +87,20 @@ class QueueWorker {
...
@@ -87,20 +87,20 @@ class QueueWorker {
* @param \Drupal\simple_sitemap\SimplesitemapManager $manager
* @param \Drupal\simple_sitemap\SimplesitemapManager $manager
* @param \Drupal\Core\State\State $state
* @param \Drupal\Core\State\State $state
* @param \Drupal\Core\Extension\ModuleHandler $module_handler
* @param \Drupal\Core\Extension\ModuleHandler $module_handler
* @param \Drupal\simple_sitemap\Queue\
Element
Queue $element_queue
* @param \Drupal\simple_sitemap\Queue\
Simplesitemap
Queue $element_queue
* @param \Drupal\Core\Lock\LockBackendInterface $lock
* @param \Drupal\Core\Lock\LockBackendInterface $lock
*/
*/
public
function
__construct
(
SimplesitemapSettings
$settings
,
public
function
__construct
(
SimplesitemapSettings
$settings
,
SimplesitemapManager
$manager
,
SimplesitemapManager
$manager
,
State
$state
,
State
$state
,
ModuleHandler
$module_handler
,
ModuleHandler
$module_handler
,
Element
Queue
$element_queue
,
Simplesitemap
Queue
$element_queue
,
LockBackendInterface
$lock
)
{
LockBackendInterface
$lock
)
{
$this
->
settings
=
$settings
;
$this
->
settings
=
$settings
;
$this
->
manager
=
$manager
;
$this
->
manager
=
$manager
;
$this
->
state
=
$state
;
$this
->
state
=
$state
;
$this
->
moduleHandler
=
$module_handler
;
$this
->
moduleHandler
=
$module_handler
;
$this
->
elementQ
ueue
=
$element_queue
;
$this
->
q
ueue
=
$element_queue
;
$this
->
lock
=
$lock
;
$this
->
lock
=
$lock
;
}
}
...
@@ -110,7 +110,7 @@ class QueueWorker {
...
@@ -110,7 +110,7 @@ class QueueWorker {
* @todo Should remove all unpublished variants from db.
* @todo Should remove all unpublished variants from db.
*/
*/
public
function
deleteQueue
()
{
public
function
deleteQueue
()
{
$this
->
elementQ
ueue
->
deleteQueue
();
$this
->
q
ueue
->
deleteQueue
();
$this
->
variantProcessedNow
=
NULL
;
$this
->
variantProcessedNow
=
NULL
;
$this
->
generatorProcessedNow
=
NULL
;
$this
->
generatorProcessedNow
=
NULL
;
$this
->
results
=
[];
$this
->
results
=
[];
...
@@ -122,8 +122,8 @@ class QueueWorker {
...
@@ -122,8 +122,8 @@ class QueueWorker {
return
$this
;
return
$this
;
}
}
public
function
get
Element
Queue
()
{
public
function
getQueue
()
{
return
$this
->
elementQ
ueue
;
return
$this
->
q
ueue
;
}
}
/**
/**
...
@@ -184,7 +184,7 @@ class QueueWorker {
...
@@ -184,7 +184,7 @@ class QueueWorker {
}
}
protected
function
queueElements
(
$elements
)
{
protected
function
queueElements
(
$elements
)
{
$this
->
elementQ
ueue
->
createItems
(
$elements
);
$this
->
q
ueue
->
createItems
(
$elements
);
$this
->
state
->
set
(
'simple_sitemap.queue_items_initial_amount'
,
(
$this
->
state
->
get
(
'simple_sitemap.queue_items_initial_amount'
)
+
count
(
$elements
)));
$this
->
state
->
set
(
'simple_sitemap.queue_items_initial_amount'
,
(
$this
->
state
->
get
(
'simple_sitemap.queue_items_initial_amount'
)
+
count
(
$elements
)));
}
}
...
@@ -216,7 +216,7 @@ class QueueWorker {
...
@@ -216,7 +216,7 @@ class QueueWorker {
$this
->
rebuildQueue
(
$variants
);
$this
->
rebuildQueue
(
$variants
);
}
}
while
(
$element
=
$this
->
elementQ
ueue
->
claimItem
())
{
while
(
$element
=
$this
->
q
ueue
->
claimItem
())
{
if
(
!
empty
(
$max_execution_time
)
&&
Timer
::
read
(
'simple_sitemap_generator'
)
>=
$max_execution_time
)
{
if
(
!
empty
(
$max_execution_time
)
&&
Timer
::
read
(
'simple_sitemap_generator'
)
>=
$max_execution_time
)
{
break
;
break
;
...
@@ -244,7 +244,7 @@ class QueueWorker {
...
@@ -244,7 +244,7 @@ class QueueWorker {
watchdog_exception
(
'simple_sitemap'
,
$e
);
watchdog_exception
(
'simple_sitemap'
,
$e
);
}
}
$this
->
elementQ
ueue
->
deleteItem
(
$element
);
//todo May want to use deleteItems() instead.
$this
->
q
ueue
->
deleteItem
(
$element
);
//todo May want to use deleteItems() instead.
$elements_processed
++
;
$elements_processed
++
;
$this
->
elementsRemaining
--
;
$this
->
elementsRemaining
--
;
}
}
...
@@ -333,7 +333,7 @@ class QueueWorker {
...
@@ -333,7 +333,7 @@ class QueueWorker {
public
function
getRemainingElementCount
(
$force_recount
=
FALSE
)
{
public
function
getRemainingElementCount
(
$force_recount
=
FALSE
)
{
if
(
$force_recount
||
NULL
===
$this
->
elementsRemaining
)
{
if
(
$force_recount
||
NULL
===
$this
->
elementsRemaining
)
{
$this
->
elementsRemaining
=
$this
->
elementQ
ueue
->
numberOfItems
();
$this
->
elementsRemaining
=
$this
->
q
ueue
->
numberOfItems
();
}
}
return
$this
->
elementsRemaining
;
return
$this
->
elementsRemaining
;
...
...
src/Queue/
Element
Queue.php
→
src/Queue/
Simplesitemap
Queue.php
View file @
a58154a3
...
@@ -5,12 +5,10 @@ namespace Drupal\simple_sitemap\Queue;
...
@@ -5,12 +5,10 @@ namespace Drupal\simple_sitemap\Queue;
use
Drupal\Core\Queue\DatabaseQueue
;
use
Drupal\Core\Queue\DatabaseQueue
;
/**
/**
* Class
Element
Queue
* Class
Simplesitemap
Queue
* @package Drupal\simple_sitemap\Queue
* @package Drupal\simple_sitemap\Queue
*
* @todo Need to override claimItem() to what Batch queue uses.
*/
*/
class
Element
Queue
extends
DatabaseQueue
{
class
Simplesitemap
Queue
extends
DatabaseQueue
{
/**
/**
* Overrides \Drupal\Core\Queue\DatabaseQueue::claimItem().
* Overrides \Drupal\Core\Queue\DatabaseQueue::claimItem().
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment