mirror of
https://github.com/dgtlmoon/changedetection.io.git
synced 2025-11-26 11:23:23 +00:00
Compare commits
6 Commits
0.42.1
...
search-lis
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cd786436da | ||
|
|
b4e3de8af0 | ||
|
|
fce0b013c4 | ||
|
|
0458f70f01 | ||
|
|
9f6b5acf53 | ||
|
|
3614596453 |
@@ -38,7 +38,7 @@ from flask_paginate import Pagination, get_page_parameter
|
|||||||
from changedetectionio import html_tools
|
from changedetectionio import html_tools
|
||||||
from changedetectionio.api import api_v1
|
from changedetectionio.api import api_v1
|
||||||
|
|
||||||
__version__ = '0.42.1'
|
__version__ = '0.41.1'
|
||||||
|
|
||||||
datastore = None
|
datastore = None
|
||||||
|
|
||||||
@@ -406,24 +406,24 @@ def changedetection_app(config=None, datastore_o=None):
|
|||||||
search_q = request.args.get('q').strip().lower() if request.args.get('q') else False
|
search_q = request.args.get('q').strip().lower() if request.args.get('q') else False
|
||||||
for uuid, watch in datastore.data['watching'].items():
|
for uuid, watch in datastore.data['watching'].items():
|
||||||
|
|
||||||
if limit_tag:
|
if limit_tag != None:
|
||||||
# Support for comma separated list of tags.
|
# Support for comma separated list of tags.
|
||||||
if not watch.get('tag'):
|
if watch['tag'] is None:
|
||||||
continue
|
continue
|
||||||
for tag_in_watch in watch.get('tag', '').split(','):
|
for tag_in_watch in watch['tag'].split(','):
|
||||||
tag_in_watch = tag_in_watch.strip()
|
tag_in_watch = tag_in_watch.strip()
|
||||||
if tag_in_watch == limit_tag:
|
if tag_in_watch == limit_tag:
|
||||||
watch['uuid'] = uuid
|
watch['uuid'] = uuid
|
||||||
if search_q:
|
if search_q:
|
||||||
if (watch.get('title') and search_q in watch.get('title').lower()) or search_q in watch.get('url', '').lower():
|
if (watch.get('title') and search_q in watch.get('title')) or search_q in watch.get('url', '').lower():
|
||||||
sorted_watches.append(watch)
|
sorted_watches.append(watch)
|
||||||
else:
|
else:
|
||||||
sorted_watches.append(watch)
|
sorted_watches.append(watch)
|
||||||
|
|
||||||
else:
|
else:
|
||||||
#watch['uuid'] = uuid
|
watch['uuid'] = uuid
|
||||||
if search_q:
|
if search_q:
|
||||||
if (watch.get('title') and search_q in watch.get('title').lower()) or search_q in watch.get('url', '').lower():
|
if (watch.get('title') and search_q in watch.get('title')) or search_q in watch.get('url', '').lower():
|
||||||
sorted_watches.append(watch)
|
sorted_watches.append(watch)
|
||||||
else:
|
else:
|
||||||
sorted_watches.append(watch)
|
sorted_watches.append(watch)
|
||||||
|
|||||||
@@ -262,7 +262,6 @@ class update_worker(threading.Thread):
|
|||||||
# Yes fine, so nothing todo, don't continue to process.
|
# Yes fine, so nothing todo, don't continue to process.
|
||||||
process_changedetection_results = False
|
process_changedetection_results = False
|
||||||
changed_detected = False
|
changed_detected = False
|
||||||
self.datastore.update_watch(uuid=uuid, update_obj={'last_error': False})
|
|
||||||
|
|
||||||
except content_fetcher.BrowserStepsStepTimout as e:
|
except content_fetcher.BrowserStepsStepTimout as e:
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user