add support for new templates

Author: slaporte

weeklypedia/bake.py

@@ -13,7 +13,8 @@
 from mail import Mailinglist, sendy_send_campaign, KEY
 from fetch import get_latest_data_path
 
-from common import (DATA_BASE_PATH,
+from common import (ARCHIVE_URL,
+                    DATA_BASE_PATH,
                     DEFAULT_LANGUAGE,
                     DEFAULT_INTRO,
                     DEBUG,
@@ -23,6 +24,7 @@
                     SUBJECT_TMPL,
                     SUPPORTED_LANGS,
                     SIGNUP_MAP,
+                    SENDY_IDS,
                     mkdir_p)
 
 _CUR_PATH = dirname(os.path.abspath(__file__))
@@ -38,7 +40,6 @@
 
 with open(os.path.join(_CUR_PATH, 'secrets.json')) as secrets_json:
     secrets = json.load(secrets_json)
-    SENDY_ID_MAP = secrets.get('sendy_ids')
 
 class Issue(object):
     def __init__(self,
@@ -188,7 +189,9 @@ def render_issue(render_ctx, issue_ashes_env,
     lang = render_ctx['short_lang_name']
     env = issue_ashes_env
     ctx = localize_data(render_ctx, lang)
-    ctx['list_id'] = SENDY_ID_MAP[lang]
+    ctx['list_id'] = SENDY_IDS[lang]
+    ctx['archive_link'] = ARCHIVE_URL % lang
+
     if format == 'html':
         ret = lang_fallback_render(env, lang, 'archive.html', ctx)
     elif format == 'email':
@@ -240,7 +243,7 @@ def render_archive(issue_ashes_env, lang):
         ret['issues'].insert(0, {'path': archive_path,
                                  'date': display_date})
     ret['lang'] = LANG_MAP[lang]
-    ret['list_id'] = SENDY_ID_MAP[lang]
+    ret['list_id'] = SENDY_IDS[lang]
     return issue_ashes_env.render('template_archive_index.html', ret)
 
 
@@ -261,6 +264,7 @@ def render_and_save_archives(issue_ashes_env):
     ret = []
     for lang in SUPPORTED_LANGS:
         out_path = ARCHIVE_INDEX_PATH_TMPL.format(lang_shortcode=lang)
+        mkdir_p(pjoin(ARCHIVE_BASE_PATH, lang))
         out_file = open(out_path, 'w')
         with out_file:
             rendered = render_archive(issue_ashes_env, lang)

weeklypedia/common.py

@@ -3,6 +3,7 @@
 import os
 import json
 from os.path import dirname, join as pjoin
+from boltons.fileutils import mkdir_p
 
 DEBUG = False
 
@@ -15,33 +16,59 @@
 _CUR_PATH = dirname(os.path.abspath(__file__))
 
 LANG_MAP = json.load(open(pjoin(_CUR_PATH, 'language_codes.json')))
-LOCAL_LANG_MAP = {'en': u'English'}
-                  # 'de': u'Deutsch',
-                  # 'fr': u'Français',
-                  # 'ko': u'한국어',
-                  # 'et': u'Eesti',
-                  # 'sv': u'Svenska',
-                  # 'da': u'Dansk',
-                  # 'it': u'Italiano',
-                  # 'ca': u'Català',
-                  # 'es': u'Español',
-                  # 'fa': u'فارسی',
-                  # 'ur': u'اردو',
-                  # 'zh': u'中文',
-                  # 'kn': u'ಕನ್ನಡ',
-                  # 'lv': u'Latvian',
-                  # 'el': u'ελληνική',
-                  # 'te': u'తెలుగు',
-                  # 'oc': 'Occitan',
-                  # 'ru': 'Russian',
-                  # 'uk': 'Ukrainian'}
+LOCAL_LANG_MAP = {'en': u'English',
+                  'de': u'Deutsch',
+                  'eo': u'Esperanto',
+                  'fr': u'Français',
+                  'ko': u'한국어',
+                  'et': u'Eesti',
+                  'sv': u'Svenska',
+                  'da': u'Dansk',
+                  'it': u'Italiano',
+                  'ca': u'Català',
+                  'es': u'Español',
+                  'fa': u'فارسی',
+                  'ur': u'اردو',
+                  'zh': u'中文',
+                  'kn': u'ಕನ್ನಡ',
+                  'lv': u'Latvian',
+                  'el': u'ελληνική',
+                  'te': u'తెలుగు',
+                  'oc': 'Occitan',
+                  'ru': 'Russian',
+                  'uk': 'Ukrainian'}
 SENDKEY = json.load(open(os.path.join(_CUR_PATH, 'secrets.json'))).get('key')
-SUPPORTED_LANGS = ['en']
-# 'de', 'fr', 'ko', 'et', 'sv', 'da', 'it', 'ca', 'es',
-#                  'fa', 'zh', 'ur', 'kn', 'lv', 'el', 'te', 'oc', 'ru', 'uk']
+
+SENDY_IDS = {'ca': '9sW1OtFlCbJlYgxSXuahHQ',
+             'zh': 'aSQ6TT0VKpw0tmzBPaRZDg',
+             'da': '0cs1zVQp3892EjjL0763350TeQ',
+             'en': 'rFf1E97OGw9qMfZh1F81KA',
+             #'en': 'VN7NFOFUPp5WjrbMSH7Puw', # debug
+             'es': 'HTPao3LPmzm0UrCNxfBUgA',
+             'eo': 'H804892jOtJrNTukmVWOlrbA',
+             'et': 'db8mkJ2Tl6pnNUIIVfMFog',
+             'fr': 'ELz1OOSd3olC6LSCJmCqhw',
+             'de': 't0892Imxu8HTkzoPkrow11MQ',
+             'it': 'EkOruTQZ64fx7V5k9heZNw',
+             'kn': 'Dn9KffuyqLRKSY9XAwPCHQ',
+             'ko': '65Y8dYqreq2Frkav2WmJ9Q',
+             'lv': 'zgfaJH8Jskz7VxNai9zc763A',
+             'sv': 'bqpefw4ZBxMBHxrTz9dPKg',
+             'fa': 'mRGhgpBb4RnwDe25RtP8fA',
+             'el': 'Ts6mbUlmOCiD0mlWPL8T4A',
+             'oc': 'OrhmrHkNlTRR9KWNMAgDMQ',
+             'ru': 'IUDkAYoiJDQ7P3AQtLIAhQ',
+             'es': '5EzGTlwChgHME1TDa763nncA',
+             'te': 'rp4VkbQ1p2QXi560nIrF3w',
+             'ur': 'QiUlnjE3S9kPdvpzWQdK5Q',
+             'uk': 'gYfAtFPIVbJgVLkEfpO892Uw '}
+
+SUPPORTED_LANGS = SENDY_IDS.keys()
+
 API_BASE_URL = 'http://weeklypedia.toolforge.org/fetch/'
 
 ARCHIVE_BASE_PATH = pjoin(dirname(_CUR_PATH), 'static', 'archive')
+ARCHIVE_URL = 'https://weekly.hatnote.com/archive/%s/index.html'
 
 DATA_BASE_PATH = pjoin(dirname(_CUR_PATH), 'static', 'data')
 DATA_PATH_TMPL = '{lang_shortcode}/{date_str}{dev_flag}/weeklypedia_{lang_shortcode}_{date_str}{dev_flag}.json'
@@ -72,12 +99,12 @@
               'uk': 'http://eepurl.com/dxJKwf'}
 
 
-def mkdir_p(path):
-    # bolton
-    import errno
-    try:
-        os.makedirs(path)
-    except OSError as exc:
-        if exc.errno == errno.EEXIST and os.path.isdir(path):
-            return
-        raise
+# def mkdir_p(path):
+#     # bolton
+#     import errno
+#     try:
+#         os.makedirs(path)
+#     except OSError as exc:
+#         if exc.errno == errno.EEXIST and os.path.isdir(path):
+#             return
+#         raise

weeklypedia/publish.py

@@ -6,15 +6,14 @@
 from argparse import ArgumentParser
 from clastic.render import AshesRenderFactory
 
-from common import DEBUG, DEBUG_LIST_ID, SENDKEY
+from common import DEBUG, DEBUG_LIST_ID, SENDKEY, SUPPORTED_LANGS
 
 from web import (comma_int,
                  ISSUE_TEMPLATES_PATH)
 
 from bake import (Issue,
                   bake_latest_issue,
-                  render_index,
-                  SUPPORTED_LANGS)
+                  render_index)
 
 _CUR_PATH = dirname(os.path.abspath(__file__))
 
@@ -69,3 +68,6 @@ def get_argparser():
             print 'not sending...'
         else:
             print send_issue(lang, mailer, debug)
+
+    else:
+        print '!! language %s not supported' % args.lang