From b2223d31c501ad8b90cff78145ad06f1ecaef29a Mon Sep 17 00:00:00 2001
From: Elliu <goyard.louis@gmail.com>
Date: Tue, 22 Dec 2020 16:06:30 +0100
Subject: [PATCH] Moving subreddits lists in .csv. Moving post limit in .env
---
.gitignore | 1 +
launch.py | 17 ++++++++++-------
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/.gitignore b/.gitignore
index 4c49bd7..372cffa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
.env
+subreddits.csv
diff --git a/launch.py b/launch.py
index 5d4f9b7..3a0ba38 100644
--- a/launch.py
+++ b/launch.py
@@ -3,6 +3,7 @@ import os
import praw
import random
import re
+import csv
from dotenv import load_dotenv
@@ -13,6 +14,8 @@ SECRET = os.getenv('REDDIT_SECRET')
REDDIT_ID = os.getenv('REDDIT_ID')
REDDIT_AGENT = os.getenv('REDDIT_AGENT')
+postLimit = int(os.getenv('POST_LIMIT'))
+
subreddits = dict()
class Entry:
@@ -28,11 +31,11 @@ class Entry:
self.posturls = []
self.totalimgs = 0
-subreddits['kumiko'] = Entry('kumiko', 'rarekumikos')
-#subreddits['araragi'] = Entry('araragi', 'araragi')
-subreddits['hitagi'] = Entry('hitagi', 'Senjougahara')
-
+with open('subreddits.csv', mode ='r') as file:
+ csvFile = csv.reader(file)
+ for lines in csvFile:
+ subreddits[lines[0]] = Entry(lines[0], lines[1])
def refresh_posts(entry):
@@ -42,11 +45,11 @@ def refresh_posts(entry):
entry.posturls.clear()
entry.totalimgs=0
i=0
- for submission in entry.subreddit.hot(limit=50):
+ for submission in entry.subreddit.hot(limit=postLimit):
#_ = os.system('clear')
i = i + 1
entry.totalimgs = entry.totalimgs + 1
- print('Getting submission number '+ str(i) +' / 500!')
+ print('Getting submission number '+ str(i) + ' / ' + str(postLimit) + '!')
if ".jpg" not in submission.url and ".png" not in submission.url:
print('Post is not a jpg or png --------------------------')
print(str(submission.url))
@@ -88,7 +91,7 @@ async def on_message(message):
mess += "```"
await message.channel.send(mess)
if "show me a" in message.content.lower():
- name = re.search(r"show me a ([\S]+)", message.content.lower())
+ name = re.search(r"show me an? ([\S]+)", message.content.lower())
if name == None:
return
else:
--
GitLab