mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-05 18:50:09 +02:00
Add HTML/CSS tidy test
and tidy up the content
This commit is contained in:
Benedikt Brückmann
parent
0936051c7b
commit
022d73b3b6
@ -162,55 +162,69 @@ def make_website(apps, repodir, repodict):
|
|||||||
description = repodict["description"]
|
description = repodict["description"]
|
||||||
icon = repodict["icon"]
|
icon = repodict["icon"]
|
||||||
f.write("""<!-- {autogenerate_comment} -->
|
f.write("""<!-- {autogenerate_comment} -->
|
||||||
<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>
|
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
|
||||||
<HTML>
|
<html>
|
||||||
<HEAD>
|
<head>
|
||||||
<META HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=UTF-8'/>
|
<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
|
||||||
<META NAME="viewport" CONTENT="width=device-width; initial-scale=1.0; minimum-scale=0.5; maximum-scale=2.0; user-scalable=1;" />
|
<meta content="width=device-width; initial-scale=1.0; minimum-scale=0.5; maximum-scale=2.0; user-scalable=1;" name="viewport">
|
||||||
<TITLE>{name}</TITLE>
|
<title>
|
||||||
<BASE HREF='index.html'/>
|
{name}
|
||||||
<LINK REL='stylesheet' TYPE='text/css' HREF='index.css' />
|
</title>
|
||||||
<LINK REL='icon' HREF='icons/{icon}' TYPE='image/png' />
|
<base href="index.html">
|
||||||
<LINK REL='shortcut icon' HREF='icons/{icon}' TYPE='image/png' />
|
<link href="index.css" rel="stylesheet" type="text/css">
|
||||||
<META property="og:site_name" content="{name}" />
|
<link href="icons/{icon}" rel="icon" type="image/png">
|
||||||
<META property="og:title" content="{name}" />
|
<link href="icons/{icon}" rel="shortcut icon" type="image/png">
|
||||||
<META property="og:determiner" content="" />
|
<meta content="{name}" property="og:site_name">
|
||||||
<META property="og:description" content="{description}" />
|
<meta content="{name}" property="og:title">
|
||||||
<META NAME='robots' CONTENT='index,nofollow'/>
|
<meta content="" property="og:determiner">
|
||||||
</HEAD>
|
<meta content="{description}" property="og:description">
|
||||||
<BODY>
|
<meta content="index,nofollow" name="robots">
|
||||||
<h2>{name}</h2>
|
</head>
|
||||||
<div id='intro'>
|
<body>
|
||||||
<p style='margin-bottom:.2em;'>
|
<h2>
|
||||||
<span style='float:right;width:100px;margin-left:.5em;'>
|
{name}
|
||||||
<a href='index.png' title='QR: {name}'><img src='index.png' alt='QR: {name}' width='100'></a>
|
</h2>
|
||||||
</span>
|
<div id="intro">
|
||||||
{description}
|
<p style="margin-bottom:.2em;">
|
||||||
<br/>
|
<span style="float:right;width:100px;margin-left:.5em;">
|
||||||
<br/>
|
<a href="index.png" title="QR: test">
|
||||||
{details}
|
<img alt="QR: test" src="index.png" width="100">
|
||||||
</p>
|
</a>
|
||||||
<p class="center" style="margin-top:.5em">
|
</span>
|
||||||
<a href="{link_fingerprinted}">
|
{description}
|
||||||
<code style="color:#000000;font-weight:bold;">
|
<br>
|
||||||
{link}
|
<br>
|
||||||
</code>
|
Currently it serves
|
||||||
</a>
|
<kbd>
|
||||||
</p>
|
{number_of_apps}
|
||||||
<p>If you would like to manually verify the fingerprint (SHA-256) of the repository signing key, here it is:<br/>
|
</kbd>
|
||||||
<blockcode style="color:#000000;font-weight:bold;">
|
apps. To add it to your F-Droid client, scan the QR code (click it to enlarge) or use this URL:
|
||||||
{fingerprint}
|
</p>
|
||||||
</blockcode>
|
<p class="center" style="margin-top:.5em">
|
||||||
</p>
|
<a href="{link_fingerprinted}">
|
||||||
</div>
|
<code style="color:#000000;font-weight:bold;">
|
||||||
</BODY>""".format(autogenerate_comment=autogenerate_comment,
|
{link}
|
||||||
|
</code>
|
||||||
|
</a>
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
If you would like to manually verify the fingerprint (SHA-256) of the repository signing key, here it is:
|
||||||
|
<br>
|
||||||
|
<blockcode style="color:#000000;font-weight:bold;">
|
||||||
|
{fingerprint}
|
||||||
|
</blockcode>
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
""".format(autogenerate_comment=autogenerate_comment,
|
||||||
description=description,
|
description=description,
|
||||||
details="Currently it serves <kbd>{}</kbd> apps. To add it to your F-Droid client, scan the QR code (click it to enlarge) or use this URL:".format(len(apps)),
|
|
||||||
fingerprint=repo_pubkey_fingerprint,
|
fingerprint=repo_pubkey_fingerprint,
|
||||||
icon=icon,
|
icon=icon,
|
||||||
link=link,
|
link=link,
|
||||||
link_fingerprinted=link_fingerprinted,
|
link_fingerprinted=link_fingerprinted,
|
||||||
name=name))
|
name=name,
|
||||||
|
number_of_apps=str(len(apps))))
|
||||||
|
|
||||||
css_file = os.path.join(repodir, "index.css")
|
css_file = os.path.join(repodir, "index.css")
|
||||||
if _should_file_be_generated(css_file, autogenerate_comment):
|
if _should_file_be_generated(css_file, autogenerate_comment):
|
||||||
@ -218,113 +232,231 @@ def make_website(apps, repodir, repodict):
|
|||||||
# this auto generated comment was not included via .format(), as python seems to have problems with css files in combination with .format()
|
# this auto generated comment was not included via .format(), as python seems to have problems with css files in combination with .format()
|
||||||
f.write("""/* auto-generated - fdroid index updates will overwrite this file */
|
f.write("""/* auto-generated - fdroid index updates will overwrite this file */
|
||||||
BODY {
|
BODY {
|
||||||
font-family: Arial, Helvetica, Sans-Serif;
|
font-family : Arial, Helvetica, Sans-Serif;
|
||||||
color: #0000ee;
|
color : #0000ee;
|
||||||
background-color: #ffffff;
|
background-color : #ffffff;
|
||||||
|
}
|
||||||
|
p {
|
||||||
|
text-align : justify;
|
||||||
|
}
|
||||||
|
p.center {
|
||||||
|
text-align : center;
|
||||||
}
|
}
|
||||||
p { text-align:justify; }
|
|
||||||
p.center { text-align:center; }
|
|
||||||
TD {
|
TD {
|
||||||
font-family: Arial, Helvetica, Sans-Serif;
|
font-family : Arial, Helvetica, Sans-Serif;
|
||||||
color: #0000ee;
|
color : #0000ee;
|
||||||
|
}
|
||||||
|
body,td {
|
||||||
|
font-size : 14px;
|
||||||
}
|
}
|
||||||
body,td { font-size:14px;}
|
|
||||||
TH {
|
TH {
|
||||||
font-family: Arial, Helvetica, Sans-Serif;
|
font-family : Arial, Helvetica, Sans-Serif;
|
||||||
color: #0000ee;
|
color : #0000ee;
|
||||||
background-color: #F5EAD4;
|
background-color : #F5EAD4;
|
||||||
|
}
|
||||||
|
a:link {
|
||||||
|
color : #bb0000;
|
||||||
|
}
|
||||||
|
a:visited {
|
||||||
|
color : #ff0000;
|
||||||
|
}
|
||||||
|
.zitat {
|
||||||
|
margin-left : 1cm;
|
||||||
|
margin-right : 1cm;
|
||||||
|
font-style : italic;
|
||||||
}
|
}
|
||||||
a:link { color: #bb0000; }
|
|
||||||
a:visited { color: #ff0000; }
|
|
||||||
.zitat { margin-left:1cm; margin-right:1cm; font-style:italic; }
|
|
||||||
#intro {
|
#intro {
|
||||||
border-spacing:1em;
|
border-spacing : 1em;
|
||||||
border:1px solid gray;
|
border : 1px solid gray;
|
||||||
border-radius:0.5em;
|
border-radius : 0.5em;
|
||||||
box-shadow: 10px 10px 5px #888;
|
box-shadow : 10px 10px 5px #888;
|
||||||
margin:1.5em;
|
margin : 1.5em;
|
||||||
font-size:.9em;
|
font-size : .9em;
|
||||||
width:600px; max-width:90%;
|
width : 600px;
|
||||||
display:table; margin-left:auto;margin-right:auto;
|
max-width : 90%;
|
||||||
font-size:.8em; color: #555555;
|
display : table;
|
||||||
|
margin-left : auto;
|
||||||
|
margin-right : auto;
|
||||||
|
font-size : .8em;
|
||||||
|
color : #555555;
|
||||||
|
}
|
||||||
|
#intro > p {
|
||||||
|
margin-top : 0;
|
||||||
|
}
|
||||||
|
#intro p:last-child {
|
||||||
|
margin-bottom : 0;
|
||||||
}
|
}
|
||||||
#intro > p { margin-top:0;}
|
|
||||||
#intro p:last-child {margin-bottom:0;}
|
|
||||||
.last {
|
.last {
|
||||||
border-bottom: 1px solid black;
|
border-bottom : 1px solid black;
|
||||||
padding-bottom:.5em;
|
padding-bottom : .5em;
|
||||||
text-align:center;
|
text-align : center;
|
||||||
|
}
|
||||||
|
table {
|
||||||
|
border-collapse : collapse;
|
||||||
|
}
|
||||||
|
h2 {
|
||||||
|
text-align : center;
|
||||||
|
}
|
||||||
|
.perms {
|
||||||
|
font-family : monospace;
|
||||||
|
font-size : .8em;
|
||||||
|
}
|
||||||
|
.repoapplist {
|
||||||
|
display : table;
|
||||||
|
border-collapse : collapse;
|
||||||
|
margin-left : auto;
|
||||||
|
margin-right : auto;
|
||||||
|
width : 600px;
|
||||||
|
max-width : 90%;
|
||||||
|
}
|
||||||
|
.approw, appdetailrow {
|
||||||
|
display : table-row;
|
||||||
|
}
|
||||||
|
.appdetailrow {
|
||||||
|
display : flex;
|
||||||
|
padding : .5em;
|
||||||
|
}
|
||||||
|
.appiconbig, .appdetailblock, .appdetailcell {
|
||||||
|
display : table-cell
|
||||||
|
}
|
||||||
|
.appiconbig {
|
||||||
|
vertical-align : middle;
|
||||||
|
text-align : center;
|
||||||
|
}
|
||||||
|
.appdetailinner {
|
||||||
|
width : 100%;
|
||||||
|
}
|
||||||
|
.applinkcell {
|
||||||
|
text-align : center;
|
||||||
|
float : right;
|
||||||
|
width : 100%;
|
||||||
|
margin-bottom : .1em;
|
||||||
|
}
|
||||||
|
.paddedlink {
|
||||||
|
margin : 1em;
|
||||||
}
|
}
|
||||||
table { border-collapse:collapse; }
|
|
||||||
h2 { text-align:center; }
|
|
||||||
.perms { font-family: monospace; font-size:.8em; }
|
|
||||||
|
|
||||||
.repoapplist { display:table; border-collapse:collapse; margin-left:auto; margin-right:auto; width:600px; max-width:90%; }
|
|
||||||
.approw, appdetailrow { display:table-row; }
|
|
||||||
.appdetailrow { display:flex; padding:.5em; }
|
|
||||||
.appiconbig, .appdetailblock, .appdetailcell { display:table-cell }
|
|
||||||
.appiconbig { vertical-align:middle; text-align:center; }
|
|
||||||
.appdetailinner { width:100%; }
|
|
||||||
.applinkcell { text-align:center; float:right; width:100%; margin-bottom:.1em; }
|
|
||||||
.paddedlink { margin:1em; }
|
|
||||||
|
|
||||||
.approw {
|
.approw {
|
||||||
border-spacing:1em;
|
border-spacing : 1em;
|
||||||
border:1px solid gray;
|
border : 1px solid gray;
|
||||||
border-radius:0.5em;
|
border-radius : 0.5em;
|
||||||
padding:0.5em;
|
padding : 0.5em;
|
||||||
margin:1.5em;
|
margin : 1.5em;
|
||||||
|
}
|
||||||
|
.appdetailinner .appdetailrow:first-child {
|
||||||
|
background-color : #d5d5d5;
|
||||||
|
}
|
||||||
|
.appdetailinner .appdetailrow:first-child .appdetailcell {
|
||||||
|
min-width : 33%;
|
||||||
|
flex : 1 33%;
|
||||||
|
text-align : center;
|
||||||
|
}
|
||||||
|
.appdetailinner .appdetailrow:first-child .appdetailcell:first-child {
|
||||||
|
text-align : left;
|
||||||
|
}
|
||||||
|
.appdetailinner .appdetailrow:first-child .appdetailcell:last-child {
|
||||||
|
float : none;
|
||||||
|
text-align : right;
|
||||||
|
}
|
||||||
|
.minor-details {
|
||||||
|
font-size : .8em;
|
||||||
|
color : #555555;
|
||||||
|
}
|
||||||
|
.boldname {
|
||||||
|
font-weight : bold;
|
||||||
|
}
|
||||||
|
#appcount {
|
||||||
|
text-align : center;
|
||||||
|
margin-bottom : .5em;
|
||||||
}
|
}
|
||||||
.appdetailinner .appdetailrow:first-child { background-color:#d5d5d5; }
|
|
||||||
.appdetailinner .appdetailrow:first-child .appdetailcell { min-width:33%; flex:1 33%; text-align:center; }
|
|
||||||
.appdetailinner .appdetailrow:first-child .appdetailcell:first-child { text-align:left; }
|
|
||||||
.appdetailinner .appdetailrow:first-child .appdetailcell:last-child { float:none; text-align:right; }
|
|
||||||
|
|
||||||
.minor-details { font-size:.8em; color: #555555; }
|
|
||||||
.boldname { font-weight:bold; }
|
|
||||||
#appcount { text-align:center; margin-bottom:.5em; }
|
|
||||||
|
|
||||||
kbd {
|
kbd {
|
||||||
padding: 0.1em 0.6em;
|
padding : 0.1em 0.6em;
|
||||||
border: 1px solid #CCC;
|
border : 1px solid #CCC;
|
||||||
background-color: #F7F7F7;
|
background-color : #F7F7F7;
|
||||||
color: #333;
|
color : #333;
|
||||||
box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.2), 0px 0px 0px 2px #FFF inset;
|
box-shadow : 0px 1px 0px rgba(0, 0, 0, 0.2), 0px 0px 0px 2px #FFF inset;
|
||||||
border-radius: 3px;
|
border-radius : 3px;
|
||||||
display: inline-block;
|
display : inline-block;
|
||||||
margin: 0px 0.1em;
|
margin : 0px 0.1em;
|
||||||
text-shadow: 0px 1px 0px #FFF;
|
text-shadow : 0px 1px 0px #FFF;
|
||||||
white-space: nowrap;
|
white-space : nowrap;
|
||||||
|
}
|
||||||
|
div.filterline, div.repoline {
|
||||||
|
display : table;
|
||||||
|
margin-left : auto;
|
||||||
|
margin-right : auto;
|
||||||
|
margin-bottom : 1em;
|
||||||
|
vertical-align : middle;
|
||||||
|
display : table;
|
||||||
|
font-size : .8em;
|
||||||
|
}
|
||||||
|
.filterline form {
|
||||||
|
display : table-row;
|
||||||
|
}
|
||||||
|
.filterline .filtercell {
|
||||||
|
display : table-cell;
|
||||||
|
vertical-align : middle;
|
||||||
|
}
|
||||||
|
fieldset {
|
||||||
|
float : left;
|
||||||
|
}
|
||||||
|
fieldset select, fieldset input, #reposelect select, #reposelect input {
|
||||||
|
font-size : .9em;
|
||||||
|
}
|
||||||
|
.pager {
|
||||||
|
display : table;
|
||||||
|
margin-left : auto;
|
||||||
|
margin-right : auto;
|
||||||
|
width : 600px;
|
||||||
|
max-width : 90%;
|
||||||
|
padding-top : .6em;
|
||||||
|
}
|
||||||
|
/* should correspond to .repoapplist */
|
||||||
|
.pagerrow {
|
||||||
|
display : table-row;
|
||||||
|
}
|
||||||
|
.pagercell {
|
||||||
|
display : table-cell;
|
||||||
|
}
|
||||||
|
.pagercell.left {
|
||||||
|
text-align : left;
|
||||||
|
padding-right : 1em;
|
||||||
|
}
|
||||||
|
.pagercell.middle {
|
||||||
|
text-align : center;
|
||||||
|
font-size : .9em;
|
||||||
|
color : #555;
|
||||||
|
}
|
||||||
|
.pagercell.right {
|
||||||
|
text-align : right;
|
||||||
|
padding-left : 1em;
|
||||||
|
}
|
||||||
|
.anti {
|
||||||
|
color : peru;
|
||||||
|
}
|
||||||
|
.antibold {
|
||||||
|
color : crimson;
|
||||||
}
|
}
|
||||||
|
|
||||||
div.filterline, div.repoline { display:table;margin-left:auto;margin-right:auto;margin-bottom:1em;vertical-align:middle;display:table;font-size:.8em; }
|
|
||||||
.filterline form { display:table-row; }
|
|
||||||
.filterline .filtercell { display:table-cell;vertical-align:middle; }
|
|
||||||
fieldset { float:left; }
|
|
||||||
fieldset select, fieldset input, #reposelect select, #reposelect input { font-size:.9em; }
|
|
||||||
|
|
||||||
.pager { display:table; margin-left:auto; margin-right:auto; width:600px; max-width:90%; padding-top:.6em; } /* should correspond to .repoapplist */
|
|
||||||
.pagerrow { display:table-row; }
|
|
||||||
.pagercell { display:table-cell; }
|
|
||||||
.pagercell.left { text-align:left; padding-right:1em; }
|
|
||||||
.pagercell.middle { text-align:center; font-size:.9em; color:#555; }
|
|
||||||
.pagercell.right { text-align:right; padding-left:1em; }
|
|
||||||
|
|
||||||
.anti { color: peru; }
|
|
||||||
.antibold { color: crimson; }
|
|
||||||
|
|
||||||
#footer {
|
#footer {
|
||||||
text-align:center;
|
text-align : center;
|
||||||
margin-top:1em;
|
margin-top : 1em;
|
||||||
font-size:11px;
|
font-size : 11px;
|
||||||
color:#555;
|
color : #555;
|
||||||
|
}
|
||||||
|
#footer img {
|
||||||
|
vertical-align : middle;
|
||||||
}
|
}
|
||||||
#footer img { vertical-align:middle; }
|
|
||||||
|
|
||||||
@media (max-width: 600px) {
|
@media (max-width: 600px) {
|
||||||
.repoapplist { display:block; }
|
.repoapplist {
|
||||||
.appdetailinner, .appdetailrow { display:block; }
|
display : block;
|
||||||
.appdetailcell { display:block; float:left; line-height:1.5em; }
|
}
|
||||||
|
.appdetailinner, .appdetailrow {
|
||||||
|
display : block;
|
||||||
|
}
|
||||||
|
.appdetailcell {
|
||||||
|
display : block;
|
||||||
|
float : left;
|
||||||
|
line-height : 1.5em;
|
||||||
|
}
|
||||||
}""")
|
}""")
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -13,6 +13,7 @@ import requests
|
|||||||
import tempfile
|
import tempfile
|
||||||
import json
|
import json
|
||||||
import shutil
|
import shutil
|
||||||
|
from html5print import CSSBeautifier, HTMLBeautifier
|
||||||
|
|
||||||
localmodule = os.path.realpath(
|
localmodule = os.path.realpath(
|
||||||
os.path.join(os.path.dirname(inspect.getfile(inspect.currentframe())), '..'))
|
os.path.join(os.path.dirname(inspect.getfile(inspect.currentframe())), '..'))
|
||||||
@ -354,6 +355,41 @@ class IndexTest(unittest.TestCase):
|
|||||||
'https://gitlab.com/group/project/-/raw/master/fdroid'],
|
'https://gitlab.com/group/project/-/raw/master/fdroid'],
|
||||||
fdroidserver.index.get_mirror_service_urls(url))
|
fdroidserver.index.get_mirror_service_urls(url))
|
||||||
|
|
||||||
|
def test_make_website(self):
|
||||||
|
tmptestsdir = tempfile.mkdtemp(prefix=inspect.currentframe().f_code.co_name,
|
||||||
|
dir=self.tmpdir)
|
||||||
|
os.chdir(tmptestsdir)
|
||||||
|
os.mkdir('metadata')
|
||||||
|
os.mkdir('repo')
|
||||||
|
|
||||||
|
repodict = {
|
||||||
|
'address': 'https://example.com/fdroid/repo',
|
||||||
|
'description': 'This is just a test',
|
||||||
|
'icon': 'blahblah',
|
||||||
|
'name': 'test',
|
||||||
|
'timestamp': datetime.datetime.now(),
|
||||||
|
'version': 12,
|
||||||
|
}
|
||||||
|
|
||||||
|
fdroidserver.common.config['repo_pubkey'] = 'ffffffffffffffffffffffffffffffffff'
|
||||||
|
|
||||||
|
fdroidserver.index.make_website([], "repo", repodict)
|
||||||
|
self.assertTrue(os.path.exists(os.path.join('repo', 'index.html')))
|
||||||
|
self.assertTrue(os.path.exists(os.path.join('repo', 'index.css')))
|
||||||
|
self.assertTrue(os.path.exists(os.path.join('repo', 'index.png')))
|
||||||
|
|
||||||
|
with open(os.path.join("repo", "index.html")) as f:
|
||||||
|
html = f.read()
|
||||||
|
pretty_html = HTMLBeautifier.beautify(html)
|
||||||
|
self.maxDiff = None
|
||||||
|
self.assertEquals(html, pretty_html)
|
||||||
|
|
||||||
|
with open(os.path.join("repo", "index.css")) as f:
|
||||||
|
css = f.read()
|
||||||
|
pretty_css = CSSBeautifier.beautify(css)
|
||||||
|
self.maxDiff = None
|
||||||
|
self.assertEquals(css, pretty_css)
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
os.chdir(os.path.dirname(__file__))
|
os.chdir(os.path.dirname(__file__))
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user