From 7adb17452d8c845f46858b4cebe8198988edfdbc Mon Sep 17 00:00:00 2001 From: Thomas Pointhuber Date: Sat, 20 Dec 2014 23:33:03 +0100 Subject: [PATCH 1/7] [enh] add result_templates/code.html --- requirements.txt | 1 + searx/engines/searchcode_code.py | 32 ++++--- searx/static/courgette/css/style.css | 80 +++++++++++++++- searx/static/default/css/style.css | 87 +----------------- searx/static/default/less/code.less | 83 +++++++++++++++++ searx/static/default/less/style.less | 2 + searx/static/oscar/css/bootstrap.min.css | Bin 116497 -> 114586 bytes searx/static/oscar/css/oscar.min.css | Bin 1078 -> 3454 bytes searx/static/oscar/less/oscar/code.less | 79 ++++++++++++++++ searx/static/oscar/less/oscar/oscar.less | 2 + .../courgette/result_templates/code.html | 9 ++ .../default/result_templates/code.html | 9 ++ .../oscar/result_templates/code.html | 17 ++++ searx/webapp.py | 46 +++++++++ setup.py | 1 + versions.cfg | 1 + 16 files changed, 350 insertions(+), 99 deletions(-) create mode 100644 searx/static/default/less/code.less create mode 100644 searx/static/oscar/less/oscar/code.less create mode 100644 searx/templates/courgette/result_templates/code.html create mode 100644 searx/templates/default/result_templates/code.html create mode 100644 searx/templates/oscar/result_templates/code.html diff --git a/requirements.txt b/requirements.txt index 07b53d2ad..2d434825d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,4 +3,5 @@ flask-babel requests lxml pyyaml +pygments python-dateutil diff --git a/searx/engines/searchcode_code.py b/searx/engines/searchcode_code.py index 2ba0e52f1..ac9647fcd 100644 --- a/searx/engines/searchcode_code.py +++ b/searx/engines/searchcode_code.py @@ -21,6 +21,18 @@ paging = True url = 'https://searchcode.com/' search_url = url+'api/codesearch_I/?{query}&p={pageno}' +code_endings = {'c': 'c', + 'css': 'css', + 'cpp': 'cpp', + 'c++': 'cpp', + 'h': 'c', + 'html': 'html', + 'hpp': 'cpp', + 'js': 'js', + 'lua': 'lua', + 'php': 'php', + 'py': 'python'} + # do search-request def request(query, params): @@ -40,26 +52,22 @@ def response(resp): for result in search_results['results']: href = result['url'] title = "" + result['name'] + " - " + result['filename'] - content = result['repo'] + "
" + repo = result['repo'] lines = dict() for line, code in result['lines'].items(): lines[int(line)] = code - content = content + '
'
-        for line, code in sorted(lines.items()):
-            content = content + '"
-            
-        content = content + "
' 
-            content = content + str(line) + '' 
-            # Replace every two spaces with ' &nbps;' to keep formatting while allowing the browser to break the line if necessary
-            content = content + cgi.escape(code).replace('\t', '    ').replace('  ', '  ').replace('  ', '  ') 
-            content = content + "
" - + code_language = code_endings.get(result['filename'].split('.')[-1].lower(), None) + # append result results.append({'url': href, 'title': title, - 'content': content}) + 'content': '', + 'repository': repo, + 'codelines': sorted(lines.items()), + 'code_language': code_language, + 'template': 'code.html'}) # return results return results diff --git a/searx/static/courgette/css/style.css b/searx/static/courgette/css/style.css index 55db91317..866686c9c 100644 --- a/searx/static/courgette/css/style.css +++ b/searx/static/courgette/css/style.css @@ -579,4 +579,82 @@ select { border: 1px solid #DDD; padding: 0.5em 0.8em; font-size: 1em; -} \ No newline at end of file +} + +.highlight .hll { background-color: #ffffcc } +.highlight { background: #f8f8f8; } +.highlight .c { color: #408080; font-style: italic } /* Comment */ +.highlight .err { border: 1px solid #FF0000 } /* Error */ +.highlight .k { color: #008000; font-weight: bold } /* Keyword */ +.highlight .o { color: #666666 } /* Operator */ +.highlight .cm { color: #408080; font-style: italic } /* Comment.Multiline */ +.highlight .cp { color: #BC7A00 } /* Comment.Preproc */ +.highlight .c1 { color: #408080; font-style: italic } /* Comment.Single */ +.highlight .cs { color: #408080; font-style: italic } /* Comment.Special */ +.highlight .gd { color: #A00000 } /* Generic.Deleted */ +.highlight .ge { font-style: italic } /* Generic.Emph */ +.highlight .gr { color: #FF0000 } /* Generic.Error */ +.highlight .gh { color: #000080; font-weight: bold } /* Generic.Heading */ +.highlight .gi { color: #00A000 } /* Generic.Inserted */ +.highlight .go { color: #888888 } /* Generic.Output */ +.highlight .gp { color: #000080; font-weight: bold } /* Generic.Prompt */ +.highlight .gs { font-weight: bold } /* Generic.Strong */ +.highlight .gu { color: #800080; font-weight: bold } /* Generic.Subheading */ +.highlight .gt { color: #0044DD } /* Generic.Traceback */ +.highlight .kc { color: #008000; font-weight: bold } /* Keyword.Constant */ +.highlight .kd { color: #008000; font-weight: bold } /* Keyword.Declaration */ +.highlight .kn { color: #008000; font-weight: bold } /* Keyword.Namespace */ +.highlight .kp { color: #008000 } /* Keyword.Pseudo */ +.highlight .kr { color: #008000; font-weight: bold } /* Keyword.Reserved */ +.highlight .kt { color: #B00040 } /* Keyword.Type */ +.highlight .m { color: #666666 } /* Literal.Number */ +.highlight .s { color: #BA2121 } /* Literal.String */ +.highlight .na { color: #7D9029 } /* Name.Attribute */ +.highlight .nb { color: #008000 } /* Name.Builtin */ +.highlight .nc { color: #0000FF; font-weight: bold } /* Name.Class */ +.highlight .no { color: #880000 } /* Name.Constant */ +.highlight .nd { color: #AA22FF } /* Name.Decorator */ +.highlight .ni { color: #999999; font-weight: bold } /* Name.Entity */ +.highlight .ne { color: #D2413A; font-weight: bold } /* Name.Exception */ +.highlight .nf { color: #0000FF } /* Name.Function */ +.highlight .nl { color: #A0A000 } /* Name.Label */ +.highlight .nn { color: #0000FF; font-weight: bold } /* Name.Namespace */ +.highlight .nt { color: #008000; font-weight: bold } /* Name.Tag */ +.highlight .nv { color: #19177C } /* Name.Variable */ +.highlight .ow { color: #AA22FF; font-weight: bold } /* Operator.Word */ +.highlight .w { color: #bbbbbb } /* Text.Whitespace */ +.highlight .mf { color: #666666 } /* Literal.Number.Float */ +.highlight .mh { color: #666666 } /* Literal.Number.Hex */ +.highlight .mi { color: #666666 } /* Literal.Number.Integer */ +.highlight .mo { color: #666666 } /* Literal.Number.Oct */ +.highlight .sb { color: #BA2121 } /* Literal.String.Backtick */ +.highlight .sc { color: #BA2121 } /* Literal.String.Char */ +.highlight .sd { color: #BA2121; font-style: italic } /* Literal.String.Doc */ +.highlight .s2 { color: #BA2121 } /* Literal.String.Double */ +.highlight .se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */ +.highlight .sh { color: #BA2121 } /* Literal.String.Heredoc */ +.highlight .si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */ +.highlight .sx { color: #008000 } /* Literal.String.Other */ +.highlight .sr { color: #BB6688 } /* Literal.String.Regex */ +.highlight .s1 { color: #BA2121 } /* Literal.String.Single */ +.highlight .ss { color: #19177C } /* Literal.String.Symbol */ +.highlight .bp { color: #008000 } /* Name.Builtin.Pseudo */ +.highlight .vc { color: #19177C } /* Name.Variable.Class */ +.highlight .vg { color: #19177C } /* Name.Variable.Global */ +.highlight .vi { color: #19177C } /* Name.Variable.Instance */ +.highlight .il { color: #666666 } /* Literal.Number.Integer.Long */ + +.highlight pre { overflow: auto; } + +.highlight .lineno { + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + cursor: default; +} + +.highlight .lineno::selection { background: transparent; } /* WebKit/Blink Browsers */ +.highlight .lineno::-moz-selection { background: transparent; } /* Gecko Browsers */ diff --git a/searx/static/default/css/style.css b/searx/static/default/css/style.css index 277f55e8d..f0e498db7 100644 --- a/searx/static/default/css/style.css +++ b/searx/static/default/css/style.css @@ -1,86 +1 @@ -html{font-family:sans-serif;font-size:.9em;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;-moz-text-size-adjust:100%;text-size-adjust:100%;color:#444;padding:0;margin:0} -body,#container{padding:0;margin:0} -#container{width:100%;position:absolute;top:0} -.search{padding:0;margin:0}.search .checkbox_container label{font-size:.9em;border-bottom:2px solid #e8e7e6} -.search .checkbox_container label:hover{border-bottom:2px solid #3498db} -.search .checkbox_container input[type="checkbox"]:checked+label{border-bottom:2px solid #2980b9} -#search_wrapper{position:relative;width:50em;padding:10px} -.center #search_wrapper{margin-left:auto;margin-right:auto} -.q{background:none repeat scroll 0 0 #fff;border:1px solid #3498db;color:#222;font-size:16px;height:28px;margin:0;outline:medium none;padding:2px;padding-left:8px;padding-right:0 !important;width:100%;z-index:2} -#search_submit{position:absolute;top:13px;right:1px;padding:0;border:0;background:url('../img/search-icon.png') no-repeat;background-size:24px 24px;opacity:.8;width:24px;height:30px;font-size:0} -@media screen and (max-width:50em){#search_wrapper{width:90%;clear:both;overflow:hidden}}ul.autocompleter-choices{position:absolute;margin:0;padding:0;list-style:none;border:1px solid #3498db;border-left-color:#3498db;border-right-color:#3498db;border-bottom-color:#3498db;text-align:left;font-family:Verdana,Geneva,Arial,Helvetica,sans-serif;z-index:50;background-color:#fff;color:#444}ul.autocompleter-choices li{position:relative;margin:-2px 0 0 0;padding:.2em 1.5em .2em 1em;display:block;float:none !important;cursor:pointer;font-weight:normal;white-space:nowrap;font-size:1em;line-height:1.5em}ul.autocompleter-choices li.autocompleter-selected{background-color:#444;color:#fff}ul.autocompleter-choices li.autocompleter-selected span.autocompleter-queried{color:#9fcfff} -ul.autocompleter-choices span.autocompleter-queried{display:inline;float:none;font-weight:bold;margin:0;padding:0} -.row{max-width:800px;margin:20px auto;text-align:justify}.row h1{font-size:3em;margin-top:50px} -.row p{padding:0 10px;max-width:700px} -.row h3,.row ul{margin:4px 8px} -.hmarg{margin:0 20px;border:1px solid #3498db;padding:4px 10px} -a:link.hmarg{color:#3498db} -a:visited.hmarg{color:#3498db} -a:active.hmarg{color:#3498db} -a:hover.hmarg{color:#3498db} -.top_margin{margin-top:60px} -.center{text-align:center} -h1{font-size:5em} -div.title{background:url('../img/searx.png') no-repeat;width:100%;min-height:80px;background-position:center}div.title h1{visibility:hidden} -input[type="submit"]{padding:2px 6px;margin:2px 4px;display:inline-block;background:#3498db;color:#fff;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;border:0;cursor:pointer} -input[type="checkbox"]{visibility:hidden} -fieldset{margin:8px;border:1px solid #3498db} -#categories{margin:0 10px;-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none} -.checkbox_container{display:inline-block;position:relative;margin:0 3px;padding:0}.checkbox_container input{display:none} -.checkbox_container label,.engine_checkbox label{cursor:pointer;padding:4px 10px;margin:0;display:block;text-transform:capitalize;-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none} -.checkbox_container input[type="checkbox"]:checked+label{background:#3498db;color:#fff} -.engine_checkbox{padding:4px} -label.allow{background:#e74c3c;padding:4px 8px;color:#fff;display:none} -label.deny{background:#2ecc71;padding:4px 8px;color:#444;display:inline} -.engine_checkbox input[type="checkbox"]:checked+label:nth-child(2)+label{display:none} -.engine_checkbox input[type="checkbox"]:checked+label.allow{display:inline} -a{text-decoration:none;color:#1a11be}a:visited{color:#8e44ad} -.result{margin:19px 0 18px 0;padding:0;clear:both} -.result_title{margin-bottom:0}.result_title a{color:#2980b9;font-weight:normal;font-size:1.1em}.result_title a:hover{text-decoration:underline} -.result_title a:visited{color:#8e44ad} -.cache_link{font-size:10px !important} -.result h3{font-size:1em;word-wrap:break-word;margin:5px 0 1px 0;padding:0} -.result .content{font-size:.8em;margin:0;padding:0;max-width:54em;word-wrap:break-word;line-height:1.24}.result .content img{float:left;margin-right:5px;max-width:200px;max-height:100px} -.result .content br.last{clear:both} -.result .url{font-size:.8em;margin:0 0 3px 0;padding:0;max-width:54em;word-wrap:break-word;color:#c0392b} -.result .published_date{font-size:.8em;color:#888;Margin:5px 20px} -.result .thumbnail{width:400px} -.engines{color:#888} -.small_font{font-size:.8em} -.small p{margin:2px 0} -.right{float:right} -.invisible{display:none} -.left{float:left} -.highlight{color:#094089} -.content .highlight{color:#000} -.image_result{display:inline-block;margin:10px 10px;position:relative;max-height:160px}.image_result img{border:0;max-height:160px} -.image_result p{margin:0;padding:0}.image_result p span a{display:none;color:#fff} -.image_result p:hover span a{display:block;position:absolute;bottom:0;right:0;padding:4px;background-color:rgba(0,0,0,0.6);font-size:.7em} -.torrent_result{border-left:10px solid #d3d3d3;padding-left:3px}.torrent_result p{margin:3px;font-size:.8em} -.definition_result{border-left:10px solid #808080;padding-left:3px} -.percentage{position:relative;width:300px}.percentage div{background:#444} -table{width:100%} -td{padding:0 4px} -tr:hover{background:#ddd} -#results{margin:auto;padding:0;width:50em;margin-bottom:20px} -#sidebar{position:fixed;bottom:10px;left:10px;margin:0 2px 5px 5px;padding:0 2px 2px 2px;width:14em}#sidebar input{padding:0;margin:3px;font-size:.8em;display:inline-block;background:transparent;color:#444;cursor:pointer} -#sidebar input[type="submit"]{text-decoration:underline} -#suggestions form{display:inline} -#suggestions,#answers{margin-top:20px;max-width:45em} -#suggestions input,#answers input,#infoboxes input{padding:0;margin:3px;font-size:.8em;display:inline-block;background:transparent;color:#444;cursor:pointer} -#suggestions input[type="submit"],#answers input[type="submit"],#infoboxes input[type="submit"]{text-decoration:underline} -#answers form,#infoboxes form{min-width:210px} -#infoboxes{position:absolute;top:100px;right:20px;margin:0 2px 5px 5px;padding:0 2px 2px;max-width:21em}#infoboxes .infobox{margin:10px 0 10px;border:1px solid #ddd;padding:5px;font-size:.8em;}#infoboxes .infobox img{max-width:20em;max-heigt:12em;display:block;margin:5px;padding:5px} -#infoboxes .infobox h2{margin:0} -#infoboxes .infobox table{width:auto}#infoboxes .infobox table td{vertical-align:top} -#infoboxes .infobox input{font-size:1em} -#infoboxes .infobox br{clear:both} -#search_url{margin-top:8px}#search_url input{border:1px solid #888;padding:4px;color:#444;width:14em;display:block;margin:4px;font-size:.8em} -#preferences{top:10px;padding:0;border:0;background:url('../img/preference-icon.png') no-repeat;background-size:28px 28px;opacity:.8;width:28px;height:30px;display:block}#preferences *{display:none} -#pagination{clear:both}#pagination br{clear:both} -#apis{margin-top:8px;clear:both} -#categories_container{position:relative} -@media screen and (max-width:50em){#results{margin:auto;padding:0;width:90%} .github{display:none} .checkbox_container{display:block;width:90%}.checkbox_container label{border-bottom:0} .preferences_container{display:none;postion:fixed !important;top:100px;right:0}}@media screen and (max-width:75em){div.title h1{font-size:1em} html.touch #categories{width:95%;height:30px;text-align:left;overflow-x:scroll;overflow-y:hidden;-webkit-overflow-scrolling:touch}html.touch #categories #categories_container{width:1000px;width:-moz-max-content;width:-webkit-max-content;width:max-content}html.touch #categories #categories_container .checkbox_container{display:inline-block;width:auto} #categories{font-size:90%;clear:both}#categories .checkbox_container{margin-top:2px;margin:auto} #suggestions,#answers{margin-top:5px} #infoboxes{position:inherit;max-width:inherit}#infoboxes .infobox{clear:both}#infoboxes .infobox img{float:left;max-width:10em} #categories{font-size:90%;clear:both}#categories .checkbox_container{margin-top:2px;margin:auto} #sidebar{position:static;max-width:50em;margin:0 0 2px 0;padding:0;float:none;border:none;width:auto}#sidebar input{border:0} #apis{display:none} #search_url{display:none} .result{border-top:1px solid #e8e7e6;margin:8px 0 8px 0}.result .thumbnail{max-width:98%} .image_result{max-width:98%}.image_result img{max-width:98%}}.favicon{float:left;margin-right:4px;margin-top:2px} -.preferences_back{background:none repeat scroll 0 0 #3498db;border:0 none;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;cursor:pointer;display:inline-block;margin:2px 4px;padding:4px 6px}.preferences_back a{color:#fff} -.hidden{opacity:0;overflow:hidden;font-size:.8em;position:absolute;bottom:-20px;width:100%;text-position:center;background:#fff;transition:opacity 1s ease} -#categories_container:hover .hidden{transition:opacity 1s ease;opacity:.8} +.highlight .hll{background-color:#ffc}.highlight{background:#f8f8f8}.highlight .c{color:#408080;font-style:italic}.highlight .err{border:1px solid #f00}.highlight .k{color:#008000;font-weight:bold}.highlight .o{color:#666}.highlight .cm{color:#408080;font-style:italic}.highlight .cp{color:#bc7a00}.highlight .c1{color:#408080;font-style:italic}.highlight .cs{color:#408080;font-style:italic}.highlight .gd{color:#a00000}.highlight .ge{font-style:italic}.highlight .gr{color:#f00}.highlight .gh{color:#000080;font-weight:bold}.highlight .gi{color:#00a000}.highlight .go{color:#888}.highlight .gp{color:#000080;font-weight:bold}.highlight .gs{font-weight:bold}.highlight .gu{color:#800080;font-weight:bold}.highlight .gt{color:#04d}.highlight .kc{color:#008000;font-weight:bold}.highlight .kd{color:#008000;font-weight:bold}.highlight .kn{color:#008000;font-weight:bold}.highlight .kp{color:#008000}.highlight .kr{color:#008000;font-weight:bold}.highlight .kt{color:#b00040}.highlight .m{color:#666}.highlight .s{color:#ba2121}.highlight .na{color:#7d9029}.highlight .nb{color:#008000}.highlight .nc{color:#00f;font-weight:bold}.highlight .no{color:#800}.highlight .nd{color:#a2f}.highlight .ni{color:#999;font-weight:bold}.highlight .ne{color:#d2413a;font-weight:bold}.highlight .nf{color:#00f}.highlight .nl{color:#a0a000}.highlight .nn{color:#00f;font-weight:bold}.highlight .nt{color:#008000;font-weight:bold}.highlight .nv{color:#19177c}.highlight .ow{color:#a2f;font-weight:bold}.highlight .w{color:#bbb}.highlight .mf{color:#666}.highlight .mh{color:#666}.highlight .mi{color:#666}.highlight .mo{color:#666}.highlight .sb{color:#ba2121}.highlight .sc{color:#ba2121}.highlight .sd{color:#ba2121;font-style:italic}.highlight .s2{color:#ba2121}.highlight .se{color:#b62;font-weight:bold}.highlight .sh{color:#ba2121}.highlight .si{color:#b68;font-weight:bold}.highlight .sx{color:#008000}.highlight .sr{color:#b68}.highlight .s1{color:#ba2121}.highlight .ss{color:#19177c}.highlight .bp{color:#008000}.highlight .vc{color:#19177c}.highlight .vg{color:#19177c}.highlight .vi{color:#19177c}.highlight .il{color:#666}.highlight pre{overflow:auto}.highlight .lineno{-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;cursor:default}.highlight .lineno::selection{background:transparent}.highlight .lineno::-moz-selection{background:transparent}html{font-family:sans-serif;font-size:.9em;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;-moz-text-size-adjust:100%;text-size-adjust:100%;color:#444;padding:0;margin:0}body,#container{padding:0;margin:0}#container{width:100%;position:absolute;top:0}.search{padding:0;margin:0}.search .checkbox_container label{font-size:.9em;border-bottom:2px solid #e8e7e6}.search .checkbox_container label:hover{border-bottom:2px solid #3498db}.search .checkbox_container input[type="checkbox"]:checked+label{border-bottom:2px solid #2980b9}#search_wrapper{position:relative;width:50em;padding:10px}.center #search_wrapper{margin-left:auto;margin-right:auto}.q{background:none repeat scroll 0 0 #fff;border:1px solid #3498db;color:#222;font-size:16px;height:28px;margin:0;outline:medium none;padding:2px;padding-left:8px;padding-right:0 !important;width:100%;z-index:2}#search_submit{position:absolute;top:13px;right:1px;padding:0;border:0;background:url('../img/search-icon.png') no-repeat;background-size:24px 24px;opacity:.8;width:24px;height:30px;font-size:0}@media screen and (max-width:50em){#search_wrapper{width:90%;clear:both;overflow:hidden}}ul.autocompleter-choices{position:absolute;margin:0;padding:0;list-style:none;border:1px solid #3498db;border-left-color:#3498db;border-right-color:#3498db;border-bottom-color:#3498db;text-align:left;font-family:Verdana,Geneva,Arial,Helvetica,sans-serif;z-index:50;background-color:#fff;color:#444}ul.autocompleter-choices li{position:relative;margin:-2px 0 0 0;padding:.2em 1.5em .2em 1em;display:block;float:none !important;cursor:pointer;font-weight:normal;white-space:nowrap;font-size:1em;line-height:1.5em}ul.autocompleter-choices li.autocompleter-selected{background-color:#444;color:#fff}ul.autocompleter-choices li.autocompleter-selected span.autocompleter-queried{color:#9fcfff}ul.autocompleter-choices span.autocompleter-queried{display:inline;float:none;font-weight:bold;margin:0;padding:0}.row{max-width:800px;margin:20px auto;text-align:justify}.row h1{font-size:3em;margin-top:50px}.row p{padding:0 10px;max-width:700px}.row h3,.row ul{margin:4px 8px}.hmarg{margin:0 20px;border:1px solid #3498db;padding:4px 10px}a:link.hmarg{color:#3498db}a:visited.hmarg{color:#3498db}a:active.hmarg{color:#3498db}a:hover.hmarg{color:#3498db}.top_margin{margin-top:60px}.center{text-align:center}h1{font-size:5em}div.title{background:url('../img/searx.png') no-repeat;width:100%;min-height:80px;background-position:center}div.title h1{visibility:hidden}input[type="submit"]{padding:2px 6px;margin:2px 4px;display:inline-block;background:#3498db;color:#fff;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;border:0;cursor:pointer}input[type="checkbox"]{visibility:hidden}fieldset{margin:8px;border:1px solid #3498db}#categories{margin:0 10px;-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.checkbox_container{display:inline-block;position:relative;margin:0 3px;padding:0}.checkbox_container input{display:none}.checkbox_container label,.engine_checkbox label{cursor:pointer;padding:4px 10px;margin:0;display:block;text-transform:capitalize;-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.checkbox_container input[type="checkbox"]:checked+label{background:#3498db;color:#fff}.engine_checkbox{padding:4px}label.allow{background:#e74c3c;padding:4px 8px;color:#fff;display:none}label.deny{background:#2ecc71;padding:4px 8px;color:#444;display:inline}.engine_checkbox input[type="checkbox"]:checked+label:nth-child(2)+label{display:none}.engine_checkbox input[type="checkbox"]:checked+label.allow{display:inline}a{text-decoration:none;color:#1a11be}a:visited{color:#8e44ad}.result{margin:19px 0 18px 0;padding:0;clear:both}.result_title{margin-bottom:0}.result_title a{color:#2980b9;font-weight:normal;font-size:1.1em}.result_title a:hover{text-decoration:underline}.result_title a:visited{color:#8e44ad}.cache_link{font-size:10px !important}.result h3{font-size:1em;word-wrap:break-word;margin:5px 0 1px 0;padding:0}.result .content{font-size:.8em;margin:0;padding:0;max-width:54em;word-wrap:break-word;line-height:1.24}.result .content img{float:left;margin-right:5px;max-width:200px;max-height:100px}.result .content br.last{clear:both}.result .url{font-size:.8em;margin:0 0 3px 0;padding:0;max-width:54em;word-wrap:break-word;color:#c0392b}.result .published_date{font-size:.8em;color:#888;Margin:5px 20px}.result .thumbnail{width:400px}.engines{color:#888}.small_font{font-size:.8em}.small p{margin:2px 0}.right{float:right}.invisible{display:none}.left{float:left}.highlight{color:#094089}.content .highlight{color:#000}.image_result{display:inline-block;margin:10px 10px;position:relative;max-height:160px}.image_result img{border:0;max-height:160px}.image_result p{margin:0;padding:0}.image_result p span a{display:none;color:#fff}.image_result p:hover span a{display:block;position:absolute;bottom:0;right:0;padding:4px;background-color:rgba(0,0,0,0.6);font-size:.7em}.torrent_result{border-left:10px solid lightgray;padding-left:3px}.torrent_result p{margin:3px;font-size:.8em}.definition_result{border-left:10px solid gray;padding-left:3px}.percentage{position:relative;width:300px}.percentage div{background:#444}table{width:100%}td{padding:0 4px}tr:hover{background:#ddd}#results{margin:auto;padding:0;width:50em;margin-bottom:20px}#sidebar{position:fixed;bottom:10px;left:10px;margin:0 2px 5px 5px;padding:0 2px 2px 2px;width:14em}#sidebar input{padding:0;margin:3px;font-size:.8em;display:inline-block;background:transparent;color:#444;cursor:pointer}#sidebar input[type="submit"]{text-decoration:underline}#suggestions form{display:inline}#suggestions,#answers{margin-top:20px;max-width:45em}#suggestions input,#answers input,#infoboxes input{padding:0;margin:3px;font-size:.8em;display:inline-block;background:transparent;color:#444;cursor:pointer}#suggestions input[type="submit"],#answers input[type="submit"],#infoboxes input[type="submit"]{text-decoration:underline}#answers form,#infoboxes form{min-width:210px}#infoboxes{position:absolute;top:100px;right:20px;margin:0 2px 5px 5px;padding:0 2px 2px;max-width:21em}#infoboxes .infobox{margin:10px 0 10px;border:1px solid #ddd;padding:5px;font-size:.8em}#infoboxes .infobox img{max-width:20em;max-heigt:12em;display:block;margin:5px;padding:5px}#infoboxes .infobox h2{margin:0}#infoboxes .infobox table{width:auto}#infoboxes .infobox table td{vertical-align:top}#infoboxes .infobox input{font-size:1em}#infoboxes .infobox br{clear:both}#search_url{margin-top:8px}#search_url input{border:1px solid #888;padding:4px;color:#444;width:14em;display:block;margin:4px;font-size:.8em}#preferences{top:10px;padding:0;border:0;background:url('../img/preference-icon.png') no-repeat;background-size:28px 28px;opacity:.8;width:28px;height:30px;display:block}#preferences *{display:none}#pagination{clear:both}#pagination br{clear:both}#apis{margin-top:8px;clear:both}#categories_container{position:relative}@media screen and (max-width:50em){#results{margin:auto;padding:0;width:90%}.github{display:none}.checkbox_container{display:block;width:90%}.checkbox_container label{border-bottom:0}.preferences_container{display:none;postion:fixed !important;top:100px;right:0}}@media screen and (max-width:75em){div.title h1{font-size:1em}html.touch #categories{width:95%;height:30px;text-align:left;overflow-x:scroll;overflow-y:hidden;-webkit-overflow-scrolling:touch}html.touch #categories #categories_container{width:1000px;width:-moz-max-content;width:-webkit-max-content;width:max-content}html.touch #categories #categories_container .checkbox_container{display:inline-block;width:auto}#categories{font-size:90%;clear:both}#categories .checkbox_container{margin-top:2px;margin:auto}#suggestions,#answers{margin-top:5px}#infoboxes{position:inherit;max-width:inherit}#infoboxes .infobox{clear:both}#infoboxes .infobox img{float:left;max-width:10em}#categories{font-size:90%;clear:both}#categories .checkbox_container{margin-top:2px;margin:auto}#sidebar{position:static;max-width:50em;margin:0 0 2px 0;padding:0;float:none;border:none;width:auto}#sidebar input{border:0}#apis{display:none}#search_url{display:none}.result{border-top:1px solid #e8e7e6;margin:8px 0 8px 0}.result .thumbnail{max-width:98%}.image_result{max-width:98%}.image_result img{max-width:98%}}.favicon{float:left;margin-right:4px;margin-top:2px}.preferences_back{background:none repeat scroll 0 0 #3498db;border:0 none;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;cursor:pointer;display:inline-block;margin:2px 4px;padding:4px 6px}.preferences_back a{color:#fff}.hidden{opacity:0;overflow:hidden;font-size:.8em;position:absolute;bottom:-20px;width:100%;text-position:center;background:white;transition:opacity 1s ease}#categories_container:hover .hidden{transition:opacity 1s ease;opacity:.8} \ No newline at end of file diff --git a/searx/static/default/less/code.less b/searx/static/default/less/code.less new file mode 100644 index 000000000..a688dd98d --- /dev/null +++ b/searx/static/default/less/code.less @@ -0,0 +1,83 @@ +.highlight .hll { background-color: #ffffcc } +.highlight { background: #f8f8f8; } +.highlight .c { color: #408080; font-style: italic } /* Comment */ +.highlight .err { border: 1px solid #FF0000 } /* Error */ +.highlight .k { color: #008000; font-weight: bold } /* Keyword */ +.highlight .o { color: #666666 } /* Operator */ +.highlight .cm { color: #408080; font-style: italic } /* Comment.Multiline */ +.highlight .cp { color: #BC7A00 } /* Comment.Preproc */ +.highlight .c1 { color: #408080; font-style: italic } /* Comment.Single */ +.highlight .cs { color: #408080; font-style: italic } /* Comment.Special */ +.highlight .gd { color: #A00000 } /* Generic.Deleted */ +.highlight .ge { font-style: italic } /* Generic.Emph */ +.highlight .gr { color: #FF0000 } /* Generic.Error */ +.highlight .gh { color: #000080; font-weight: bold } /* Generic.Heading */ +.highlight .gi { color: #00A000 } /* Generic.Inserted */ +.highlight .go { color: #888888 } /* Generic.Output */ +.highlight .gp { color: #000080; font-weight: bold } /* Generic.Prompt */ +.highlight .gs { font-weight: bold } /* Generic.Strong */ +.highlight .gu { color: #800080; font-weight: bold } /* Generic.Subheading */ +.highlight .gt { color: #0044DD } /* Generic.Traceback */ +.highlight .kc { color: #008000; font-weight: bold } /* Keyword.Constant */ +.highlight .kd { color: #008000; font-weight: bold } /* Keyword.Declaration */ +.highlight .kn { color: #008000; font-weight: bold } /* Keyword.Namespace */ +.highlight .kp { color: #008000 } /* Keyword.Pseudo */ +.highlight .kr { color: #008000; font-weight: bold } /* Keyword.Reserved */ +.highlight .kt { color: #B00040 } /* Keyword.Type */ +.highlight .m { color: #666666 } /* Literal.Number */ +.highlight .s { color: #BA2121 } /* Literal.String */ +.highlight .na { color: #7D9029 } /* Name.Attribute */ +.highlight .nb { color: #008000 } /* Name.Builtin */ +.highlight .nc { color: #0000FF; font-weight: bold } /* Name.Class */ +.highlight .no { color: #880000 } /* Name.Constant */ +.highlight .nd { color: #AA22FF } /* Name.Decorator */ +.highlight .ni { color: #999999; font-weight: bold } /* Name.Entity */ +.highlight .ne { color: #D2413A; font-weight: bold } /* Name.Exception */ +.highlight .nf { color: #0000FF } /* Name.Function */ +.highlight .nl { color: #A0A000 } /* Name.Label */ +.highlight .nn { color: #0000FF; font-weight: bold } /* Name.Namespace */ +.highlight .nt { color: #008000; font-weight: bold } /* Name.Tag */ +.highlight .nv { color: #19177C } /* Name.Variable */ +.highlight .ow { color: #AA22FF; font-weight: bold } /* Operator.Word */ +.highlight .w { color: #bbbbbb } /* Text.Whitespace */ +.highlight .mf { color: #666666 } /* Literal.Number.Float */ +.highlight .mh { color: #666666 } /* Literal.Number.Hex */ +.highlight .mi { color: #666666 } /* Literal.Number.Integer */ +.highlight .mo { color: #666666 } /* Literal.Number.Oct */ +.highlight .sb { color: #BA2121 } /* Literal.String.Backtick */ +.highlight .sc { color: #BA2121 } /* Literal.String.Char */ +.highlight .sd { color: #BA2121; font-style: italic } /* Literal.String.Doc */ +.highlight .s2 { color: #BA2121 } /* Literal.String.Double */ +.highlight .se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */ +.highlight .sh { color: #BA2121 } /* Literal.String.Heredoc */ +.highlight .si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */ +.highlight .sx { color: #008000 } /* Literal.String.Other */ +.highlight .sr { color: #BB6688 } /* Literal.String.Regex */ +.highlight .s1 { color: #BA2121 } /* Literal.String.Single */ +.highlight .ss { color: #19177C } /* Literal.String.Symbol */ +.highlight .bp { color: #008000 } /* Name.Builtin.Pseudo */ +.highlight .vc { color: #19177C } /* Name.Variable.Class */ +.highlight .vg { color: #19177C } /* Name.Variable.Global */ +.highlight .vi { color: #19177C } /* Name.Variable.Instance */ +.highlight .il { color: #666666 } /* Literal.Number.Integer.Long */ + +.highlight pre { + overflow: auto; +} + +.highlight .lineno { + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + cursor: default; + + &::selection { + background: transparent; /* WebKit/Blink Browsers */ + } + &::-moz-selection { + background: transparent; /* Gecko Browsers */ + } +} diff --git a/searx/static/default/less/style.less b/searx/static/default/less/style.less index 9851b1305..bae4f2749 100644 --- a/searx/static/default/less/style.less +++ b/searx/static/default/less/style.less @@ -8,6 +8,8 @@ @import "mixins.less"; +@import "code.less"; + // Main LESS-Code html { diff --git a/searx/static/oscar/css/bootstrap.min.css b/searx/static/oscar/css/bootstrap.min.css index a9f57473e2c7f2439218d29bcbdccbcd56657af6..691604be6ac3671e5df785c4720f3adeba26acf2 100644 GIT binary patch delta 10917 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 XRyf&hZmSpUd$64@UW#l^PjCJY;C1v7 delta 190 zcmew-wT)wfx)fJZeoAF^Zeme-W}a?Reo0Awu9byBK}9XsM0+bnu8Eb7Kw_6SBiCeB z#uy-($QS}7w=x1nCNW6^nbJ(EK+=K921wR0Ntto!6{QxJ=9K7` +

