Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PSVAMB-6815 #8859

Merged
merged 1 commit into from Nov 4, 2019
Merged

PSVAMB-6815 #8859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...s/bulk_upload/drop_folder_xml/plugins/providers/ap_feed/batch/KApFeedDropFolderEngine.php
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@ class KApFeedDropFolderEngine extends KFeedDropFolderEngine
public function watchFolder(KalturaDropFolder $dropFolder)
{
/* @var $dropFolder KalturaApFeedDropFolder */
KalturaLog::info("Watching drop folder with ID [" . $dropFolder->id . "]");
KalturaLog::info('Watching drop folder with ID [' . $dropFolder->id . ']');
$this->dropFolder = $dropFolder;
$this->apiKey = $dropFolder->apApiKey;

Expand All @@ -26,8 +26,8 @@ public function watchFolder(KalturaDropFolder $dropFolder)
$counter = 0;
$break = false;

do{
do
{
//Get Drop Folder feed and import it into an array
$feedContent = $this->fetchFeedContent($feedUrl);
$feed = json_decode($feedContent, true);
Expand Down
4 changes: 4 additions & 0 deletions ...bulk_upload/drop_folder_xml/plugins/providers/ap_feed/lib/api/KalturaApFeedDropFolder.php
View file
Open in desktop
Expand Up @@ -25,10 +25,14 @@ public function getMapBetweenObjects()
public function toObject($dbObject = null, $skip = array())
{
if (!$dbObject)
{
$dbObject = new ApFeedDropFolder();
}

if ($this->feedItemInfo)
{
$dbObject->setFeedItemInfo($this->feedItemInfo->toObject());
}

return parent::toObject($dbObject, $skip);
}
Expand Down
6 changes: 4 additions & 2 deletions plugins/bulk_upload/drop_folder_xml/plugins/providers/ap_feed/lib/model/ApFeedDropFolder.php
View file
Open in desktop
Expand Up @@ -8,14 +8,16 @@ class ApFeedDropFolder extends FeedDropFolder
/**
* @return the $apApiKey
*/
public function getApApiKey() {
public function getApApiKey()
{
return $this->getFromCustomData('apApiKey');
}

/**
* @param int $itemHandlingLimit
*/
public function setApApiKey($apApiKey) {
public function setApApiKey($apApiKey)
{
$this->putInCustomData('apApiKey', $apApiKey);
}
}