mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-05 15:00:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into logging

Browse source 
Conflicts:
	fdroidserver/common.py
This commit is contained in:
Daniel Martí 2014-01-30 23:58:23 +01:00
commit 430cd42f80
3 changed files with 142 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

3
buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
View file

@ -5,8 +5,7 @@ execute "apt-get-update" do
command "apt-get update" command "apt-get update"
end end
%w{ant ant-contrib autoconf autopoint bison cmake expect libtool libsaxonb-java libssl1.0.0 libssl-dev maven openjdk-7-jdk javacc python python-magic git-core mercurial subversion bzr git-svn make perlmagick pkg-config zip ruby rubygems librmagick-ruby yasm imagemagick gettext realpath transfig texinfo curl %w{ant ant-contrib autoconf autopoint bison cmake expect libtool libsaxonb-java libssl1.0.0 libssl-dev maven openjdk-7-jdk javacc python python-magic git-core mercurial subversion bzr git-svn make perlmagick pkg-config zip ruby rubygems librmagick-ruby yasm imagemagick gettext realpath transfig texinfo curl librsvg2-bin xsltproc vorbis-tools}.each do |pkg|
librsvg2-bin xsltproc}.each do |pkg|
package pkg do package pkg do
action :install action :install
end end

10
fdroidserver/common.py
View file

@ -1212,12 +1212,16 @@ def scan_source(build_dir, root_dir, thisbuild):
def warnproblem(what, fd, fp): def warnproblem(what, fd, fp):
logging.info('Warning: Found %s at %s' % (what, fd)) logging.info('Warning: Found %s at %s' % (what, fd))
def insidedir(path, dirname):
return path.endswith('/%s' % dirname) or '/%s/' % dirname in path
# Iterate through all files in the source code # Iterate through all files in the source code
for r,d,f in os.walk(build_dir): for r,d,f in os.walk(build_dir):
for curfile in f:
if '/.hg' in r or '/.git' in r or '/.svn' in r: if any(insidedir(r, igndir) for igndir in ('.hg', '.git', '.svn')):
continue continue
for curfile in f:
# Path (relative) to the file # Path (relative) to the file
fp = os.path.join(r, curfile) fp = os.path.join(r, curfile)

254
wp-fdroid/wp-fdroid.php
View file

