Dénote

Dénote Commit Details

Date:2016-01-17 18:48:14 (3 years 5 months ago)
Author:Grégory Soutadé
Branch:master
Commit:e7b8640481774bdf9c91c0a5cb1c6d4cafea5472
Parents: a5771bf9587c842b5bac89c1b7142c297ced8d0c
Message:First version of search

Changes:
Adenote/search.py (full)
MChangeLog (1 diff)
Mdenote/models.py (2 diffs)
Mdenote/templates/base.html (1 diff)
Mdenote/templates/base_user.html (1 diff)
Mdenote/urls.py (1 diff)
Mdenote/views.py (3 diffs)

File differences

ChangeLog
1
1
22
33
44
5
v0.2 (08/11/2015)
v0.2 (17/01/2016)
**User**
Add autofocus to login page
Add search
denote/models.py
2424
2525
2626
27
28
29
2730
2831
32
2933
3034
3135
......
113117
114118
115119
120
121
116122
117123
124
125
126
127
128
129
130
131
132
133
118134
119135
120136
from django.db import models
from django.contrib.auth.models import AbstractUser
from django.http import HttpResponse
from django.db.models.signals import pre_init, post_init, pre_delete, post_delete
from django.db.models.signals import pre_save, post_save
from django.dispatch import receiver
import markdown2
import search
class User(AbstractUser):
hidden_categories = models.TextField(blank=True)
self.modified_date = datetime.now()
self.transformed_text = markdown2.markdown(self.text, extras=['fenced-code-blocks'])
self._summarize()
s = Search()
super(Note, self).save()
@receiver(post_save, sender=Note)
def post_save_note_signal(sender, **kwargs):
s = Search()
s.edit_note(kwargs['instance'].id)
@receiver(pre_delete, sender=Note)
def pre_delete_note_signal(sender, **kwargs):
s = Search()
s.remove_note(kwargs['instance'].id)
def manage_category(user, cat_name):
category = None
if cat_name:
denote/search.py
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
# -*- coding: utf-8 -*-
"""
Copyright 2016 Grégory Soutadé
This file is part of Dénote.
Dynastie is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Dynastie is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Dynastie. If not, see <http://www.gnu.org/licenses/>.
"""
import re
import unicodedata
import os
import operator
import pickle
from django.db import models
import models
#from models import Note
class Search:
MINIMUM_LETTERS = 3
def __init__(self):
self.report = ''
self.tagreg = re.compile('<[^>]+>')
self.htmlreg = re.compile('&[^;]+;')
self.numreg = re.compile('[0-9]+')
self.pat = re.compile(r'\s+')
self.replace_by_space = (u'(', u')', u'#', u'\'', u'{', u'}', u'[', u']',
u'-', u'|', u'\t', u'\\', u'_', u'^' '=', u'+', u'$',
u'£', u'%', u'µ', u'*', u',', u'?', u';', u'.', u'/',
u':', u'!', u'§', u'€', u'²')
# Imported from generator.py
def _addReport(self, string, color=''):
if color != '':
self.report = self.report + '<span style="color:' + color + '">'
self.report = self.report + '<b>' + self.__class__.__name__ + '</b> : '
self.report = self.report + string
if color != '':
self.report = self.report + '</span>'
self.report = self.report + '<br/>\n'
def _addWarning(self, string):
self.addReport(string, 'yellow')
def _addError(self, string):
self.addReport(string, 'red')
def _saveDatabase(self, hashtable):
d = pickle.dumps(hashtable)
f = open(os.environ['DENOTE_ROOT'] + '/_search.db', 'w')
f.write(d)
f.close()
def _loadDatabase(self):
filename = os.environ['DENOTE_ROOT'] + '/_search.db'
if not os.path.exists(filename):
print 'No search index !'
return {}
f = open(filename, 'rb')
hashtable = pickle.load(f)
f.close()
return hashtable
def _strip_accents(self, s):
return ''.join((c for c in unicodedata.normalize('NFD', s) if unicodedata.category(c) != 'Mn'))
def _remove_tag(self, content):
content = self.htmlreg.sub('', content)
content = self.numreg.sub('', content)
content = content.replace('\n', '')
content = content.replace('\r', '')
content = content.replace('"', '')
for c in self.replace_by_space:
content = content.replace(c, ' ')
content = self.tagreg.sub('', content)
content = self.pat.sub(' ', content)
return content
def _prepare_string(self, content):
content = self._remove_tag(content)
content = self._strip_accents(content)
return content
def _indexContent(self, hashtable, index, content, word_weight):
content = self._prepare_string(content)
wordlist = content.split(' ')
for word in wordlist:
if len(word) < self.MINIMUM_LETTERS:
continue
word = word.lower()
if not word in hashtable:
hashtable[word] = []
if not index in hashtable[word]:
hashtable[word].insert(0, [index, word_weight])
else:
weight = hashtable[word][1]
hashtable[word][1] = weight + word_weight
def _index(self, hashtable, index):
try:
note = Note.objects.get(pk=index)
except:
return
self._indexContent(hashtable, index, note.text, 1)
self._indexContent(hashtable, index, note.title.encode('utf-8'), 5)
def _index_note(self, note, saveDatabase=True):
hashtable = self._loadDatabase()
self._index(hashtable, int(note))
if saveDatabase:
self._saveDatabase(hashtable)
def _remove_note(self, note, saveDatabase=True):
hashtable = self._loadDatabase()
if hashtable is None: return
for k, v in hashtable.items():
# For tuples in values
for t in v:
if note == v[0]:
v.remove(t)
if saveDatabase:
self._saveDatabase(hashtable)
def generate_index(self, notes):
hashtable = self._loadDatabase()
for note in notes:
self._indexContent(hashtable, note.id, note.text, 1)
self._indexContent(hashtable, note.id, note.title, 5)
self._saveDatabase(hashtable)
def index_note(self, note):
return self._index_note(note, True)
def delete_note(self, note):
return self._remove_note(note, True)
def edit_note(self, note, saveDatabase=True):
self._remove_note(note, False)
self._index_note(note, True)
def search(self, string):
hashtable = self._loadDatabase()
string = self._prepare_string(string.encode('utf-8'))
wordlist = string.split(' ')
res = {}
for word in wordlist:
if len(word) < Search.MINIMUM_LETTERS:
continue
word = word.lower()
reg = re.compile('.*' + word + '.*')
for key in hashtable.keys():
if reg.match(key):
for note in hashtable[key]:
res[note[0]] = res.get(note[0],0) + note[1]
sorted_res = sorted(res.iteritems(), key=operator.itemgetter(1))
sorted_res.reverse()
res = [sorted_res[i][0] for i in range(len(sorted_res))]
return res
denote/templates/base.html
88
99
1010
11
11
12
1213
1314
1415
</head>
<body>
<!-- Header -->
<div class="settings"><a href="/user/edit">Settings</a> <a href="/disconnect">Disconnect</a></div>
<div class="settings"><a href="/user/edit">Settings</a> <a href="/disconnect">Disconnect</a><br/>
<form action="/search">{% csrf_token %}<input name="text"/><input type="button" value="Search"/></form></div>
<!-- Left panel -->
<div id="left_panel">
<a id="home_icon" href="/" alt="Home"><img src="{{ STATIC_URL }}images/home.png"/></a><br/><br/>
denote/templates/base_user.html
1414
1515
1616
17
17
18
1819
1920
2021
</head>
<body onload="startup();">
<!-- Header -->
<div class="settings"><a href="/user/edit">Settings</a> <a href="/disconnect">Disconnect</a></div>
<div class="settings"><a href="/user/edit">Settings</a> <a href="/disconnect">Disconnect</a><br/><br/>
<form method="post" action="/search">{% csrf_token %}<input name="text"/><input type="submit" value="Search"/></form></div>
<!-- Left panel -->
<div id="left_panel">
<a id="home_icon" href="/" alt="Home"><img src="{{ STATIC_URL }}images/home.png"/></a><br/><br/>
denote/urls.py
3030
3131
3232
33
34
3335
url(r'^note/(\d+)$', 'denote.views.note', name='note'),
url(r'^category/edit/(\d)$','denote.views.edit_category', name='edit_category'),
url(r'^preferences$', 'denote.views.preferences', name='preferences'),
url(r'^search$', 'denote.views.search', name='search'),
url(r'^generate_search_index$', 'denote.views.generate_search_index', name='generate_search_index'),
)
denote/views.py
1818
1919
2020
21
2122
2223
2324
......
2728
2829
2930
31
3032
3133
3234
......
238240
239241
240242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
along with Dénote. If not, see <http://www.gnu.org/licenses/>.
"""
import os
from datetime import datetime
from django.http import HttpResponseRedirect, HttpResponse, Http404
from denote.models import *
from denote.forms import *
from denote.search import *
def index(request):
if request.user.is_authenticated():
else:
raise Http404
@login_required
def search(request):
context = _prepare_note_context(request.user)
ref = request.META['HTTP_REFERER']
if 'text' in request.POST:
text = request.POST['text']
else:
return HttpResponseRedirect(ref)
s = Search()
note_list = s.search(text)
notes = Note.objects.filter(pk__in=note_list, author=request.user)
context['notes'] = notes
context['note_form'] = NoteForm()
return render(request, 'user_index.html', context)
@login_required
def generate_search_index(request):
if os.path.exists('_search.db'):
os.path.remove('_search.db')
s = Search()
s.generate_index(Note.objects.all())
return HttpResponseRedirect('/')

Archive Download the corresponding diff file

Branches

Tags