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

support for more repos

Browse Source
This commit is contained in:
cornernote 2015-08-09 18:24:37 +09:30
parent a8b60e0112
commit c26b7cd6e5
2 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/components/Git.php
View File

@ -30,10 +30,19 @@ class Git
public static function getUrl($endpoint, $file = null)
{
if (strpos($endpoint, 'github.com')) {
return self::getGitHubUrl($endpoint, $file);
return self::getGitHubComUrl($endpoint, $file);
}
if (strpos($endpoint, 'bitbucket.org')) {
return self::getBitBucketUrl($endpoint, $file);
return self::getBitBucketOrgUrl($endpoint, $file);
}
if (strpos($endpoint, 'notabug.org')) {
return self::getBitBucketOrgUrl($endpoint, $file);
}
if (strpos($endpoint, 'gitlab.com')) {
return self::getBitBucketOrgUrl($endpoint, $file);
}
if (strpos($endpoint, 'repo.or.cz')) {
return self::getRepoOrCzUrl($endpoint, $file);
}
return false;
}
@ -43,7 +52,7 @@ class Git
* @param $file
* @return string
*/
private static function getGitHubUrl($endpoint, $file)
private static function getGitHubComUrl($endpoint, $file)
{
return strtr($endpoint, [
'https://' => $file ? 'https://raw.' : 'https://',
@ -58,7 +67,7 @@ class Git
* @param $file
* @return string
*/
private static function getBitBucketUrl($endpoint, $file)
private static function getBitBucketOrgUrl($endpoint, $file)
{
return strtr($endpoint, [
'http://' => 'https://',
@ -66,4 +75,20 @@ class Git
'.git' => $file ? '/raw/master/' . $file : '/',
]);
}
/**
* @param $endpoint
* @param $file
* @return string
*/
private static function getRepoOrCzUrl($endpoint, $file)
{
return strtr($endpoint, [
'https://' => 'http://',
'http://' => 'http://',
'git://' => 'http://',
'.git' => $file ? '.git/blob_plain/master:/' . $file : '.git',
]);
}
}

2
src/models/Package.php
View File

@ -46,7 +46,7 @@ class Package extends ActiveRecord
[['name', 'url'], 'unique'],
[['name', 'url'], 'trim'],
[['name'], 'match', 'pattern' => '/^[-a-z0-9_]+$/', 'message' => '{attribute} can only contain lowercase letters, numbers, "_" and "-"'],
[['url'], 'match', 'pattern' => '%^(git|http(s)?)://(github\.com|bitbucket\.org)/[\w-]+/[\w-]+\.git$%', 'message' => '{attribute} must be a valid git endpoint on github or bitbucket.'],
[['url'], 'match', 'pattern' => '%(git|http(s)?)(:(//)?)([\w./\-~]+)(\.git)%', 'message' => '{attribute} must be a valid git endpoint on github or bitbucket.'],
[['url'], function ($attribute, $params) {
if (Git::getFile($this->$attribute, '') === false) {
$this->addError($attribute, 'Could not fetch remote repository.');