aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Bonhomme <kimble.mandel@gmail.com>2013-04-03 08:26:27 +0200
committerCédric Bonhomme <kimble.mandel@gmail.com>2013-04-03 08:26:27 +0200
commit329fa76fae015c8f7faee17dd498e8e87125477b (patch)
tree930deed285dbdbf0a5ec7cc4f3f512fb1b52cb76
parentRemoved some useless regular expression. (diff)
downloadnewspipe-329fa76fae015c8f7faee17dd498e8e87125477b.tar.gz
newspipe-329fa76fae015c8f7faee17dd498e8e87125477b.tar.bz2
newspipe-329fa76fae015c8f7faee17dd498e8e87125477b.zip
THe code for the QR Code generation is now in utils.py.
-rwxr-xr-xsource/pyAggr3g470r.py20
-rwxr-xr-xsource/utils.py25
2 files changed, 26 insertions, 19 deletions
diff --git a/source/pyAggr3g470r.py b/source/pyAggr3g470r.py
index 79181d68..282ec600 100755
--- a/source/pyAggr3g470r.py
+++ b/source/pyAggr3g470r.py
@@ -60,9 +60,6 @@ import export
import mongodb
import feedgetter
import auth
-#from qrcode.pyqrnative.PyQRNative import QRCode, QRErrorCorrectLevel, CodeOverflowException
-#from qrcode import qr
-
def error_404(status, message, traceback, version):
"""
@@ -220,22 +217,9 @@ class pyAggr3g470r(object):
description += "\n<br />\n"
else:
description = "<p>No description available.</p>\n<br />\n"
- """
+
# Generation of the QR Code for the current article
- try:
- os.makedirs("./var/qrcode/")
- except OSError:
- pass
- if not os.path.isfile("./var/qrcode/" + article_id + ".png"):
- # QR Code generation
- try:
- f = qr.QRUrl(url = article["article_link"])
- f.make()
- except:
- f = qr.QRUrl(url = "URL too long.")
- f.make()
- f.save("./var/qrcode/"+article_id+".png")
- """
+ utils.generate_qr_code(article)
# Previous and following articles
previous, following = None, None
diff --git a/source/utils.py b/source/utils.py
index 09056bbe..d470456d 100755
--- a/source/utils.py
+++ b/source/utils.py
@@ -41,6 +41,12 @@ import operator
import calendar
import html.entities
+try:
+ from qrcode.pyqrnative.PyQRNative import QRCode, QRErrorCorrectLevel, CodeOverflowException
+ from qrcode import qr
+except:
+ pass
+
import smtplib
from email.mime.multipart import MIMEMultipart
from email.mime.text import MIMEText
@@ -80,6 +86,23 @@ def detect_url_errors(list_of_urls):
errors.append((url, e.reason.errno ,e.reason.strerror))
return errors
+def generate_qr_code(article):
+ """
+ Generated a QR Code for the article given in parameter.
+ """
+ try:
+ os.makedirs("./var/qrcode/")
+ except OSError:
+ pass
+ if not os.path.isfile("./var/qrcode/" + article["article_id"] + ".png"):
+ # QR Code generation
+ try:
+ f = qr.QRUrl(url = article["article_link"])
+ f.make()
+ f.save("./var/qrcode/" + article["article_id"] + ".png")
+ except:
+ pass
+
def clear_string(data):
"""
Clear a string by removing HTML tags, HTML special caracters
@@ -237,4 +260,4 @@ def search_feed(url):
if url not in feed_link['href']:
return urllib.parse.urljoin(url, feed_link['href'])
return feed_link['href']
- return None \ No newline at end of file
+ return None
bgstack15