{% if result['favicon'] %}{{result['favicon']}}{% endif %}{{ result.title|safe }}

+

{{ result.pretty_url }} cached

+ {% if result.publishedDate %}

{{ result.publishedDate }}

{% endif %} +

{% if result.img_src %}{% endif %}{% if result.content %}{{ result.content|safe }}
{% endif %}

+ {% if result.repository %}

{{ result.repository }}

{% endif %} + + {{ result.codelines|code_highlighter(result.code_language)|safe }} + diff --git a/searx/templates/default/result_templates/code.html b/searx/templates/default/result_templates/code.html new file mode 100644 index 000000000..616b7ea62 --- /dev/null +++ b/searx/templates/default/result_templates/code.html @@ -0,0 +1,9 @@ +
+

{% if result['favicon'] %}{{result['favicon']}}{% endif %}{{ result.title|safe }}

+

{{ result.pretty_url }} cached

+ {% if result.publishedDate %}

{{ result.publishedDate }}

{% endif %} +

{% if result.img_src %}{% endif %}{% if result.content %}{{ result.content|safe }}
{% endif %}

+ {% if result.repository %}

{{ result.repository }}

{% endif %} + + {{ result.codelines|code_highlighter(result.code_language)|safe }} +
diff --git a/searx/templates/oscar/result_templates/code.html b/searx/templates/oscar/result_templates/code.html new file mode 100644 index 000000000..d9079a464 --- /dev/null +++ b/searx/templates/oscar/result_templates/code.html @@ -0,0 +1,17 @@ +{% from 'oscar/macros.html' import icon %} + +

