CIRCL
/
AIL-framework
mirror of https://github.com/CIRCL/AIL-framework
2
1
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into crawler_manager

pull/559/head
Terrtia 2020-08-21 13:12:23 +02:00
parent 488604ce4e 0e8b4456ce
commit 8633d6460c
No known key found for this signature in database
GPG Key ID: 1E1B1F50D84613D0
3 changed files with 52 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/packages/Tag.py
View File

@ -271,8 +271,10 @@ def update_tag_last_seen(tag, tag_first_seen, tag_last_seen):
if r_serv_tags.scard('{}:{}'.format(tag, tag_last_seen)) > 0: if r_serv_tags.scard('{}:{}'.format(tag, tag_last_seen)) > 0:
r_serv_tags.hset('tag_metadata:{}'.format(tag), 'last_seen', tag_last_seen) r_serv_tags.hset('tag_metadata:{}'.format(tag), 'last_seen', tag_last_seen)
else: else:
tag_last_seen = Date.date_substract_day(tag_last_seen) # # TODO: # FIXME:
update_tag_last_seen(tag, tag_first_seen, tag_last_seen) #tag_last_seen = Date.date_substract_day(str(tag_last_seen))
#update_tag_last_seen(tag, tag_first_seen, tag_last_seen)
pass
def update_tag_metadata(tag, tag_date, object_type=None, add_tag=True): def update_tag_metadata(tag, tag_date, object_type=None, add_tag=True):
''' '''

3
installing_deps.sh
View File

@ -118,7 +118,10 @@ $AIL_HOME/doc/generate_modules_data_flow_graph.sh
pushd ${AIL_HOME} pushd ${AIL_HOME}
# shallow clone # shallow clone
git fetch --depth=500 --tags --prune git fetch --depth=500 --tags --prune
if [ ! -z "$TRAVIS" ]; then
echo "Travis detected"
git fetch --unshallow git fetch --unshallow
fi
git describe --abbrev=0 --tags | tr -d '\n' > ${AIL_HOME}/update/current_version git describe --abbrev=0 --tags | tr -d '\n' > ${AIL_HOME}/update/current_version
echo "AIL current version:" echo "AIL current version:"
git describe --abbrev=0 --tags git describe --abbrev=0 --tags

10
var/www/modules/showpaste/templates/show_saved_paste.html
View File

@ -55,8 +55,8 @@
<div class="modal-body"> <div class="modal-body">
<div class="form-group input-group" > <div class="input-group" >
<input id="ltags" style="width:850%;" type="text" name="ltags"> <input id="ltags" type="text" class="form-control" autocomplete="off" style="width: 760px" name="ltags">
</div> </div>
<div class="btn-group btn-block"> <div class="btn-group btn-block">
@ -73,8 +73,8 @@
</div> </div>
<br/><br/> <br/><br/>
<div class="form-group input-group" > <div class="input-group">
<input id="ltagsgalaxies" style="width:850%;" type="text" name="ltagsgalaxies"> <input id="ltagsgalaxies" type="text" class="form-control" autocomplete="off" style="width: 760px" name="ltagsgalaxies">
</div> </div>
<div class="btn-group btn-block"> <div class="btn-group btn-block">
@ -529,6 +529,7 @@
{% endfor %} {% endfor %}
</script> </script>
{% if crawler_metadata['get_metadata'] %}
<script> <script>
var ctx = canvas.getContext('2d'), img = new Image(); var ctx = canvas.getContext('2d'), img = new Image();
@ -575,5 +576,6 @@ function img_error() {
blocks.addEventListener('change', pixelate, false); blocks.addEventListener('change', pixelate, false);
</script> </script>
{% endif %}
</html> </html>