cornernote/minetest-bower
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

read more files from repo, closes #20

Browse Source
This commit is contained in:
cornernote 2015-08-12 00:05:41 +09:30
parent 12ff251c41
commit 34b33cb927
4 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/commands/PackageController.php
View File

@ -89,8 +89,6 @@ class PackageController extends Controller
if (!$package) {
$package = new Package();
$package->name = $name;
} else {
$package->checkUrl = false;
}
if (!$package->url)
$package->url = $url;

1
src/components/Git.php
View File

@ -34,6 +34,7 @@ class Git
'https://' => $file ? 'https://raw.' : 'https://',
'http://' => $file ? 'https://raw.' : 'https://',
'git://' => $file ? 'https://raw.' : 'https://',
'github.com' => $file ? 'githubusercontent.com' : 'github.com',
'.git' => $file ? '/master/' . $file : '',
]);
}

7
src/controllers/ModController.php
View File

@ -85,8 +85,11 @@ class ModController extends Controller
$model = $this->findModel($name);
$model->harvestModInfo();
if ($model->getDirtyAttributes()) {
$model->save();
Yii::$app->getSession()->setFlash('success', Yii::t('app', 'Mod has been updated from remote repository.'));
if ($model->save()) {
Yii::$app->getSession()->setFlash('success', Yii::t('app', 'Mod has been updated from remote repository.'));
} else {
Yii::$app->getSession()->setFlash('error', Yii::t('app', 'Error while saving mod updates.'));
}
} else {
Yii::$app->getSession()->setFlash('info', Yii::t('app', 'Mod has been updated from remote repository, however no change was detected.'));
}

31
src/models/Package.php
View File

@ -46,11 +46,6 @@ class Package extends ActiveRecord
*/
public $serialized = false;
/**
* @var bool
*/
public $checkUrl = true;
/**
* @inheritdoc
*/
@ -73,7 +68,7 @@ class Package extends ActiveRecord
[['name'], 'match', 'pattern' => '/^[-a-z0-9_]+$/', 'message' => '{attribute} can only contain lowercase letters, numbers, "_" and "-"'],
[['url'], 'match', 'pattern' => '%(git|http(s)?)(:(//)?)([\w./\-~]+)(\.git)%', 'message' => '{attribute} must be a valid git endpoint.'],
[['url'], function ($attribute) {
if ($this->checkUrl && Git::getFile($this->$attribute) === false) {
if ($this->isNewRecord && Git::getFile($this->$attribute) === false) {
$this->addError($attribute, 'Could not fetch remote repository.');
}
}],
@ -232,7 +227,7 @@ class Package extends ActiveRecord
if ($this->bower) {
// set fields from bower
if (isset($this->bower['description'])) {
$this->description = substr($this->bower['description'], 0, 140);
$this->description = $this->bower['description'];
}
if (isset($this->bower['homepage'])) {
$this->homepage = $this->bower['homepage'];
@ -268,7 +263,7 @@ class Package extends ActiveRecord
}
if ($repo) {
if (isset($repo['description'])) {
$this->description = substr($repo['description'], 0, 140);
$this->description = $repo['description'];
}
if (isset($repo['homepage'])) {
$this->homepage = $repo['homepage'];
@ -282,7 +277,25 @@ class Package extends ActiveRecord
}
}
// update authors
// fetch screenshot
if (!$this->screenshots) {
$file = Git::getUrl($this->url, 'screenshot.png');
if (strpos(@get_headers($file)[0], '200')) {
$this->screenshots = [$file];
}
}
// fetch description
if (!$this->description) {
$this->description = Git::getFile($this->url, 'description.txt');
}
// trim description
if (strlen($this->description) > 140) {
$this->description = substr($this->description, 0, 137) . '...';
}
// fetch authors
if (!$this->authors && !strpos($this->url, 'repo.or.cz')) {
$url = parse_url(Git::getUrl($this->url));
$path = explode('/', trim($url['path'], '/'));