Skip to content

Commit a6cc666

Browse files
Developer-R-7Developer-R-7
committed
updated blog_display algo
1 parent 4249e6a commit a6cc666

5 files changed

Lines changed: 24 additions & 17 deletions

File tree

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
__pycache__
2-
.env
2+
.env
3+
db.sqlite3

‎blog/views.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ class HomeView(ListView):
1919
def get_context_data(self, **kwargs):
2020
context = super(HomeView, self).get_context_data(**kwargs)
2121
context['editor'] = self.blog_connector.get_editor_post()
22+
context['most_like'] = self.blog_connector.get_most_liked_post()
2223
context['most_used_tag'] = self.blog_connector.get_most_tags_used()
23-
context['trending_post'] = self.blog_connector.get_most_viewed()
24+
context['trending_post'] = self.blog_connector.get_most_viewed(context['most_like'])
2425
context['this_month'] = self.blog_connector.get_this_month()
25-
context['most_like'] = self.blog_connector.get_most_liked_post()
2626
context['category'] = self.blog_connector.get_category()
2727
context['redirect_url'] = self.request.get_full_path()
2828
return context
@@ -37,12 +37,12 @@ def get_queryset(self):
3737
self.tag_slug = self.kwargs['tag_slug']
3838
self.paginate_by = 5
3939
self.ordering = ['-hit_count_generic__hits','-likes_count','-date_published']
40-
queryset = self.blog_connector.get_PostByTags_model(Tag,tag_slug=self.tag_slug)
41-
return queryset
40+
self.queryset = self.blog_connector.get_PostByTags_model(Tag,tag_slug=self.tag_slug)
41+
return self.queryset
4242

4343
def get_context_data(self,**kwargs):
4444
context = super(PostByTags, self).get_context_data(**kwargs)
45-
context['most_view'] = self.blog_connector.get_most_viewed()
45+
context['most_view'] = self.blog_connector.get_most_viewed(self.queryset)
4646
context['most_tags'] = self.blog_connector.get_most_tags_used()
4747
context['category'] = self.blog_connector.get_category()
4848
context['result'] = True
@@ -118,7 +118,7 @@ def query_none_checker(query_params):
118118
else:
119119
return True
120120
def category_parser(number):
121-
category_list = ["uncategorized","education","creative","data-structures","projects","algorithms"]
121+
category_list = ["Coding","photography","Crypto","Front-End Developer","Django"]
122122
if number != "None":
123123
return category_list[int(number)]
124124
else:
@@ -130,16 +130,16 @@ def category_parser(number):
130130
'search_title':query_none_checker(self.search_title),
131131
'category_text':category_parser(self.category_search)
132132
}
133-
queryset = self.blog_connector.search(self.search_query_set)
134-
return queryset
133+
self.queryset = self.blog_connector.search(self.search_query_set)
134+
return self.queryset
135135

136136
def get_context_data(self,**kwargs):
137137
context = super(SearchView, self).get_context_data(**kwargs)
138138
context['most_like'] = self.blog_connector.get_most_liked_post()
139139
context['most_tags'] = self.blog_connector.get_most_tags_used()
140140
context['category'] = self.blog_connector.get_category()
141141
context['query_set'] = self.search_query_set
142-
context['post'] = self.blog_connector.get_recent_post()
142+
context['post'] = self.blog_connector.get_recent_post(context['most_like'])
143143
return context
144144

145145
def like_sys(request):

‎caffeinecode/settings.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,6 @@
157157
EMAIL_HOST_PASSWORD = os.environ.get("SENDER_MAIL_PASSWORD")
158158

159159

160-
INTERNAL_IPS = [
161-
"127.0.0.1",
162-
]
160+
# INTERNAL_IPS = [
161+
# "127.0.0.1",
162+
# ]

‎connectors/Blogs/BlogManager.py‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,10 @@ def get_most_tags_used(self):
3737
serverLogger("Failed",e)
3838
raise Exception("Failed (get_most_tags_used)")
3939

40-
def get_most_liked_post(self):
40+
def get_most_liked_post(self,queryToExclude=None):
4141
try:
42+
if queryToExclude != None:
43+
return cache_manager('mst_liked_post',self.blog_post.order_by('-likes_count','-hit_count_generic__hits').exclude(pk__in=queryToExclude)[:5],TIME)
4244
return cache_manager('mst_liked_post',self.blog_post.order_by('-likes_count','-hit_count_generic__hits')[:5],TIME)
4345
except Exception as e:
4446
serverLogger("Failed",e)
@@ -52,8 +54,10 @@ def get_this_month(self):
5254
serverLogger("Failed",e)
5355
raise Exception("Failed (get_this_month)")
5456

55-
def get_most_viewed(self):
57+
def get_most_viewed(self,queryToExclude=None):
5658
try:
59+
if queryToExclude != None:
60+
return cache_manager('most_viewed',self.blog_post.order_by('-hit_count_generic__hits').exclude(pk__in=queryToExclude)[:5],TIME)
5761
return cache_manager('most_viewed',self.blog_post.order_by('-hit_count_generic__hits')[:5],TIME)
5862
except Exception as e:
5963
serverLogger("Failed",e)
@@ -100,9 +104,11 @@ def search(self,query_set):
100104
else:
101105
return self.blog_post.filter(Q(title__icontains=query_set['query']) | Q(body__icontains=query_set['query']) | Q(blog_snipet__icontains=query_set['query'])).order_by('-modified')
102106

103-
def get_recent_post(self):
107+
def get_recent_post(self,queryToExclude=None):
104108
try:
105-
return cache_manager('recent_post',self.blog_post.order_by('-likes_count','-date_published')[:3],TIME)
109+
if queryToExclude != None:
110+
return cache_manager('recent_post',self.blog_post.order_by('-likes_count','-date_published').exclude(pk__in=queryToExclude)[:3],TIME)
111+
return cache_manager('recent_post',self.blog_post.order_by('-likes_count','-date_published')[:3].ex,TIME)
106112
except Exception as e:
107113
serverLogger("Failed",e)
108114
raise Exception("Failed (get_recent_post)")

‎db.sqlite3‎

8 KB
Binary file not shown.

0 commit comments

Comments
 (0)