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.

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

HUGE PR: new config framework for Headphones #2590

Open
wants to merge 90 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
3af0a5f
Templates for config
maxkoryukov Feb 6, 2016
f0cb45e
fuckin pep8
maxkoryukov Feb 14, 2016
53dc707
`unittescompat` moved to lib folder
maxkoryukov Feb 14, 2016
2ae7c11
Small improvements for all exiting tests
maxkoryukov Feb 14, 2016
031130c
Test Config : additional assertions, on config write. It is enough im…
maxkoryukov Feb 14, 2016
deb7207
THE FIRST SINGNIFICANT commit for hidden opt
maxkoryukov Feb 14, 2016
648390a
Small fixes for CSS of default interface
maxkoryukov Feb 14, 2016
8ef9ffd
Improved JS of ajax sending
maxkoryukov Feb 14, 2016
ec90a60
opt-hidden progress
maxkoryukov Feb 17, 2016
cd82bf8
CONFIG: structured options, another one step
maxkoryukov Mar 1, 2016
200fc6f
Step: improve settings
maxkoryukov Mar 9, 2016
efde5e2
UPG: a lot of improvements for options
maxkoryukov Mar 10, 2016
6e38c31
UPG: move files to refactor config infrastructure
maxkoryukov Mar 10, 2016
9761c47
UPG : config viewmodel improvements
maxkoryukov Mar 10, 2016
c3faa4e
FIX: fixed bug with column ruler on the config page (out of tab-box)
maxkoryukov Mar 10, 2016
4178fee
DOC: link in the config.less
maxkoryukov Mar 10, 2016
225839f
FIX: fixed type-name for hp.config.types.path
maxkoryukov Mar 10, 2016
b27cfa3
UPG: intermediate version of new config. Able to read config using ne…
maxkoryukov Mar 11, 2016
60b3259
UPG: config writing
maxkoryukov Mar 12, 2016
770f738
UPG: javascripts are moved from config-templates to the config page (…
maxkoryukov Mar 12, 2016
c9fec80
TEST: removed unnecessary (tests for the internal stuff) tests for co…
maxkoryukov Mar 12, 2016
c4a6a7c
FIX : fix less
maxkoryukov Mar 12, 2016
97ad116
FIX: style.less
maxkoryukov Mar 12, 2016
cde81ac
FIX: style.less
maxkoryukov Mar 12, 2016
3026f6e
squash me
maxkoryukov Mar 12, 2016
fc0985c
FIX: style for HP
maxkoryukov Mar 12, 2016
fb28178
UPG: misc improvements for options. New block of options - advanced:git
maxkoryukov Mar 12, 2016
835ce70
FIX: removed trailing spaces from ui.js
maxkoryukov Mar 12, 2016
0cb3c09
FIX: fixed bugs in config and definitions
maxkoryukov Mar 13, 2016
858b16c
UPG: added parser of POSTed data for config module
maxkoryukov Mar 14, 2016
b1b83dd
UPG: now config works!
maxkoryukov Mar 14, 2016
6e2d77f
FIX: css for options. Removed old config definitions, and 'float' lay…
maxkoryukov Mar 15, 2016
ce6994e
* UPG : MetaConfig - loader for meta-info about options, such as Read…
maxkoryukov Mar 15, 2016
37e84eb
UPG : new config-template: OptionDropDownSelector. It allows to selec…
maxkoryukov Mar 15, 2016
3d90cff
FIX: style.css regenerate
maxkoryukov Mar 15, 2016
f828c3c
UPG: 100% working OptionDropdownSelector
maxkoryukov Mar 16, 2016
565bac2
UPG : Complete 'Downloads' tab of Config page
maxkoryukov Mar 16, 2016
484c6e9
FIX: style and forced-non-render for internal and deprecated options
maxkoryukov Mar 16, 2016
6c78b70
FIX: pep8 and tests
maxkoryukov Mar 16, 2016
cf3fe34
FIX: pyflakes
maxkoryukov Mar 16, 2016
3f863ce
FIX: pyflakes and tests
maxkoryukov Mar 16, 2016
2974339
FIX: fix all small bugs, now tests are passed
maxkoryukov Mar 17, 2016
a0f38b8
FIX: simplified `searcher.py` uses the INTEGER value of option 'PREFE…
maxkoryukov Mar 17, 2016
9a4ba59
UPG: restructured tab 'Quality and Post Processing'
maxkoryukov Mar 17, 2016
02cc796
FIX: pep8 and pyflakes
maxkoryukov Mar 17, 2016
5286b9a
TEST: improved coverage
maxkoryukov Mar 17, 2016
5b588bb
UPG: the half of Advanced tab
maxkoryukov Mar 17, 2016
bb8e62e
FIX: EXTRA-checkbox beaten. Now it is common option, without superdup…
maxkoryukov Mar 17, 2016
259c62f
UPG: Config tab 'Advanced' almost done. There is just one trouble - s…
maxkoryukov Mar 18, 2016
8be9f4a
UPG: hidden and readonly options (configured using `config.meta.ini`)…
maxkoryukov Mar 18, 2016
f4e14b6
UPG: Partialy localized (ru) !!
maxkoryukov Mar 18, 2016
22c490a
FIX: displaying of the appropriate block of settings on "advanced" fo…
maxkoryukov Mar 18, 2016
ca35772
UPG: common way to handle cssclasses for options and other templates
maxkoryukov Mar 19, 2016
bc9f94c
UPG: NOTIFICATIONS tab
maxkoryukov Mar 21, 2016
cd0eefd
UPG: translations updated
maxkoryukov Mar 21, 2016
6a0d896
UPG: Font awesome
maxkoryukov Mar 22, 2016
fe1e4a8
UPG: Search tab DONE
maxkoryukov Mar 22, 2016
bb65f58
LANG: translations updated
maxkoryukov Mar 22, 2016
b139525
UPD: Font awesome
maxkoryukov Mar 22, 2016
be5fcdd
UPG: soft chroot (fix #11)
maxkoryukov Mar 22, 2016
1c57651
Merge branch 'fix/unittestcompat-method-doc' into feature/hidden-opt-2
maxkoryukov Mar 22, 2016
a23e078
adsf
maxkoryukov Mar 22, 2016
e2aa959
UPG: release version of HIDDEN OPT
maxkoryukov Apr 2, 2016
84640ac
Merge branch 'feature/hidden-opt-2' into feature/hidden-opt-pr
maxkoryukov Apr 2, 2016
626cbf9
Remove unittestcompat from headphones (exists in lib)
maxkoryukov Apr 2, 2016
d7a2123
FIX: fixed errors in extra-torznabs, newznabs. Now worked well with '…
maxkoryukov Apr 2, 2016
919b88a
UPG: unittestcompat improvements
maxkoryukov Apr 2, 2016
c9031d9
FIX: unittestcompat for python 2.6 : exception type inheritance
maxkoryukov Apr 2, 2016
d7150e1
DBG: small fixes in travis ci for drop cache
maxkoryukov Apr 2, 2016
092d4c4
DOC: upgraded docs in /locale
maxkoryukov Apr 9, 2016
6b3b8ae
DOCS: fixed run path in locale-docs
maxkoryukov Apr 9, 2016
11859ce
UPG: more logging for webserve.py
maxkoryukov Apr 11, 2016
4e43afe
Merge branch 'feature/hidden-opt-pr' of https://github.com/maxkoryuko…
maxkoryukov Apr 11, 2016
45f489c
FIX: font-awesome without SVG version
maxkoryukov Apr 12, 2016
fbe509d
Sync branch with upstream (through merge, because rebase will take a …
maxkoryukov Apr 13, 2016
9dbc518
UGP: improved unittestcompat
maxkoryukov Apr 13, 2016
800e9eb
FIX: travis config reverted (was modified , to drop cache)
maxkoryukov Apr 13, 2016
524ec86
UPG: font awesome 4.6.1
maxkoryukov Apr 19, 2016
8b94362
FIX: fix microsoft CSS filter property
maxkoryukov Apr 19, 2016
ee55c3c
New meta-options (#26) and fix for HTTP-headers for proxy
maxkoryukov Apr 20, 2016
771ed21
TEST: slight improvements for tests for softchroot
maxkoryukov Apr 22, 2016
c265743
UPG: config - hide empty blocks (when all embed options was hidden by…
maxkoryukov Apr 22, 2016
5a352dd
Tests in browser with SouceLabs+Selenium
maxkoryukov Apr 23, 2016
cd2110f
FIX: soft-chroot bug with path equals to chroot without slash fixed
maxkoryukov Apr 23, 2016
5c01883
FIX: correct closing SauceLabs browser
maxkoryukov Apr 23, 2016
74740eb
FIX: slight modifications in advanced options
maxkoryukov Apr 23, 2016
c72a1c1
UPG: browser test - new environment: OS X 10, safari 9.0
maxkoryukov Apr 23, 2016
6433b02
Simplified selenium tests (runs locally)
maxkoryukov Apr 24, 2016
50e65f9
remove commented code (fix maxkoryukov/headphones#24)
maxkoryukov May 30, 2016
43c5ed5
remove commented code (fix maxkoryukov/headphones#24)
maxkoryukov May 30, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
version.lock
logs/*
cache/*
# mako generated templates:
/auto/

# HTTPS Cert/Key
*.crt
Expand Down Expand Up @@ -70,4 +72,4 @@ _ReSharper*/
.vscode

# Python virtual env
venv
venv
25 changes: 25 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,38 @@ python:
- "2.6"
- "2.7"

env:
global:
# Soucelabs
- secure: "QJqlXGFBbMBCIJYJky3LXXvuk132O9cUqxAw4WI5kmNgbE8oRdyN9jYPbRKJ2XmWHX2mvDuo7M45IJyvsukYvYJO8jgFGygY5GVhcYt6Id3HMapmZfU+VYvNXKmNJJGSTzU6omYO+9qy7QOL2Kyvzt6+/hmloymPHr3poPR0qpxLobNR7izIrZmkuJ5QRINE+ryScbVgLMsMC+ktiXI79Q9/k7BW0gYOTo60XiAqOk1edHYK7SkJ+OHYR8JQA90u5JwOkwWz3cjcqeJJjp8okW0cjV2s5KEumfxEpj/wXAho6lh6dQfeE7ii2DtrUwWs8qYAVVb9dXfV4bvMTTOqGqPi7HlouU10Ai2OU5tWMmqhWJ99nyHL9jeCxxAs2RnwlLL5X4h2bzabpvouMr5v64Q1Lfz0GpX4fLQD+MUsusNI1GTos1t9VkF/yvVn/Ka58a3+pOd5Do/yKPcD7Cfho4pAkvdtqKpNfbocJtxVky4ECbX26fFVhTPKU6/YF94MmpIXzskMMfzRvOx/PApZtyA7siYCgT3LjDrRWgqfKOd22D+e2rI3G1ufAe1QZx4MQD+baLYPrILgmBWJ62ouBTrw368h7PBOCCXWpjMlIED42fw1kz8qOMzAp6bpB4Zk81NduKTohWo+vX6RRWbv4ESBWTpvmpuoXeBoLPs+o0A="
- secure: "e0zp9XZbgY80LKZINTBLnYjdUON7zkC96vK7PyJXRnmrdyrBkF/kmp+wHAu8I/9frrG0oVVL3Okev5XdTzbCG3HQ52Ys63oa/bjqyQ15GBKD0bogvUQ5+f2TFTbOe+xvMKTA1NLnMxBnX9Ta7zPGh1K36zZtGURQY+l/XqLbOf0MT5ExA1JMwXPSxcgHQwoR5T2KqX65gOExdA/CF11EEKcWc3iIqRitFQkuGSeXKYrwH7IaZQqOc+PkX2rwykWse2dFHlm19oJDxS2uaddtfXu6NOVDDNiw3bN7xsd0bSzKb5N0D1tUZcAIDtv3mOqsSv9Ffs1JgcoHKkDnEsC/0I5qLRmld8cpCwONnp6Kx+RdCZs5h6NxdaXCRT51oB/OriRiDZGRrygJOXMG8Gepkk6ydhrE5UCwKaOqehHRL4m3koWbwTXVKpVGjvimzCXE31/+R5G+DKEc93q54IFxAPHEAcdMFbYfYO12R/cT189hY16SXG6KyNl8ZTMImuEbEACkjHmzY2i8BZoITPi6U7SXHoFqcL7Z7QVO2Tr1a2ZgSRyEHrVqhupu+XG7vSKhG9GCa43R7Om1i6FebzvX2IxIEJiYAdBV7ssR6F+pgBAKe1dXZetCC8bToGSqc4WXCkq5DAJmfEmAy204D7/Y2IuxzyBfGbeFOBvF7k50nuI="
- SOUCELABS=false # set "true" to enable Soucelabs integration

install:
- pip install -r requirements-dev.txt

before_script:
# Creatind dumb config, which allows to run HP, listening on all interfaces
- printf '[General]\nhttp_host=0.0.0.0\n' > config.ini
- python Headphones.py -v -d
- sleep 7 # give Web server some time to bind to sockets, etc

script:
# required for running browser
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"
- sleep 3 # give xvfb some time to start

- pep8 headphones
- pyflakes headphones
- nosetests

after_success:
- if [[ $TRAVIS_PYTHON_VERSION == "2.7" ]]; then coveralls; fi

after_failure:
- cat ./logs/headphones.log
- cat /home/travis/sauce-connect.log

addons:
sauce_connect: true
1 change: 1 addition & 0 deletions Headphones.py
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@ def main():
'http_host': headphones.CONFIG.HTTP_HOST,
'http_root': headphones.CONFIG.HTTP_ROOT,
'http_proxy': headphones.CONFIG.HTTP_PROXY,
'http_proxy_header_host': headphones.CONFIG.HTTP_PROXY_HEADER_HOST,
'enable_https': headphones.CONFIG.ENABLE_HTTPS,
'https_cert': headphones.CONFIG.HTTPS_CERT,
'https_key': headphones.CONFIG.HTTPS_KEY,
Expand Down
2 changes: 1 addition & 1 deletion data/interfaces/default/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
</div>
</header>

<div id="main" class="main">
<div id="main" class="main hp">
<div id="subhead">
${next.headerIncludes()}
</div>
Expand Down
32 changes: 32 additions & 0 deletions data/interfaces/default/config-meta-ui.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<%inherit file="base.html"/>

<%!
import headphones
import string
%>

<%def name="headerIncludes()">
<div id="subhead_container">
<div id="subhead_menu">
<a id="menu_link_shutdown" href="shutdown"><i class="fa fa-power-off"></i> Shut Down</a>
<a id="menu_link_shutdown" href="restart"><i class="fa fa-power-off"></i> Restart</a>
</div>
</div>
</%def>

<%def name="body()">
<div id="paddingheader">
<h1 class="clearfix"><i class="fa fa-gear"></i> Meta UI Settings</h1>
</div>

<form action="configMetaUiUpdate" id="configMetaUiUpdate" method="post" class="form">
<input type="number" name="keng" />
<input type="submit" value="Save Changes" data-success="Changes saved successfully">
</form>
</%def>

<%def name="javascriptIncludes()">
<script type="text/javascript">

</script>
</%def>
Loading