@ -10,7 +10,7 @@ Author URI: http://ciarang.com
Revision history Revision history
0.01 - 2010-12-04: Initial development version 0.01 - 2010-12-04: Initial development version
*/ */
include('android-permissions.php'); include('android-permissions.php');
@ -79,30 +79,44 @@ class FDroid
} }
} }
// Santiy check query vars // Sanity check and standardise all query variables...
if(!isset($query_vars['fdpage']) || !is_numeric($query_vars['fdpage']) || $query_vars['fdpage'] <= 0) { if(!isset($query_vars['fdpage']) || !is_numeric($query_vars['fdpage']) || $query_vars['fdpage'] <= 0) {
$query_vars['fdpage'] = 1; $query_vars['fdpage'] = 1;
} else {
$query_vars['fdpage'] = strval(intval($query_vars['fdpage']));
}
if(isset($query_vars['fdstyle']) && ($query_vars['fdstyle'] != 'list' && $query_vars['fdstyle'] != 'grid')) {
$query_vars['fdstyle'] = 'list';
}
if(isset($query_vars['fdcategory'])) {
if($query_vars['fdcategory'] == 'All categories') {
unset($query_vars['fdcategory']);
} else {
$query_vars['fdcategory'] = sanitize_text_field($query_vars['fdcategory']);
}
}
if(isset($query_vars['fdfilter'])) {
$query_vars['fdfilter'] = sanitize_text_field($query_vars['fdfilter']);
} else {
if(isset($attribs['search'])) {
$query_vars['fdfilter'] = '';
}
}
if(isset($query_vars['fdid'])) {
$query_vars['fdid'] = sanitize_text_field($query_vars['fdid']);
} }
$out = ''; $out = '';
if(isset($attribs['search']) && $query_vars['fdfilter']===null) {
$query_vars['fdfilter'] = '';
}
if($query_vars['fdcategory'] == 'All categories') {
unset($query_vars['fdcategory']);
}
if($query_vars['fdid']!==null) { if($query_vars['fdid']!==null) {
$out.=$this->get_app($query_vars); $out.=$this->get_app($query_vars);
} else { } else {
$out.='<form name="searchform" action="" method="get">'; $out.='<form name="searchform" action="" method="get">';
$out.='<p><input name="fdfilter" type="text" value="'.sanitize_text_field($query_vars['fdfilter']).'" size="30"> '; $out.='<p><input name="fdfilter" type="text" value="'.$query_vars['fdfilter'].'" size="30"> ';
$out.='<input type="hidden" name="fdpage" value="1">'; $out.='<input type="hidden" name="fdpage" value="1">';
$out.='<input type="submit" value="Search"></p>'; $out.='<input type="submit" value="Search"></p>';
$out.=$this->makeformdata($query_vars); $out.=$this->makeformdata($query_vars);
$out.='</form>'."\n"; $out.='</form>'."\n";
$out.=$this->get_apps($query_vars); $out.=$this->get_apps($query_vars);
} }
@ -116,26 +130,26 @@ class FDroid
// needs to be data-driven so the same information can be used by the client, // needs to be data-driven so the same information can be used by the client,
// the web site and the documentation. // the web site and the documentation.
function getlicenseurl($license) { function getlicenseurl($license) {
switch($license) { switch($license) {
case 'MIT': case 'MIT':
return 'http://www.gnu.org/licenses/license-list.html#X11License'; return 'http://www.gnu.org/licenses/license-list.html#X11License';
case 'NewBSD': case 'NewBSD':
return 'http://www.gnu.org/licenses/license-list.html#ModifiedBSD'; return 'http://www.gnu.org/licenses/license-list.html#ModifiedBSD';
case 'BSD': case 'BSD':
return 'http://www.gnu.org/licenses/license-list.html#OriginalBSD'; return 'http://www.gnu.org/licenses/license-list.html#OriginalBSD';
case 'GPLv3': case 'GPLv3':
case 'GPLv3+': case 'GPLv3+':
return 'http://www.gnu.org/licenses/license-list.html#GNUGPL'; return 'http://www.gnu.org/licenses/license-list.html#GNUGPL';
case 'GPLv2': case 'GPLv2':
case 'GPLv2+': case 'GPLv2+':
return 'http://www.gnu.org/licenses/license-list.html#GPLv2'; return 'http://www.gnu.org/licenses/license-list.html#GPLv2';
case 'LGPL': case 'LGPL':
return 'http://www.gnu.org/licenses/license-list.html#LGPL'; return 'http://www.gnu.org/licenses/license-list.html#LGPL';
case 'Apache2': case 'Apache2':
return 'http://www.gnu.org/licenses/license-list.html#apache2'; return 'http://www.gnu.org/licenses/license-list.html#apache2';
default: default:
return null; return null;
} }
} }
function get_app($query_vars) { function get_app($query_vars) {
@ -154,73 +168,73 @@ class FDroid
$apks=array();; $apks=array();;
foreach($app->children() as $el) { foreach($app->children() as $el) {
switch($el->getName()) { switch($el->getName()) {
case "name": case "name":
$name=$el; $name=$el;
break; break;
case "added": case "icon":
$added=$el; $icon=$el;
break; break;
case "icon": case "summary":
$icon=$el; $summary=$el;
break; break;
case "summary": case "desc":
$summary=$el; $desc=$el;
break; break;
case "desc": case "license":
$desc=$el; $license=$el;
break; break;
case "license": case "source":
$license=$el; $source=$el;
break; break;
case "source": case "tracker":
$source=$el; $issues=$el;
break; break;
case "tracker": case "donate":
$issues=$el; $donate=$el;
break; break;
case "donate": case "web":
$donate=$el; $web=$el;
break; break;
case "web": case "antifeatures":
$web=$el; $antifeatures=$el;
break; break;
case "antifeatures"; case "requirements":
$antifeatures=$el; $requirements=$el;
break; break;
case "requirements"; case "package":
$requirements=$el; $thisapk=array();
break; foreach($el->children() as $pel) {
case "package": switch($pel->getName()) {
$thisapk=array(); case "version":
foreach($el->children() as $pel) { $thisapk['version']=$pel;
switch($pel->getName()) { break;
case "version": case "vercode":
$thisapk['version']=$pel; $thisapk['vercode']=$pel;
break; break;
case "vercode": case "added":
$thisapk['vercode']=$pel; $thisapk['added']=$el;
break; break;
case "apkname": case "apkname":
$thisapk['apkname']=$pel; $thisapk['apkname']=$pel;
break; break;
case "srcname": case "srcname":
$thisapk['srcname']=$pel; $thisapk['srcname']=$pel;
break; break;
case "hash": case "hash":
$thisapk['hash']=$pel; $thisapk['hash']=$pel;
break; break;
case "size": case "size":
$thisapk['size']=$pel; $thisapk['size']=$pel;
break; break;
case "sdkver": case "sdkver":
$thisapk['sdkver']=$pel; $thisapk['sdkver']=$pel;
break; break;
case "permissions": case "permissions":
$thisapk['permissions']=$pel; $thisapk['permissions']=$pel;
break; break;
}
} }
$apks[]=$thisapk; }
$apks[]=$thisapk;
} }
} }
@ -263,10 +277,10 @@ class FDroid
$licenseurl=$this->getlicenseurl($license); $licenseurl=$this->getlicenseurl($license);
$out.="<b>License:</b> "; $out.="<b>License:</b> ";
if($licenseurl) if($licenseurl)
$out.='<a href="'.$licenseurl.'" target="_blank">'; $out.='<a href="'.$licenseurl.'" target="_blank">';
$out.=$license; $out.=$license;
if($licenseurl) if($licenseurl)
$out.='</a>'; $out.='</a>';
if(isset($requirements)) { if(isset($requirements)) {
$out.='<br /><b>Additional requirements:</b> '.$requirements; $out.='<br /><b>Additional requirements:</b> '.$requirements;
@ -317,9 +331,9 @@ class FDroid
$out.="<p>This version is built and signed by "; $out.="<p>This version is built and signed by ";
if($srcbuild) { if($srcbuild) {
$out.="F-Droid, and guaranteed to correspond to the source tarball below.</p>"; $out.="F-Droid, and guaranteed to correspond to the source tarball below.</p>";
} else { } else {
$out.="the original developer.</p>"; $out.="the original developer.</p>";
} }
$out.='<a href="https://f-droid.org/repo/'.$apk['apkname'].'">download apk</a> '; $out.='<a href="https://f-droid.org/repo/'.$apk['apkname'].'">download apk</a> ';
$out.=$this->human_readable_size($apk['size']); $out.=$this->human_readable_size($apk['size']);
@ -362,7 +376,7 @@ class FDroid
/*if($i==0) /*if($i==0)
$divStyleDisplay='block'; $divStyleDisplay='block';
else*/ else*/
$divStyleDisplay='none'; $divStyleDisplay='none';
$divId='permissions'.$i; $divId='permissions'.$i;
$out.='<br /><a href="javascript:void(0);" onClick="showHidePermissions(\''.$divId.'\');">view permissions</a>'; $out.='<br /><a href="javascript:void(0);" onClick="showHidePermissions(\''.$divId.'\');">view permissions</a>';
$out.=' <span style="color:#AAAAAA;">['.$summary.']</span>'; $out.=' <span style="color:#AAAAAA;">['.$summary.']</span>';
@ -531,9 +545,9 @@ class FDroid
$handle = fopen(getenv('DOCUMENT_ROOT').'/repo/categories.txt', 'r'); $handle = fopen(getenv('DOCUMENT_ROOT').'/repo/categories.txt', 'r');
if ($handle) { if ($handle) {
while (($buffer = fgets($handle, 4096)) !== false) { while (($buffer = fgets($handle, 4096)) !== false) {
$categories[] = rtrim($buffer); $categories[] = rtrim($buffer);
} }
fclose($handle); fclose($handle);
} }
$out.='<form name="categoryform" action="" method="get">'; $out.='<form name="categoryform" action="" method="get">';
@ -551,7 +565,7 @@ class FDroid
$out.='</form>'."\n"; $out.='</form>'."\n";
} }
else { else {
$out.='Applications matching "'.sanitize_text_field($query_vars['fdfilter']).'"'; $out.='Applications matching "'.$query_vars['fdfilter'].'"';
} }
$out.="</div>"; $out.="</div>";
@ -640,24 +654,24 @@ class FDroid
$appinfo['id']=$appinfo['attrs']['id']; $appinfo['id']=$appinfo['attrs']['id'];
foreach($app->children() as $el) { foreach($app->children() as $el) {
switch($el->getName()) { switch($el->getName()) {
case "name": case "name":
$appinfo['name']=$el; $appinfo['name']=$el;
break; break;
case "icon": case "icon":
$appinfo['icon']=$el; $appinfo['icon']=$el;
break; break;
case "summary": case "summary":
$appinfo['summary']=$el; $appinfo['summary']=$el;
break; break;
case "desc": case "desc":
$appinfo['description']=$el; $appinfo['description']=$el;
break; break;
case "license": case "license":
$appinfo['license']=$el; $appinfo['license']=$el;
break; break;
case "category": case "category":
$appinfo['category']=$el; $appinfo['category']=$el;
break; break;
} }
} }