{% if result['favicon'] %}{{ result['favicon'] }} {% endif %}{{ result.title|safe }}

+ +{% if result.publishedDate %}{% endif %} +{{ icon('link') }} {{ _('cached') }} + +{% if result.content %}

{{ result.content|safe }}

{% endif %} + +{% if result.repository %}

{{ icon('file') }} {{ result.repository }}

{% endif %} + +{{ result.codelines|code_highlighter(result.code_language)|safe }} + +
+ +{{ result.engine }} +

{{ result.pretty_url }}

diff --git a/searx/webapp.py b/searx/webapp.py index 915fb3564..11db1bf2e 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -33,6 +33,9 @@ from flask import ( redirect, send_from_directory ) from flask.ext.babel import Babel, gettext, format_date +from pygments import highlight +from pygments.lexers import get_lexer_by_name +from pygments.formatters import HtmlFormatter from searx import settings, searx_dir from searx.engines import ( categories, engines, get_engines_stats, engine_shortcuts @@ -90,6 +93,49 @@ def get_locale(): return locale +# code-highlighter +@app.template_filter('code_highlighter') +def code_highlighter(codelines, language=None): + if not language: + language = 'text' + + # find lexer by programing language + lexer = get_lexer_by_name(language, stripall=True) + + html_code = '' + tmp_code = '' + last_line = None + + # parse lines + for line, code in codelines: + if not last_line: + line_code_start = line + + # new codeblock is detected + if last_line != None and\ + last_line +1 != line: + + # highlight last codepart + formatter = HtmlFormatter(linenos='inline', linenostart=line_code_start) + html_code = html_code + highlight(tmp_code, lexer, formatter) + + # reset conditions for next codepart + tmp_code = '' + line_code_start = line + + # add codepart + tmp_code += code + '\n' + + # update line + last_line = line + + # highlight last codepart + formatter = HtmlFormatter(linenos='inline', linenostart=line_code_start) + html_code = html_code + highlight(tmp_code, lexer, formatter) + + return html_code + + def get_base_url(): if settings['server']['base_url']: hostname = settings['server']['base_url'] diff --git a/setup.py b/setup.py index d976a31f7..1c1a19ddf 100644 --- a/setup.py +++ b/setup.py @@ -44,6 +44,7 @@ setup( 'requests', 'lxml', 'pyyaml', + 'pygments', 'setuptools', 'python-dateutil', ], diff --git a/versions.cfg b/versions.cfg index 2f5dae8ee..7f1734908 100644 --- a/versions.cfg +++ b/versions.cfg @@ -4,6 +4,7 @@ Flask = 0.10.1 Flask-Babel = 0.9 Jinja2 = 2.7.2 MarkupSafe = 0.18 +Pygments = 2.0.1 WebOb = 1.3.1 WebTest = 2.0.11 Werkzeug = 0.9.4 From 7b44fd47a72ab0c9a4c586193757a4f195bb5fe4 Mon Sep 17 00:00:00 2001 From: Thomas Pointhuber Date: Mon, 22 Dec 2014 15:28:23 +0100 Subject: [PATCH 2/7] [enh] improve grunt-file for oscar_template --- searx/static/oscar/css/bootstrap.min.css | Bin 114586 -> 113911 bytes searx/static/oscar/css/oscar.min.css | Bin 3454 -> 3387 bytes searx/static/oscar/gruntfile.js | 43 +++++++++++++++++++++-- searx/static/oscar/js/searx.min.js | Bin 5026 -> 5026 bytes searx/static/oscar/package.json | 3 +- 5 files changed, 42 insertions(+), 4 deletions(-) diff --git a/searx/static/oscar/css/bootstrap.min.css b/searx/static/oscar/css/bootstrap.min.css index 691604be6ac3671e5df785c4720f3adeba26acf2..fb0e84ae429d9fe45130887dafe747f77cfa7f31 100644 GIT binary patch delta 5892 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 diff --git a/searx/static/oscar/css/oscar.min.css b/searx/static/oscar/css/oscar.min.css index 6ca433a3392109364ed4dfcb0f1ae66cecabc514..28f66e3d35d1f10b889eeeed6dafec986f92e421 100644 GIT binary patch delta 666 zcmew-wOeY#21aIc1B1z17~R42e@4^Irc7HIC%k|cIMS*0n)Vqj*IFd delta 693 zcmdlj^-pTU21b^o{G61@n;G39jK7Sgj0&5Ln6@%9DolRPtO+CqSmv=Prx_Sb-pC>< zp=@AaVPIfjotB?hqFbJtnVwN%1u|jtZ5DAxBapIMy$qme4oF5pFFm6=IX@@A$O@8?{e2wb;weTZhQ^7Qie7UBIAH2U zwWb7N4OXvBF6T56Ni@PVX7WDHOKeGrMutX)lLcAjCvW9a7fCWR!gR%ZE)&BfGYbp} w6n7L?pt@snAa@o!G+Z_x;C5x?E-6aPD=tVZO3f>oY{(-#S(;ad2T80J0F9mKU;qFB diff --git a/searx/static/oscar/gruntfile.js b/searx/static/oscar/gruntfile.js index 79da491c4..c591e8505 100644 --- a/searx/static/oscar/gruntfile.js +++ b/searx/static/oscar/gruntfile.js @@ -33,9 +33,43 @@ module.exports = function(grunt) { } } }, + less: { + development: { + options: { + paths: ["less/oscar"] + //banner: '/*! less/oscar/oscar.css | <%= grunt.template.today("dd-mm-yyyy") %> | https://github.com/asciimoo/searx */\n' + }, + files: {"css/oscar.css": "less/oscar/oscar.less"} + }, + production: { + options: { + paths: ["less/oscar"], + //banner: '/*! less/oscar/oscar.css | <%= grunt.template.today("dd-mm-yyyy") %> | https://github.com/asciimoo/searx */\n', + cleancss: true + }, + files: {"css/oscar.min.css": "less/oscar/oscar.less"} + }, + bootstrap: { + options: { + paths: ["less/bootstrap"], + cleancss: true + }, + files: {"css/bootstrap.min.css": "less/bootstrap/bootstrap.less"} + }, + }, watch: { - files: ['<%= jshint.files %>'], - tasks: ['jshint'] + scripts: { + files: ['<%= jshint.files %>'], + tasks: ['jshint', 'concat', 'uglify'] + }, + oscar_styles: { + files: ['less/oscar/**/*.less'], + tasks: ['less:development', 'less:production'] + }, + bootstrap_styles: { + files: ['less/bootstrap/**/*.less'], + tasks: ['less:bootstrap'] + } } }); @@ -43,9 +77,12 @@ module.exports = function(grunt) { grunt.loadNpmTasks('grunt-contrib-jshint'); grunt.loadNpmTasks('grunt-contrib-watch'); grunt.loadNpmTasks('grunt-contrib-concat'); + grunt.loadNpmTasks('grunt-contrib-less'); grunt.registerTask('test', ['jshint']); - grunt.registerTask('default', ['jshint', 'concat', 'uglify']); + grunt.registerTask('default', ['jshint', 'concat', 'uglify', 'less']); + + grunt.registerTask('styles', ['less']); }; diff --git a/searx/static/oscar/js/searx.min.js b/searx/static/oscar/js/searx.min.js index 2fba710630d38cc0c3eaf502750699834ac52550..0b3aa73f9e799a3252ab027a2cb7d26e57bb92ed 100644 GIT binary patch delta 13 UcmZ3azDRw7B$JWRM(K8803O){2mk;8 delta 13 UcmZ3azDRw7B$J`#M(K8803P-P4gdfE diff --git a/searx/static/oscar/package.json b/searx/static/oscar/package.json index 945b7943d..7eae9df2b 100644 --- a/searx/static/oscar/package.json +++ b/searx/static/oscar/package.json @@ -4,7 +4,8 @@ "grunt-contrib-uglify": "~0.6.0", "grunt-contrib-watch" : "~0.6.1", "grunt-contrib-concat" : "~0.5.0", - "grunt-contrib-jshint" : "~0.10.0" + "grunt-contrib-jshint" : "~0.10.0", + "grunt-contrib-less" : "~0.11.0" }, "scripts": { From d810763107733cec017b8688c0350dff527f2ed1 Mon Sep 17 00:00:00 2001 From: Thomas Pointhuber Date: Mon, 22 Dec 2014 16:07:02 +0100 Subject: [PATCH 3/7] [enh] remove repeating codeparts inside the oscar template --- searx/static/oscar/css/oscar.min.css | Bin 3387 -> 3411 bytes searx/static/oscar/less/oscar/results.less | 5 ++++ searx/templates/oscar/macros.html | 25 ++++++++++++++++++ .../oscar/result_templates/code.html | 13 +++------ .../oscar/result_templates/default.html | 13 +++------ .../oscar/result_templates/images.html | 4 ++- .../templates/oscar/result_templates/map.html | 14 +++------- .../oscar/result_templates/torrent.html | 13 +++------ .../oscar/result_templates/videos.html | 13 +++------ 9 files changed, 53 insertions(+), 47 deletions(-) diff --git a/searx/static/oscar/css/oscar.min.css b/searx/static/oscar/css/oscar.min.css index 28f66e3d35d1f10b889eeeed6dafec986f92e421..970850a4a87c18d1c576152530c6cb7bd79200b2 100644 GIT binary patch delta 24 fcmdljby;e|aVGAf)Z)^d65Ztdl+?|;m>RhNemDuJ delta 12 TcmcaCwOeY#ai-1pnM$|-CN>35 diff --git a/searx/static/oscar/less/oscar/results.less b/searx/static/oscar/less/oscar/results.less index 08500b3ff..cea8f3b41 100644 --- a/searx/static/oscar/less/oscar/results.less +++ b/searx/static/oscar/less/oscar/results.less @@ -55,6 +55,11 @@ clear: both; } +// code formating of results +.result-code { + clear: both; +} + // suggestion .suggestion_item { margin: 2px 5px; diff --git a/searx/templates/oscar/macros.html b/searx/templates/oscar/macros.html index f61de2015..1dc696341 100644 --- a/searx/templates/oscar/macros.html +++ b/searx/templates/oscar/macros.html @@ -1,3 +1,28 @@ + {% macro icon(action) -%} {%- endmacro %} + + + +{% macro draw_favicon(favicon) -%} + {{ favicon }} +{%- endmacro %} + + +{% macro result_header(result) -%} +

{% if result.favicon %}{{ draw_favicon(result.favicon) }} {% endif %}{{ result.title|safe }}

+{%- endmacro %} + + +{% macro result_sub_header(result) -%} + {% if result.publishedDate %}{% endif %} + {{ icon('link') }} {{ _('cached') }} +{%- endmacro %} + + +{% macro result_footer(result) -%} +
+ {{ result.engine }} +

{{ result.pretty_url }}

+{%- endmacro %} diff --git a/searx/templates/oscar/result_templates/code.html b/searx/templates/oscar/result_templates/code.html index d9079a464..236834d0a 100644 --- a/searx/templates/oscar/result_templates/code.html +++ b/searx/templates/oscar/result_templates/code.html @@ -1,9 +1,7 @@ -{% from 'oscar/macros.html' import icon %} +{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, icon %} -

{% if result['favicon'] %}{{ result['favicon'] }} {% endif %}{{ result.title|safe }}

- -{% if result.publishedDate %}{% endif %} -{{ icon('link') }} {{ _('cached') }} +{{ result_header(result) }} +{{ result_sub_header(result) }} {% if result.content %}

{{ result.content|safe }}

{% endif %} @@ -11,7 +9,4 @@ {{ result.codelines|code_highlighter(result.code_language)|safe }} -
- -{{ result.engine }} -

{{ result.pretty_url }}

+{{ result_footer(result) }} diff --git a/searx/templates/oscar/result_templates/default.html b/searx/templates/oscar/result_templates/default.html index 0f090d862..bc967f01e 100644 --- a/searx/templates/oscar/result_templates/default.html +++ b/searx/templates/oscar/result_templates/default.html @@ -1,13 +1,8 @@ -{% from 'oscar/macros.html' import icon %} +{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer %} -

{% if result['favicon'] %}{{ result['favicon'] }} {% endif %}{{ result.title|safe }}

- -{% if result.publishedDate %}{% endif %} -{{ icon('link') }} {{ _('cached') }} +{{ result_header(result) }} +{{ result_sub_header(result) }} {% if result.content %}

{{ result.content|safe }}

{% endif %} -
- -{{ result.engine }} -

{{ result.pretty_url }}

+{{ result_footer(result) }} diff --git a/searx/templates/oscar/result_templates/images.html b/searx/templates/oscar/result_templates/images.html index 7689f9f58..69c2e6fff 100644 --- a/searx/templates/oscar/result_templates/images.html +++ b/searx/templates/oscar/result_templates/images.html @@ -1,3 +1,5 @@ +{% from 'oscar/macros.html' import draw_favicon %} + {{ result.title|striptags }} @@ -7,7 +9,7 @@
-

{% if result['favicon'] %}{{ result['favicon'] }} {% endif %}{{ result.title|striptags }}

+

{% if result['favicon'] %}{{ draw_favicon(result['favicon']) }} {% endif %}{{ result.title|striptags }}

{{ result.title }} diff --git a/searx/templates/oscar/result_templates/map.html b/searx/templates/oscar/result_templates/map.html index 343e713c8..6dfee52ba 100644 --- a/searx/templates/oscar/result_templates/map.html +++ b/searx/templates/oscar/result_templates/map.html @@ -1,10 +1,7 @@ -{% from 'oscar/macros.html' import icon %} +{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, icon %} -

{% if result['favicon'] %}{{ result['favicon'] }} {% endif %}{{ result.title|safe }}

- -{% if result.publishedDate %}{% endif %} - -{{ icon('link') }} {{ _('cached') }} +{{ result_header(result) }} +{{ result_sub_header(result) }} {% if (result.latitude and result.longitude) or result.boundingbox %} • @@ -68,7 +65,4 @@
{% endif %} -
- -{{ result.engine }} -

{{ result.pretty_url }}

+{{ result_footer(result) }} diff --git a/searx/templates/oscar/result_templates/torrent.html b/searx/templates/oscar/result_templates/torrent.html index 1e133e3c4..da745c7ab 100644 --- a/searx/templates/oscar/result_templates/torrent.html +++ b/searx/templates/oscar/result_templates/torrent.html @@ -1,9 +1,7 @@ -{% from 'oscar/macros.html' import icon %} +{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, icon %} -

{% if result['favicon'] %}{{ result['favicon'] }} {% endif %}{{ result.title|safe }}

- -{% if result.publishedDate %}{% endif %} -{{ icon('link') }} {{ _('cached') }} +{{ result_header(result) }} +{{ result_sub_header(result) }}

{{ icon('transfer') }} {{ _('Seeder') }} {{ result.seed }}, {{ _('Leecher') }} {{ result.leech }}
@@ -11,7 +9,4 @@ {% if result.content %}

{{ result.content|safe }}

{% endif %} -
- -{{ result.engine }} -

{{ result.pretty_url }}

+{{ result_footer(result) }} diff --git a/searx/templates/oscar/result_templates/videos.html b/searx/templates/oscar/result_templates/videos.html index 06275b86a..83d065e4c 100644 --- a/searx/templates/oscar/result_templates/videos.html +++ b/searx/templates/oscar/result_templates/videos.html @@ -1,9 +1,7 @@ -{% from 'oscar/macros.html' import icon %} +{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer %} -

{% if result['favicon'] %}{{ result['favicon'] }} {% endif %}{{ result.title|safe }}

- -{% if result.publishedDate %}{% endif %} -{{ icon('link') }} {{ _('cached') }} +{{ result_header(result) }} +{{ result_sub_header(result) }}
@@ -12,7 +10,4 @@
-
- -{{ result.engine }} -

{{ result.pretty_url }}

+{{ result_footer(result) }} From af8dac93a8acff5042b7b399c38e348f0bdc32ad Mon Sep 17 00:00:00 2001 From: Thomas Pointhuber Date: Mon, 22 Dec 2014 16:26:45 +0100 Subject: [PATCH 4/7] [enh] fix pep8, improve syntax highlighting --- searx/engines/searchcode_code.py | 24 +++++++++--------------- searx/engines/searchcode_doc.py | 11 +++++++---- searx/webapp.py | 21 +++++++++++++-------- 3 files changed, 29 insertions(+), 27 deletions(-) diff --git a/searx/engines/searchcode_code.py b/searx/engines/searchcode_code.py index ac9647fcd..c71832f46 100644 --- a/searx/engines/searchcode_code.py +++ b/searx/engines/searchcode_code.py @@ -10,8 +10,7 @@ from urllib import urlencode from json import loads -import cgi -import re + # engine dependent config categories = ['it'] @@ -21,17 +20,10 @@ paging = True url = 'https://searchcode.com/' search_url = url+'api/codesearch_I/?{query}&p={pageno}' -code_endings = {'c': 'c', - 'css': 'css', - 'cpp': 'cpp', - 'c++': 'cpp', +# special code-endings which are not recognised by the file ending +code_endings = {'cs': 'c#', 'h': 'c', - 'html': 'html', - 'hpp': 'cpp', - 'js': 'js', - 'lua': 'lua', - 'php': 'php', - 'py': 'python'} + 'hpp': 'cpp'} # do search-request @@ -45,7 +37,7 @@ def request(query, params): # get response from search-request def response(resp): results = [] - + search_results = loads(resp.text) # parse results @@ -53,12 +45,14 @@ def response(resp): href = result['url'] title = "" + result['name'] + " - " + result['filename'] repo = result['repo'] - + lines = dict() for line, code in result['lines'].items(): lines[int(line)] = code - code_language = code_endings.get(result['filename'].split('.')[-1].lower(), None) + code_language = code_endings.get( + result['filename'].split('.')[-1].lower(), + result['filename'].split('.')[-1].lower()) # append result results.append({'url': href, diff --git a/searx/engines/searchcode_doc.py b/searx/engines/searchcode_doc.py index e07cbeab9..4d4d1ca5e 100644 --- a/searx/engines/searchcode_doc.py +++ b/searx/engines/searchcode_doc.py @@ -31,15 +31,18 @@ def request(query, params): # get response from search-request def response(resp): results = [] - + search_results = loads(resp.text) # parse results for result in search_results['results']: href = result['url'] - title = "[" + result['type'] + "] " + result['namespace'] + " " + result['name'] - content = '[' + result['type'] + "] " + result['name'] + " " + result['synopsis'] + "
" + result['description'] - + title = "[" + result['type'] + "] " +\ + result['namespace'] + " " + result['name'] + content = '[' + result['type'] + "] " +\ + result['name'] + " " + result['synopsis'] +\ + "
" + result['description'] + # append result results.append({'url': href, 'title': title, diff --git a/searx/webapp.py b/searx/webapp.py index 11db1bf2e..ab1e2747f 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -99,9 +99,13 @@ def code_highlighter(codelines, language=None): if not language: language = 'text' - # find lexer by programing language - lexer = get_lexer_by_name(language, stripall=True) - + try: + # find lexer by programing language + lexer = get_lexer_by_name(language, stripall=True) + except: + # if lexer is not found, using default one + lexer = get_lexer_by_name('text', stripall=True) + html_code = '' tmp_code = '' last_line = None @@ -112,20 +116,21 @@ def code_highlighter(codelines, language=None): line_code_start = line # new codeblock is detected - if last_line != None and\ - last_line +1 != line: + if last_line is not None and\ + last_line + 1 != line: # highlight last codepart - formatter = HtmlFormatter(linenos='inline', linenostart=line_code_start) + formatter = HtmlFormatter(linenos='inline', + linenostart=line_code_start) html_code = html_code + highlight(tmp_code, lexer, formatter) - + # reset conditions for next codepart tmp_code = '' line_code_start = line # add codepart tmp_code += code + '\n' - + # update line last_line = line From a61a96d975916da14cae28040dcaa527d8599b75 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Thu, 15 Jan 2015 18:39:40 +0100 Subject: [PATCH 5/7] [enh] log highlighter errors --- searx/webapp.py | 1 + 1 file changed, 1 insertion(+) diff --git a/searx/webapp.py b/searx/webapp.py index 57551a655..cf58c55d9 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -115,6 +115,7 @@ def code_highlighter(codelines, language=None): lexer = get_lexer_by_name(language, stripall=True) except: # if lexer is not found, using default one + logger.debug('highlighter cannot find lexer for {0}'.format(language)) lexer = get_lexer_by_name('text', stripall=True) html_code = '' From 6503fdf2aab98ce36571784e4ef7b9ac697ae8e3 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Thu, 15 Jan 2015 18:40:19 +0100 Subject: [PATCH 6/7] [enh] add cpp language rewrite rule --- searx/engines/searchcode_code.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/searx/engines/searchcode_code.py b/searx/engines/searchcode_code.py index c71832f46..655818da2 100644 --- a/searx/engines/searchcode_code.py +++ b/searx/engines/searchcode_code.py @@ -23,7 +23,8 @@ search_url = url+'api/codesearch_I/?{query}&p={pageno}' # special code-endings which are not recognised by the file ending code_endings = {'cs': 'c#', 'h': 'c', - 'hpp': 'cpp'} + 'hpp': 'cpp', + 'cxx': 'cpp'} # do search-request From fe5ff5137711e6f8799e3e635543e75ad8fbe331 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Thu, 15 Jan 2015 18:55:25 +0100 Subject: [PATCH 7/7] [mod] pygments dependency warning --- searx/webapp.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/searx/webapp.py b/searx/webapp.py index cf58c55d9..877e40ddc 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -33,9 +33,6 @@ from flask import ( redirect, send_from_directory ) from flask.ext.babel import Babel, gettext, format_date -from pygments import highlight -from pygments.lexers import get_lexer_by_name -from pygments.formatters import HtmlFormatter from searx import settings, searx_dir from searx.engines import ( categories, engines, get_engines_stats, engine_shortcuts @@ -51,6 +48,14 @@ from searx.search import Search from searx.query import Query from searx.autocomplete import searx_bang, backends as autocomplete_backends from searx import logger +try: + from pygments import highlight + from pygments.lexers import get_lexer_by_name + from pygments.formatters import HtmlFormatter +except: + logger.critical("cannot import dependency: pygments") + from sys import exit + exit(1) logger = logger.getChild('webapp')