aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjwansek <eddie.atten.ea29@gmail.com>2019-01-08 18:15:26 +0000
committerjwansek <eddie.atten.ea29@gmail.com>2019-01-08 18:15:26 +0000
commitd6477e138753d8d1534faae3c23406ed6e4d6714 (patch)
tree311f9ac255f02f17fe928cb4176a2d6ce89df968
parent66ab25d936492a766a513f14b0aeb22bc8e40975 (diff)
parentb5a21e6ea6118b80691b2812c77e459b45116170 (diff)
downloadSmallYTChannelBot-d6477e138753d8d1534faae3c23406ed6e4d6714.tar.gz
SmallYTChannelBot-d6477e138753d8d1534faae3c23406ed6e4d6714.zip
Merge branch 'master' of https://github.com/jwansek/SmallYTChannelBotSubmissions
-rw-r--r--SmallYTChannelBotSubmissions.py54
-rw-r--r--SmallYTChannelDatabase.dbbin0 -> 435200 bytes
-rw-r--r--onceaday.py2
3 files changed, 30 insertions, 26 deletions
diff --git a/SmallYTChannelBotSubmissions.py b/SmallYTChannelBotSubmissions.py
index 5c98528..db45e1e 100644
--- a/SmallYTChannelBotSubmissions.py
+++ b/SmallYTChannelBotSubmissions.py
@@ -5,6 +5,7 @@ import matplotlib.pyplot as plt
from operator import itemgetter
from database import Database
import matplotlib
+import ytapi
import datetime
import ytapi
import login
@@ -249,11 +250,12 @@ def main():
will be rewarded 1λ if you do so. For more information, read the [FAQ](https://www.reddit.com/user/SmallYTChannelBot/comments/a4u7qj/smallytchannelbot_faq/)""" % (score - 3, str(submission.author))
db.change_lambda(str(submission.author), -3)
- ytid = ytapi.get_videoId_from_url(submission.url)
- if "/" not in ytid:
- ytdata = ytapi.get_video_data(ytid)
+ try:
+ ytid = ytapi.get_videoId_from_url(submission.url)
+ if "/" not in ytid:
+ ytdata = ytapi.get_video_data(ytid)
- text += """
+ text += """
\n\n\n##Video data:
Field|Data
@@ -275,27 +277,29 @@ Thumbnail|[Link](%s)
Subscribers|%s
Videos|%s
Views|%s
- """ % (
- ytdata["title"],
- ytdata["thumbnail"],
- ytdata["views"],
- ytdata["length"],
- ytdata["likes"],
- ytdata["dislikes"],
- ytdata["comments"],
- ytdata["description"],
- ytdata["channel"],
- ytdata["channelThumb"],
- ytdata["subscribers"],
- ytdata["videos"],
- ytdata["channelViews"]
- )
-
- curflair = submission.link_flair_text
- if str(curflair) != "None":
- submission.mod.flair(" %s | %s | :youtube: %s" % (curflair, ytdata["length"], ytdata["channel"]))
- else:
- submission.mod.flair("%s | :youtube: %s" % (ytdata["length"], ytdata["channel"]))
+ """ % (
+ ytdata["title"],
+ ytdata["thumbnail"],
+ ytdata["views"],
+ ytdata["length"],
+ ytdata["likes"],
+ ytdata["dislikes"],
+ ytdata["comments"],
+ ytdata["description"],
+ ytdata["channel"],
+ ytdata["channelThumb"],
+ ytdata["subscribers"],
+ ytdata["videos"],
+ ytdata["channelViews"]
+ )
+
+ curflair = submission.link_flair_text
+ if str(curflair) != "None":
+ submission.mod.flair(" %s | %s | :youtube: %s" % (curflair, ytdata["length"], ytdata["channel"]))
+ else:
+ submission.mod.flair("%s | :youtube: %s" % (ytdata["length"], ytdata["channel"]))
+ except:
+ pass
update_users_flair(submission)
reply = submission.reply(text + tail)
diff --git a/SmallYTChannelDatabase.db b/SmallYTChannelDatabase.db
new file mode 100644
index 0000000..353833f
--- /dev/null
+++ b/SmallYTChannelDatabase.db
Binary files differ
diff --git a/onceaday.py b/onceaday.py
index a84b0d9..5bebc54 100644
--- a/onceaday.py
+++ b/onceaday.py
@@ -5,5 +5,5 @@ SECONDS_IN_DAY = 25 * 60 * 60
while True:
SmallYTChannelBotSubmissions.every_day()
- print("Called @ %s" % SmallYTChannelBotSubmissions.get_time)
+ print("Called @ %s" % SmallYTChannelBotSubmissions.get_time())
sleep(SECONDS_IN_DAY)