Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mynij
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Mynij
mynij
Commits
c0f2d88f
Commit
c0f2d88f
authored
Sep 02, 2021
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_web_mynij_search: Get proxy server URLs from configuration file
Also fix configuration file to be json compatible.
parent
9de5842a
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
100 additions
and
34 deletions
+100
-34
bt5/erp5_web_mynij_search/PathTemplateItem/web_page_module/gadget_erp5_mynij_webtorrent_js.js
...teItem/web_page_module/gadget_erp5_mynij_webtorrent_js.js
+4
-3
bt5/erp5_web_mynij_search/PathTemplateItem/web_page_module/gadget_erp5_mynij_webtorrent_js.xml
...eItem/web_page_module/gadget_erp5_mynij_webtorrent_js.xml
+2
-2
bt5/erp5_web_mynij_search/PathTemplateItem/web_page_module/gadget_erp5_page_mynij_search_js.js
...eItem/web_page_module/gadget_erp5_page_mynij_search_js.js
+39
-8
bt5/erp5_web_mynij_search/PathTemplateItem/web_page_module/gadget_erp5_page_mynij_search_js.xml
...Item/web_page_module/gadget_erp5_page_mynij_search_js.xml
+2
-2
bt5/erp5_web_mynij_search/PathTemplateItem/web_page_module/gadget_mynij_model.js.js
...PathTemplateItem/web_page_module/gadget_mynij_model.js.js
+22
-1
bt5/erp5_web_mynij_search/PathTemplateItem/web_page_module/gadget_mynij_model.js.xml
...athTemplateItem/web_page_module/gadget_mynij_model.js.xml
+2
-2
bt5/erp5_web_mynij_search/PathTemplateItem/web_page_module/gadget_mynij_parser.js.js
...athTemplateItem/web_page_module/gadget_mynij_parser.js.js
+17
-9
bt5/erp5_web_mynij_search/PathTemplateItem/web_page_module/gadget_mynij_parser.js.xml
...thTemplateItem/web_page_module/gadget_mynij_parser.js.xml
+2
-2
bt5/erp5_web_mynij_search/PathTemplateItem/web_page_module/gadget_mynij_result.html.xml
...TemplateItem/web_page_module/gadget_mynij_result.html.xml
+2
-2
bt5/erp5_web_mynij_search/PathTemplateItem/web_page_module/gadget_mynij_result.js.js
...athTemplateItem/web_page_module/gadget_mynij_result.js.js
+6
-1
bt5/erp5_web_mynij_search/PathTemplateItem/web_page_module/gadget_mynij_result.js.xml
...thTemplateItem/web_page_module/gadget_mynij_result.js.xml
+2
-2
No files found.
bt5/erp5_web_mynij_search/PathTemplateItem/web_page_module/gadget_erp5_mynij_webtorrent_js.js
View file @
c0f2d88f
...
...
@@ -152,11 +152,12 @@
console
.
log
(
error
);
return
undefined
;
})
.
push
(
function
(
r
config
)
{
.
push
(
function
(
r
esponse
)
{
var
rtc_config
;
if
(
!
r
config
)
if
(
!
r
esponse
)
return
default_rtcconfig
;
return
rconfig
.
rtcConfig
;
rtc_config
=
JSON
.
parse
(
response
.
target
.
responseText
);
return
rtc_config
.
rtcConfig
;
});
})
...
...
bt5/erp5_web_mynij_search/PathTemplateItem/web_page_module/gadget_erp5_mynij_webtorrent_js.xml
View file @
c0f2d88f
...
...
@@ -242,7 +242,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
990.1263
1.48739.25105
</string>
</value>
<value>
<string>
990.1263
2.20339.25224
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -260,7 +260,7 @@
</tuple>
<state>
<tuple>
<float>
16
14018738.61
</float>
<float>
16
30505542.2
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
bt5/erp5_web_mynij_search/PathTemplateItem/web_page_module/gadget_erp5_page_mynij_search_js.js
View file @
c0f2d88f
/*jslint nomen: true, indent: 2, maxerr: 3, maxlen: 80*/
/*global window, RSVP, rJS, document*/
(
function
(
window
,
document
,
rJS
,
RSVP
)
{
var
gadget
,
proxies
=
[
"
https://softinst116265.host.vifib.net/erp5/ERP5Site_getHTTPResource
"
,
"
https://softinst116446.host.vifib.net/erp5/ERP5Site_getHTTPResource
"
];
var
gadget
;
rJS
(
window
)
.
setState
({
model_gadget
:
null
,
...
...
@@ -30,10 +26,20 @@
.
push
(
function
()
{
return
gadget
.
getDeclaredGadget
(
"
result
"
);
})
.
push
(
function
(
result
)
{
result_gadget
=
result
;
return
model_gadget
.
getConfig
()
.
push
(
function
(
config
)
{
if
(
!
config
)
return
[
"
https://proxy1.mynij.com/proxy
"
];
return
config
.
proxies
.
urls
;
});
})
.
push
(
function
(
result
)
{
return
gadget
.
changeState
({
model_gadget
:
model_gadget
,
result_gadget
:
result
result_gadget
:
result_gadget
,
proxies
:
result
});
});
})
...
...
@@ -63,6 +69,8 @@
return
gadget
.
getSetting
(
'
index_list
'
,
[]);
})
.
push
(
function
(
results
)
{
var
add_item
=
document
.
createElement
(
"
option
"
),
empty_item
;
index_list
=
results
;
while
(
drop_list
.
firstChild
)
{
...
...
@@ -74,6 +82,15 @@
option_item
.
appendChild
(
document
.
createTextNode
(
item
));
drop_list
.
appendChild
(
option_item
);
});
if
(
results
.
length
===
0
)
{
empty_item
=
document
.
createElement
(
"
option
"
);
empty_item
.
style
.
display
=
"
none
"
;
drop_list
.
appendChild
(
empty_item
);
}
add_item
.
value
=
"
ADD
"
;
add_item
.
classList
.
add
(
'
add-source
'
);
add_item
.
appendChild
(
document
.
createTextNode
(
"
Add Source...
"
));
drop_list
.
appendChild
(
add_item
);
})
.
push
(
function
()
{
...
...
@@ -179,8 +196,9 @@
return
new
RSVP
.
Queue
()
.
push
(
function
()
{
var
rng
=
Math
.
floor
(
Math
.
random
()
*
Math
.
floor
(
proxies
.
length
)),
proxy
=
proxies
[
rng
],
var
count
=
gadget
.
state
.
proxies
.
length
,
rng
=
Math
.
floor
(
Math
.
random
()
*
Math
.
floor
(
count
)),
proxy
=
gadget
.
state
.
proxies
[
rng
],
query
=
encodeURI
(
key
);
return
jIO
.
util
.
ajax
({
url
:
proxy
+
"
?url=https%3A%2F%2Fsoftinst141674.host.vifib.net%2Fsearch%3Fq%3D
"
+
...
...
@@ -218,6 +236,19 @@
});
})
.
declareService
(
function
()
{
var
gadget
=
this
,
select
=
this
.
element
.
querySelector
(
"
.index-select
"
);
select
.
onchange
=
function
(
e
)
{
e
.
preventDefault
();
if
(
e
.
target
.
value
===
"
ADD
"
)
{
return
gadget
.
redirect
({
"
command
"
:
"
display
"
,
"
options
"
:
{
page
:
"
ojs_local_controller
"
}});
}
};
})
.
onEvent
(
"
submit
"
,
function
(
event
)
{
var
gadget
=
this
,
search_key
=
document
.
getElementById
(
"
search_input
"
).
value
,
...
...
bt5/erp5_web_mynij_search/PathTemplateItem/web_page_module/gadget_erp5_page_mynij_search_js.xml
View file @
c0f2d88f
...
...
@@ -242,7 +242,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
99
0.12602.3691.30958
</string>
</value>
<value>
<string>
99
4.32554.11757.37154
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -260,7 +260,7 @@
</tuple>
<state>
<tuple>
<float>
16
14017833.95
</float>
<float>
16
30510763.68
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
bt5/erp5_web_mynij_search/PathTemplateItem/web_page_module/gadget_mynij_model.js.js
View file @
c0f2d88f
...
...
@@ -218,5 +218,26 @@
.
push
(
undefined
,
function
(
my_error
)
{
console
.
log
(
my_error
);
});
});
})
.
declareMethod
(
"
getConfig
"
,
function
()
{
return
new
RSVP
.
Queue
()
.
push
(
function
()
{
return
jIO
.
util
.
ajax
({
url
:
"
mynij-config.json
"
});
})
.
push
(
undefined
,
function
(
error
)
{
//no rtcconfig file found, use the default
console
.
log
(
error
);
return
undefined
;
})
.
push
(
function
(
response
)
{
var
config_json
;
if
(
!
response
)
return
undefined
;
config_json
=
JSON
.
parse
(
response
.
target
.
responseText
);
return
config_json
;
});
});
}(
window
,
document
,
RSVP
,
rJS
,
jIO
));
\ No newline at end of file
bt5/erp5_web_mynij_search/PathTemplateItem/web_page_module/gadget_mynij_model.js.xml
View file @
c0f2d88f
...
...
@@ -242,7 +242,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
989.
7469.5007.51797
</string>
</value>
<value>
<string>
989.
8620.48638.3003
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -260,7 +260,7 @@
</tuple>
<state>
<tuple>
<float>
16
09845884.52
</float>
<float>
16
30509683.61
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
bt5/erp5_web_mynij_search/PathTemplateItem/web_page_module/gadget_mynij_parser.js.js
View file @
c0f2d88f
...
...
@@ -6,10 +6,6 @@
var
gadget_klass
=
rJS
(
window
),
template_element
=
gadget_klass
.
__template_element
,
concurrent_requests
=
3
,
proxies
=
[
"
https://softinst116265.host.vifib.net/erp5/ERP5Site_getHTTPResource
"
,
"
https://softinst116446.host.vifib.net/erp5/ERP5Site_getHTTPResource
"
],
build_template_progress
=
Handlebars
.
compile
(
template_element
.
getElementById
(
"
build-template-progress
"
)
.
innerHTML
);
...
...
@@ -89,6 +85,7 @@
function
build
()
{
var
status
;
return
gadget
.
getIndexToBuild
()
.
push
(
function
(
entry
)
{
var
link_list
,
...
...
@@ -162,7 +159,18 @@
});
}
return
build
();
return
gadget
.
state
.
model_gadget
.
getConfig
()
.
push
(
function
(
config
)
{
if
(
!
config
)
config
=
{
"
proxies
"
:
{
"
urls
"
:
[
"
https://proxy1.mynij.com/proxy
"
]}};
return
gadget
.
changeState
({
proxies
:
config
.
proxies
.
urls
});
})
.
push
(
function
()
{
return
build
();
});
})
.
onLoop
(
function
()
{
...
...
@@ -235,8 +243,8 @@
proxy
;
return
new
RSVP
.
Queue
()
.
push
(
function
()
{
rng
=
Math
.
floor
(
Math
.
random
()
*
Math
.
floor
(
proxies
.
length
));
proxy
=
proxies
[
rng
];
rng
=
Math
.
floor
(
Math
.
random
()
*
Math
.
floor
(
gadget
.
state
.
proxies
.
length
));
proxy
=
gadget
.
state
.
proxies
[
rng
];
return
jIO
.
util
.
ajax
({
url
:
proxy
+
"
?url=
"
+
link
});
})
.
push
(
function
(
page
)
{
...
...
@@ -350,8 +358,8 @@
return
new
RSVP
.
Queue
()
.
push
(
function
()
{
var
rng
=
Math
.
floor
(
Math
.
random
()
*
Math
.
floor
(
proxies
.
length
)),
proxy
=
proxies
[
rng
];
var
rng
=
Math
.
floor
(
Math
.
random
()
*
Math
.
floor
(
gadget
.
state
.
proxies
.
length
)),
proxy
=
gadget
.
state
.
proxies
[
rng
];
return
jIO
.
util
.
ajax
({
url
:
proxy
+
"
?url=
"
+
link
});
})
.
push
(
function
(
page
)
{
...
...
bt5/erp5_web_mynij_search/PathTemplateItem/web_page_module/gadget_mynij_parser.js.xml
View file @
c0f2d88f
...
...
@@ -242,7 +242,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
99
0.3475.54016.22254
</string>
</value>
<value>
<string>
99
4.32596.8054.51882
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -260,7 +260,7 @@
</tuple>
<state>
<tuple>
<float>
16
13470010.32
</float>
<float>
16
30513271.74
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
bt5/erp5_web_mynij_search/PathTemplateItem/web_page_module/gadget_mynij_result.html.xml
View file @
c0f2d88f
...
...
@@ -242,7 +242,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
9
87.20399.12095.58538
</string>
</value>
<value>
<string>
9
91.47441.48178.21742
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -260,7 +260,7 @@
</tuple>
<state>
<tuple>
<float>
16
02776317.22
</float>
<float>
16
19781040.08
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
bt5/erp5_web_mynij_search/PathTemplateItem/web_page_module/gadget_mynij_result.js.js
View file @
c0f2d88f
...
...
@@ -153,7 +153,8 @@
link
,
link_par
,
body
,
loader
=
document
.
getElementById
(
"
searx-loading
"
);
loader
=
document
.
getElementById
(
"
searx-loading
"
);
loader
.
style
.
display
=
"
none
"
;
list
=
document
.
getElementById
(
"
searx-results
"
);
...
...
@@ -268,6 +269,10 @@
}
return
short_url
;
})
.
declareMethod
(
"
setSearxMoreLink
"
,
function
(
query
)
{
var
link
=
this
.
querySelector
(
'
searx-morelink
'
);
link
.
href
=
"
https://searx.info/search?q=
"
+
query
+
"
&category_general=on
"
;
});
}(
window
,
RSVP
,
rJS
,
document
,
DOMParser
,
URL
));
\ No newline at end of file
bt5/erp5_web_mynij_search/PathTemplateItem/web_page_module/gadget_mynij_result.js.xml
View file @
c0f2d88f
...
...
@@ -242,7 +242,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
990.
3487.35664.34628
</string>
</value>
<value>
<string>
990.
5192.14888.10222
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -260,7 +260,7 @@
</tuple>
<state>
<tuple>
<float>
161
3572333.62
</float>
<float>
161
9793226.18
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment