libervia-backend: sat_frontends/jp/cmd

annotate sat_frontends/jp/cmd_blog.py @ 3696:52ee22d78e18

plugin XEP-0384: fix encryption for user own devices: our own jid is added automatically by OMEMO library, but during the generation of the stanza, our list of jids was used to get the keys (and thus our own jid and devices keys was missing). fix 402

author	Goffi <goffi@goffi.org>
date	Fri, 22 Oct 2021 18:46:51 +0200
parents	82e616b70a2a
children	bef32f3ccc06

rev	line source
3137 559a625a236b fixed shebangs Goffi <goffi@goffi.org> parents: 3136 diff changeset	1 #!/usr/bin/env python3
559a625a236b fixed shebangs Goffi <goffi@goffi.org> parents: 3136 diff changeset	2
1827 74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	3
74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	4 # jp: a SàT command line tool
3479 be6d91572633 date update Goffi <goffi@goffi.org> parents: 3342 diff changeset	5 # Copyright (C) 2009-2021 Jérôme Poisson (goffi@goffi.org)
1827 74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	6
74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	7 # This program is free software: you can redistribute it and/or modify
74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	8 # it under the terms of the GNU Affero General Public License as published by
74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	9 # the Free Software Foundation, either version 3 of the License, or
74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	10 # (at your option) any later version.
74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	11
74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	12 # This program is distributed in the hope that it will be useful,
74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	13 # but WITHOUT ANY WARRANTY; without even the implied warranty of
74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	14 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	15 # GNU Affero General Public License for more details.
74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	16
74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	17 # You should have received a copy of the GNU Affero General Public License
74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	18 # along with this program. If not, see <http://www.gnu.org/licenses/>.
74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	19
74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	20
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	21 import json
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	22 import sys
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	23 import os.path
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	24 import os
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	25 import time
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	26 import tempfile
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	27 import subprocess
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	28 import asyncio
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	29 from asyncio.subprocess import DEVNULL
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	30 from pathlib import Path
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	31 from . import base
1827 74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	32 from sat.core.i18n import _
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	33 from sat_frontends.jp.constants import Const as C
2269 606ff34d30f2 jp (blog, common): moved and improved edit code from blog: Goffi <goffi@goffi.org> parents: 2267 diff changeset	34 from sat_frontends.jp import common
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	35 from sat.tools.common.ansi import ANSI as A
2327 dad500e7ae50 jp (blog/get): added "url" key, which compute xmpp: URL of items Goffi <goffi@goffi.org> parents: 2325 diff changeset	36 from sat.tools.common import uri
1866 397ef87958b9 jp (blog): edit command, first draft: Goffi <goffi@goffi.org> parents: 1864 diff changeset	37 from sat.tools import config
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	38 from configparser import NoSectionError, NoOptionError
1919 d3354c80bd1f core (tools): moved common to a separate package, and put data method in a data_format module Goffi <goffi@goffi.org> parents: 1912 diff changeset	39 from sat.tools.common import data_format
1866 397ef87958b9 jp (blog): edit command, first draft: Goffi <goffi@goffi.org> parents: 1864 diff changeset	40
397ef87958b9 jp (blog): edit command, first draft: Goffi <goffi@goffi.org> parents: 1864 diff changeset	41 __commands__ = ["Blog"]
397ef87958b9 jp (blog): edit command, first draft: Goffi <goffi@goffi.org> parents: 1864 diff changeset	42
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	43 SYNTAX_XHTML = "xhtml"
1872 df1ca137b0cb jp (blog/edit): editor arguments can now be specified on sat.conf, and default on are applied for known editors: Goffi <goffi@goffi.org> parents: 1871 diff changeset	44 # extensions to use with known syntaxes
df1ca137b0cb jp (blog/edit): editor arguments can now be specified on sat.conf, and default on are applied for known editors: Goffi <goffi@goffi.org> parents: 1871 diff changeset	45 SYNTAX_EXT = {
2944 efb915a20d5d jp (blog/set): fixed missing current_syntax Goffi <goffi@goffi.org> parents: 2943 diff changeset	46 # FIXME: default syntax doesn't sounds needed, there should always be a syntax set
efb915a20d5d jp (blog/set): fixed missing current_syntax Goffi <goffi@goffi.org> parents: 2943 diff changeset	47 # by the plugin.
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	48 "": "txt", # used when the syntax is not found
2330 74c1dbabeec8 jp (blog/edit): pretty format XHTML before editing it Goffi <goffi@goffi.org> parents: 2327 diff changeset	49 SYNTAX_XHTML: "xhtml",
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	50 "markdown": "md",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	51 }
1872 df1ca137b0cb jp (blog/edit): editor arguments can now be specified on sat.conf, and default on are applied for known editors: Goffi <goffi@goffi.org> parents: 1871 diff changeset	52
df1ca137b0cb jp (blog/edit): editor arguments can now be specified on sat.conf, and default on are applied for known editors: Goffi <goffi@goffi.org> parents: 1871 diff changeset	53
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	54 CONF_SYNTAX_EXT = "syntax_ext_dict"
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	55 BLOG_TMP_DIR = "blog"
1868 28b29381db75 jp (blog/edit): added metadata handling through a .json file (named like content temporary file, but with extension replaced by "_metadata.json"). Modification to this file before the end of edition will be taken into account. Goffi <goffi@goffi.org> parents: 1866 diff changeset	56 # key to remove from metadata tmp file if they exist
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	57 KEY_TO_REMOVE_METADATA = (
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	58 "id",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	59 "content",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	60 "content_xhtml",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	61 "comments_node",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	62 "comments_service",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	63 "updated",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	64 )
1866 397ef87958b9 jp (blog): edit command, first draft: Goffi <goffi@goffi.org> parents: 1864 diff changeset	65
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	66 URL_REDIRECT_PREFIX = "url_redirect_"
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	67 AIONOTIFY_INSTALL = '"pip install aionotify"'
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	68 MB_KEYS = (
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	69 "id",
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	70 "url",
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	71 "atom_id",
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	72 "updated",
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	73 "published",
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	74 "language",
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	75 "comments", # this key is used for all comments* keys
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	76 "tags", # this key is used for all tag* keys
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	77 "author",
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	78 "author_jid",
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	79 "author_email",
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	80 "author_jid_verified",
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	81 "content",
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	82 "content_xhtml",
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	83 "title",
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	84 "title_xhtml",
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	85 )
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	86 OUTPUT_OPT_NO_HEADER = "no-header"
1827 74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	87
1866 397ef87958b9 jp (blog): edit command, first draft: Goffi <goffi@goffi.org> parents: 1864 diff changeset	88
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	89 async def guessSyntaxFromPath(host, sat_conf, path):
2532 772447ec070f jp: pubsub options refactoring: Goffi <goffi@goffi.org> parents: 2485 diff changeset	90 """Return syntax guessed according to filename extension
1877 a97db84c048d jp (blog): moved common method in a BlogCommon class + added "current" as an item keyword for blog/edit Goffi <goffi@goffi.org> parents: 1876 diff changeset	91
2532 772447ec070f jp: pubsub options refactoring: Goffi <goffi@goffi.org> parents: 2485 diff changeset	92 @param sat_conf(ConfigParser.ConfigParser): instance opened on sat configuration
772447ec070f jp: pubsub options refactoring: Goffi <goffi@goffi.org> parents: 2485 diff changeset	93 @param path(str): path to the content file
772447ec070f jp: pubsub options refactoring: Goffi <goffi@goffi.org> parents: 2485 diff changeset	94 @return(unicode): syntax to use
772447ec070f jp: pubsub options refactoring: Goffi <goffi@goffi.org> parents: 2485 diff changeset	95 """
772447ec070f jp: pubsub options refactoring: Goffi <goffi@goffi.org> parents: 2485 diff changeset	96 # we first try to guess syntax with extension
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	97 ext = os.path.splitext(path)[1][1:] # we get extension without the '.'
2532 772447ec070f jp: pubsub options refactoring: Goffi <goffi@goffi.org> parents: 2485 diff changeset	98 if ext:
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	99 for k, v in SYNTAX_EXT.items():
2532 772447ec070f jp: pubsub options refactoring: Goffi <goffi@goffi.org> parents: 2485 diff changeset	100 if k and ext == v:
772447ec070f jp: pubsub options refactoring: Goffi <goffi@goffi.org> parents: 2485 diff changeset	101 return k
1877 a97db84c048d jp (blog): moved common method in a BlogCommon class + added "current" as an item keyword for blog/edit Goffi <goffi@goffi.org> parents: 1876 diff changeset	102
3568 04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	103 # if not found, we use current syntax
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	104 return await host.bridge.getParamA("Syntax", "Composition", "value", host.profile)
1874 658824755a0c jp (blog): preview command, first draft Goffi <goffi@goffi.org> parents: 1873 diff changeset	105
658824755a0c jp (blog): preview command, first draft Goffi <goffi@goffi.org> parents: 1873 diff changeset	106
2458 4841ad6a5db4 jp (blog): added "set" command to publish content from stdin without editing Goffi <goffi@goffi.org> parents: 2414 diff changeset	107 class BlogPublishCommon(object):
4841ad6a5db4 jp (blog): added "set" command to publish content from stdin without editing Goffi <goffi@goffi.org> parents: 2414 diff changeset	108 """handle common option for publising commands (Set and Edit)"""
4841ad6a5db4 jp (blog): added "set" command to publish content from stdin without editing Goffi <goffi@goffi.org> parents: 2414 diff changeset	109
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	110 async def get_current_syntax(self):
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	111 """Retrieve current_syntax
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	112
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	113 Use default syntax if --syntax has not been used, else check given syntax.
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	114 Will set self.default_syntax_used to True if default syntax has been used
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	115 """
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	116 if self.args.syntax is None:
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	117 self.default_syntax_used = True
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	118 return await self.host.bridge.getParamA(
2944 efb915a20d5d jp (blog/set): fixed missing current_syntax Goffi <goffi@goffi.org> parents: 2943 diff changeset	119 "Syntax", "Composition", "value", self.profile
efb915a20d5d jp (blog/set): fixed missing current_syntax Goffi <goffi@goffi.org> parents: 2943 diff changeset	120 )
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	121 else:
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	122 self.default_syntax_used = False
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	123 try:
3342 9dbe2517d131 jp (blog/edit): fixed edition when syntax is specified Goffi <goffi@goffi.org> parents: 3308 diff changeset	124 syntax = await self.host.bridge.syntaxGet(self.args.syntax)
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	125 self.current_syntax = self.args.syntax = syntax
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	126 except Exception as e:
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	127 if e.classname == "NotFound":
3568 04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	128 self.parser.error(
04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	129 _("unknown syntax requested ({syntax})").format(
04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	130 syntax=self.args.syntax
04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	131 )
04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	132 )
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	133 else:
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	134 raise e
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	135 return self.args.syntax
2944 efb915a20d5d jp (blog/set): fixed missing current_syntax Goffi <goffi@goffi.org> parents: 2943 diff changeset	136
2458 4841ad6a5db4 jp (blog): added "set" command to publish content from stdin without editing Goffi <goffi@goffi.org> parents: 2414 diff changeset	137 def add_parser_options(self):
3568 04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	138 self.parser.add_argument("-T", "--title", help=_("title of the item"))
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	139 self.parser.add_argument(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	140 "-t",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	141 "--tag",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	142 action="append",
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	143 help=_("tag (category) of your item"),
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	144 )
3097 2a7dfe43b161 jp (blog): added --language to common publish argument Goffi <goffi@goffi.org> parents: 3046 diff changeset	145 self.parser.add_argument(
2a7dfe43b161 jp (blog): added --language to common publish argument Goffi <goffi@goffi.org> parents: 3046 diff changeset	146 "-l",
2a7dfe43b161 jp (blog): added --language to common publish argument Goffi <goffi@goffi.org> parents: 3046 diff changeset	147 "--language",
2a7dfe43b161 jp (blog): added --language to common publish argument Goffi <goffi@goffi.org> parents: 3046 diff changeset	148 help=_("language of the item (ISO 639 code)"),
2a7dfe43b161 jp (blog): added --language to common publish argument Goffi <goffi@goffi.org> parents: 3046 diff changeset	149 )
2808 51c53fc4fc4a jp (blog/edit): changed comments handling: Goffi <goffi@goffi.org> parents: 2807 diff changeset	150
51c53fc4fc4a jp (blog/edit): changed comments handling: Goffi <goffi@goffi.org> parents: 2807 diff changeset	151 comments_group = self.parser.add_mutually_exclusive_group()
51c53fc4fc4a jp (blog/edit): changed comments handling: Goffi <goffi@goffi.org> parents: 2807 diff changeset	152 comments_group.add_argument(
3568 04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	153 "-C",
04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	154 "--comments",
04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	155 action="store_const",
04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	156 const=True,
04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	157 dest="comments",
04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	158 help=_(
04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	159 "enable comments (default: comments not enabled except if they "
04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	160 "already exist)"
04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	161 ),
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	162 )
2808 51c53fc4fc4a jp (blog/edit): changed comments handling: Goffi <goffi@goffi.org> parents: 2807 diff changeset	163 comments_group.add_argument(
3568 04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	164 "--no-comments",
04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	165 action="store_const",
04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	166 const=False,
04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	167 dest="comments",
04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	168 help=_("disable comments (will remove comments node if it exist)"),
2808 51c53fc4fc4a jp (blog/edit): changed comments handling: Goffi <goffi@goffi.org> parents: 2807 diff changeset	169 )
51c53fc4fc4a jp (blog/edit): changed comments handling: Goffi <goffi@goffi.org> parents: 2807 diff changeset	170
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	171 self.parser.add_argument(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	172 "-S",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	173 "--syntax",
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	174 help=_("syntax to use (default: get profile's default syntax)"),
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	175 )
2458 4841ad6a5db4 jp (blog): added "set" command to publish content from stdin without editing Goffi <goffi@goffi.org> parents: 2414 diff changeset	176
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	177 async def setMbDataContent(self, content, mb_data):
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	178 if self.default_syntax_used:
2458 4841ad6a5db4 jp (blog): added "set" command to publish content from stdin without editing Goffi <goffi@goffi.org> parents: 2414 diff changeset	179 # default syntax has been used
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	180 mb_data["content_rich"] = content
2458 4841ad6a5db4 jp (blog): added "set" command to publish content from stdin without editing Goffi <goffi@goffi.org> parents: 2414 diff changeset	181 elif self.current_syntax == SYNTAX_XHTML:
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	182 mb_data["content_xhtml"] = content
2458 4841ad6a5db4 jp (blog): added "set" command to publish content from stdin without editing Goffi <goffi@goffi.org> parents: 2414 diff changeset	183 else:
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	184 mb_data["content_xhtml"] = await self.host.bridge.syntaxConvert(
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	185 content, self.current_syntax, SYNTAX_XHTML, False, self.profile
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	186 )
2458 4841ad6a5db4 jp (blog): added "set" command to publish content from stdin without editing Goffi <goffi@goffi.org> parents: 2414 diff changeset	187
4841ad6a5db4 jp (blog): added "set" command to publish content from stdin without editing Goffi <goffi@goffi.org> parents: 2414 diff changeset	188 def setMbDataFromArgs(self, mb_data):
4841ad6a5db4 jp (blog): added "set" command to publish content from stdin without editing Goffi <goffi@goffi.org> parents: 2414 diff changeset	189 """set microblog metadata according to command line options
4841ad6a5db4 jp (blog): added "set" command to publish content from stdin without editing Goffi <goffi@goffi.org> parents: 2414 diff changeset	190
4841ad6a5db4 jp (blog): added "set" command to publish content from stdin without editing Goffi <goffi@goffi.org> parents: 2414 diff changeset	191 if metadata already exist, it will be overwritten
4841ad6a5db4 jp (blog): added "set" command to publish content from stdin without editing Goffi <goffi@goffi.org> parents: 2414 diff changeset	192 """
2807 0b7ce5daee9b plugin XEP-0277: blog items data are now entirely serialised before going to bridge: Goffi <goffi@goffi.org> parents: 2771 diff changeset	193 if self.args.comments is not None:
0b7ce5daee9b plugin XEP-0277: blog items data are now entirely serialised before going to bridge: Goffi <goffi@goffi.org> parents: 2771 diff changeset	194 mb_data["allow_comments"] = self.args.comments
2458 4841ad6a5db4 jp (blog): added "set" command to publish content from stdin without editing Goffi <goffi@goffi.org> parents: 2414 diff changeset	195 if self.args.tag:
3568 04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	196 mb_data["tags"] = self.args.tag
2458 4841ad6a5db4 jp (blog): added "set" command to publish content from stdin without editing Goffi <goffi@goffi.org> parents: 2414 diff changeset	197 if self.args.title is not None:
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	198 mb_data["title"] = self.args.title
3097 2a7dfe43b161 jp (blog): added --language to common publish argument Goffi <goffi@goffi.org> parents: 3046 diff changeset	199 if self.args.language is not None:
2a7dfe43b161 jp (blog): added --language to common publish argument Goffi <goffi@goffi.org> parents: 3046 diff changeset	200 mb_data["language"] = self.args.language
2458 4841ad6a5db4 jp (blog): added "set" command to publish content from stdin without editing Goffi <goffi@goffi.org> parents: 2414 diff changeset	201
4841ad6a5db4 jp (blog): added "set" command to publish content from stdin without editing Goffi <goffi@goffi.org> parents: 2414 diff changeset	202
2532 772447ec070f jp: pubsub options refactoring: Goffi <goffi@goffi.org> parents: 2485 diff changeset	203 class Set(base.CommandBase, BlogPublishCommon):
2458 4841ad6a5db4 jp (blog): added "set" command to publish content from stdin without editing Goffi <goffi@goffi.org> parents: 2414 diff changeset	204 def __init__(self, host):
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	205 base.CommandBase.__init__(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	206 self,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	207 host,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	208 "set",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	209 use_pubsub=True,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	210 pubsub_flags={C.SINGLE_ITEM},
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	211 help=_("publish a new blog item or update an existing one"),
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	212 )
2458 4841ad6a5db4 jp (blog): added "set" command to publish content from stdin without editing Goffi <goffi@goffi.org> parents: 2414 diff changeset	213 BlogPublishCommon.__init__(self)
4841ad6a5db4 jp (blog): added "set" command to publish content from stdin without editing Goffi <goffi@goffi.org> parents: 2414 diff changeset	214
4841ad6a5db4 jp (blog): added "set" command to publish content from stdin without editing Goffi <goffi@goffi.org> parents: 2414 diff changeset	215 def add_parser_options(self):
4841ad6a5db4 jp (blog): added "set" command to publish content from stdin without editing Goffi <goffi@goffi.org> parents: 2414 diff changeset	216 BlogPublishCommon.add_parser_options(self)
4841ad6a5db4 jp (blog): added "set" command to publish content from stdin without editing Goffi <goffi@goffi.org> parents: 2414 diff changeset	217
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	218 async def start(self):
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	219 self.current_syntax = await self.get_current_syntax()
2458 4841ad6a5db4 jp (blog): added "set" command to publish content from stdin without editing Goffi <goffi@goffi.org> parents: 2414 diff changeset	220 self.pubsub_item = self.args.item
4841ad6a5db4 jp (blog): added "set" command to publish content from stdin without editing Goffi <goffi@goffi.org> parents: 2414 diff changeset	221 mb_data = {}
4841ad6a5db4 jp (blog): added "set" command to publish content from stdin without editing Goffi <goffi@goffi.org> parents: 2414 diff changeset	222 self.setMbDataFromArgs(mb_data)
2910 b2f323237fce jp, plugin merge-requests: used u'' as default for item id in pubsub arguments + fixed some required arguments: Goffi <goffi@goffi.org> parents: 2876 diff changeset	223 if self.pubsub_item:
2876 84f82d014d06 jp (blog/set): fixed use of --item argument Goffi <goffi@goffi.org> parents: 2870 diff changeset	224 mb_data["id"] = self.pubsub_item
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	225 content = sys.stdin.read()
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	226 await self.setMbDataContent(content, mb_data)
2458 4841ad6a5db4 jp (blog): added "set" command to publish content from stdin without editing Goffi <goffi@goffi.org> parents: 2414 diff changeset	227
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	228 try:
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	229 await self.host.bridge.mbSend(
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	230 self.args.service,
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	231 self.args.node,
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	232 data_format.serialise(mb_data),
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	233 self.profile,
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	234 )
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	235 except Exception as e:
3568 04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	236 self.disp(f"can't send item: {e}", error=True)
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	237 self.host.quit(C.EXIT_BRIDGE_ERRBACK)
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	238 else:
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	239 self.disp("Item published")
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	240 self.host.quit(C.EXIT_OK)
2458 4841ad6a5db4 jp (blog): added "set" command to publish content from stdin without editing Goffi <goffi@goffi.org> parents: 2414 diff changeset	241
4841ad6a5db4 jp (blog): added "set" command to publish content from stdin without editing Goffi <goffi@goffi.org> parents: 2414 diff changeset	242
2532 772447ec070f jp: pubsub options refactoring: Goffi <goffi@goffi.org> parents: 2485 diff changeset	243 class Get(base.CommandBase):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	244 TEMPLATE = "blog/articles.html"
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	245
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	246 def __init__(self, host):
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	247 extra_outputs = {"default": self.default_output, "fancy": self.fancy_output}
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	248 base.CommandBase.__init__(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	249 self,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	250 host,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	251 "get",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	252 use_verbose=True,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	253 use_pubsub=True,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	254 pubsub_flags={C.MULTI_ITEMS},
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	255 use_output=C.OUTPUT_COMPLEX,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	256 extra_outputs=extra_outputs,
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	257 help=_("get blog item(s)"),
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	258 )
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	259
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	260 def add_parser_options(self):
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	261 # TODO: a key(s) argument to select keys to display
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	262 self.parser.add_argument(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	263 "-k",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	264 "--key",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	265 action="append",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	266 dest="keys",
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	267 help=_("microblog data key(s) to display (default: depend of verbosity)"),
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	268 )
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	269 # TODO: add MAM filters
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	270
2164 63d191c05ecd jp (blog): set default template and data mapping for the new template output Goffi <goffi@goffi.org> parents: 2161 diff changeset	271 def template_data_mapping(self, data):
3308 384283adcce1 plugins XEP-0059, XEP-0060, XEP-0277, XEP-0313: better serialisation: Goffi <goffi@goffi.org> parents: 3241 diff changeset	272 items, blog_items = data
3568 04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	273 blog_items["items"] = items
3308 384283adcce1 plugins XEP-0059, XEP-0060, XEP-0277, XEP-0313: better serialisation: Goffi <goffi@goffi.org> parents: 3241 diff changeset	274 return {"blog_items": blog_items}
2164 63d191c05ecd jp (blog): set default template and data mapping for the new template output Goffi <goffi@goffi.org> parents: 2161 diff changeset	275
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	276 def format_comments(self, item, keys):
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	277 lines = []
3568 04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	278 for data in item.get("comments", []):
3520 8acaf857cd0a jp (blog/get): fix comments node parsing Goffi <goffi@goffi.org> parents: 3479 diff changeset	279 lines.append(data["uri"])
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	280 for k in ("node", "service"):
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	281 if OUTPUT_OPT_NO_HEADER in self.args.output_opts:
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	282 header = ""
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	283 else:
3520 8acaf857cd0a jp (blog/get): fix comments node parsing Goffi <goffi@goffi.org> parents: 3479 diff changeset	284 header = f"{C.A_HEADER}comments_{k}: {A.RESET}"
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	285 lines.append(header + data[k])
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	286 return "\n".join(lines)
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	287
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	288 def format_tags(self, item, keys):
3568 04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	289 tags = item.pop("tags", [])
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	290 return ", ".join(tags)
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	291
2158 970a348d3fe9 jp (blog/get): fancy output prints author, published and updated if verbosity > 1 and tags if verbosity > 2 + format published and updated Goffi <goffi@goffi.org> parents: 2157 diff changeset	292 def format_updated(self, item, keys):
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	293 return self.format_time(item["updated"])
2158 970a348d3fe9 jp (blog/get): fancy output prints author, published and updated if verbosity > 1 and tags if verbosity > 2 + format published and updated Goffi <goffi@goffi.org> parents: 2157 diff changeset	294
970a348d3fe9 jp (blog/get): fancy output prints author, published and updated if verbosity > 1 and tags if verbosity > 2 + format published and updated Goffi <goffi@goffi.org> parents: 2157 diff changeset	295 def format_published(self, item, keys):
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	296 return self.format_time(item["published"])
2158 970a348d3fe9 jp (blog/get): fancy output prints author, published and updated if verbosity > 1 and tags if verbosity > 2 + format published and updated Goffi <goffi@goffi.org> parents: 2157 diff changeset	297
2327 dad500e7ae50 jp (blog/get): added "url" key, which compute xmpp: URL of items Goffi <goffi@goffi.org> parents: 2325 diff changeset	298 def format_url(self, item, keys):
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	299 return uri.buildXMPPUri(
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	300 "pubsub",
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	301 subtype="microblog",
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	302 path=self.metadata["service"],
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	303 node=self.metadata["node"],
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	304 item=item["id"],
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	305 )
2327 dad500e7ae50 jp (blog/get): added "url" key, which compute xmpp: URL of items Goffi <goffi@goffi.org> parents: 2325 diff changeset	306
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	307 def get_keys(self):
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	308 """return keys to display according to verbosity or explicit key request"""
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	309 verbosity = self.args.verbose
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	310 if self.args.keys:
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	311 if not set(MB_KEYS).issuperset(self.args.keys):
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	312 self.disp(
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	313 "following keys are invalid: {invalid}.\n"
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	314 "Valid keys are: {valid}.".format(
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	315 invalid=", ".join(set(self.args.keys).difference(MB_KEYS)),
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	316 valid=", ".join(sorted(MB_KEYS)),
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	317 ),
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	318 error=True,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	319 )
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	320 self.host.quit(C.EXIT_BAD_ARG)
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	321 return self.args.keys
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	322 else:
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	323 if verbosity == 0:
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	324 return ("title", "content")
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	325 elif verbosity == 1:
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	326 return (
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	327 "title",
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	328 "tags",
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	329 "author",
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	330 "author_jid",
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	331 "author_email",
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	332 "author_jid_verified",
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	333 "published",
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	334 "updated",
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	335 "content",
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	336 )
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	337 else:
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	338 return MB_KEYS
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	339
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	340 def default_output(self, data):
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	341 """simple key/value output"""
2327 dad500e7ae50 jp (blog/get): added "url" key, which compute xmpp: URL of items Goffi <goffi@goffi.org> parents: 2325 diff changeset	342 items, self.metadata = data
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	343 keys = self.get_keys()
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	344
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	345 # k_cb use format_[key] methods for complex formattings
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	346 k_cb = {}
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	347 for k in keys:
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	348 try:
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	349 callback = getattr(self, "format_" + k)
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	350 except AttributeError:
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	351 pass
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	352 else:
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	353 k_cb[k] = callback
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	354 for idx, item in enumerate(items):
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	355 for k in keys:
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	356 if k not in item and k not in k_cb:
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	357 continue
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	358 if OUTPUT_OPT_NO_HEADER in self.args.output_opts:
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	359 header = ""
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	360 else:
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	361 header = "{k_fmt}{key}:{k_fmt_e} {sep}".format(
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	362 k_fmt=C.A_HEADER,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	363 key=k,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	364 k_fmt_e=A.RESET,
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	365 sep="\n" if "content" in k else "",
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	366 )
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	367 value = k_cb[k](item, keys) if k in k_cb else item[k]
2807 0b7ce5daee9b plugin XEP-0277: blog items data are now entirely serialised before going to bridge: Goffi <goffi@goffi.org> parents: 2771 diff changeset	368 if isinstance(value, bool):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	369 value = str(value).lower()
2161 62dfa6e02f54 jp (base, blog, output(std)): fixed bad unicode handling in stdout, use of jp.disp instead of simple print Goffi <goffi@goffi.org> parents: 2158 diff changeset	370 self.disp(header + value)
3568 04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	371 # we want a separation line after each item but the last one
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	372 if idx < len(items) - 1:
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	373 print("")
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	374
2158 970a348d3fe9 jp (blog/get): fancy output prints author, published and updated if verbosity > 1 and tags if verbosity > 2 + format published and updated Goffi <goffi@goffi.org> parents: 2157 diff changeset	375 def format_time(self, timestamp):
970a348d3fe9 jp (blog/get): fancy output prints author, published and updated if verbosity > 1 and tags if verbosity > 2 + format published and updated Goffi <goffi@goffi.org> parents: 2157 diff changeset	376 """return formatted date for timestamp
970a348d3fe9 jp (blog/get): fancy output prints author, published and updated if verbosity > 1 and tags if verbosity > 2 + format published and updated Goffi <goffi@goffi.org> parents: 2157 diff changeset	377
970a348d3fe9 jp (blog/get): fancy output prints author, published and updated if verbosity > 1 and tags if verbosity > 2 + format published and updated Goffi <goffi@goffi.org> parents: 2157 diff changeset	378 @param timestamp(str,int,float): unix timestamp
970a348d3fe9 jp (blog/get): fancy output prints author, published and updated if verbosity > 1 and tags if verbosity > 2 + format published and updated Goffi <goffi@goffi.org> parents: 2157 diff changeset	379 @return (unicode): formatted date
970a348d3fe9 jp (blog/get): fancy output prints author, published and updated if verbosity > 1 and tags if verbosity > 2 + format published and updated Goffi <goffi@goffi.org> parents: 2157 diff changeset	380 """
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	381 fmt = "%d/%m/%Y %H:%M:%S"
2158 970a348d3fe9 jp (blog/get): fancy output prints author, published and updated if verbosity > 1 and tags if verbosity > 2 + format published and updated Goffi <goffi@goffi.org> parents: 2157 diff changeset	382 return time.strftime(fmt, time.localtime(float(timestamp)))
970a348d3fe9 jp (blog/get): fancy output prints author, published and updated if verbosity > 1 and tags if verbosity > 2 + format published and updated Goffi <goffi@goffi.org> parents: 2157 diff changeset	383
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	384 def fancy_output(self, data):
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	385 """display blog is a nice to read way
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	386
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	387 this output doesn't use keys filter
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	388 """
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	389 # thanks to http://stackoverflow.com/a/943921
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	390 rows, columns = list(map(int, os.popen("stty size", "r").read().split()))
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	391 items, metadata = data
2158 970a348d3fe9 jp (blog/get): fancy output prints author, published and updated if verbosity > 1 and tags if verbosity > 2 + format published and updated Goffi <goffi@goffi.org> parents: 2157 diff changeset	392 verbosity = self.args.verbose
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	393 sep = A.color(A.FG_BLUE, columns * "▬")
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	394 if items:
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	395 print(("\n" + sep + "\n"))
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	396
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	397 for idx, item in enumerate(items):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	398 title = item.get("title")
2158 970a348d3fe9 jp (blog/get): fancy output prints author, published and updated if verbosity > 1 and tags if verbosity > 2 + format published and updated Goffi <goffi@goffi.org> parents: 2157 diff changeset	399 if verbosity > 0:
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	400 author = item["author"]
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	401 published, updated = item["published"], item.get("updated")
2158 970a348d3fe9 jp (blog/get): fancy output prints author, published and updated if verbosity > 1 and tags if verbosity > 2 + format published and updated Goffi <goffi@goffi.org> parents: 2157 diff changeset	402 else:
970a348d3fe9 jp (blog/get): fancy output prints author, published and updated if verbosity > 1 and tags if verbosity > 2 + format published and updated Goffi <goffi@goffi.org> parents: 2157 diff changeset	403 author = published = updated = None
970a348d3fe9 jp (blog/get): fancy output prints author, published and updated if verbosity > 1 and tags if verbosity > 2 + format published and updated Goffi <goffi@goffi.org> parents: 2157 diff changeset	404 if verbosity > 1:
3568 04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	405 tags = item.pop("tags", [])
2158 970a348d3fe9 jp (blog/get): fancy output prints author, published and updated if verbosity > 1 and tags if verbosity > 2 + format published and updated Goffi <goffi@goffi.org> parents: 2157 diff changeset	406 else:
970a348d3fe9 jp (blog/get): fancy output prints author, published and updated if verbosity > 1 and tags if verbosity > 2 + format published and updated Goffi <goffi@goffi.org> parents: 2157 diff changeset	407 tags = None
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	408 content = item.get("content")
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	409
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	410 if title:
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	411 print((A.color(A.BOLD, A.FG_CYAN, item["title"])))
2158 970a348d3fe9 jp (blog/get): fancy output prints author, published and updated if verbosity > 1 and tags if verbosity > 2 + format published and updated Goffi <goffi@goffi.org> parents: 2157 diff changeset	412 meta = []
970a348d3fe9 jp (blog/get): fancy output prints author, published and updated if verbosity > 1 and tags if verbosity > 2 + format published and updated Goffi <goffi@goffi.org> parents: 2157 diff changeset	413 if author:
970a348d3fe9 jp (blog/get): fancy output prints author, published and updated if verbosity > 1 and tags if verbosity > 2 + format published and updated Goffi <goffi@goffi.org> parents: 2157 diff changeset	414 meta.append(A.color(A.FG_YELLOW, author))
970a348d3fe9 jp (blog/get): fancy output prints author, published and updated if verbosity > 1 and tags if verbosity > 2 + format published and updated Goffi <goffi@goffi.org> parents: 2157 diff changeset	415 if published:
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	416 meta.append(A.color(A.FG_YELLOW, "on ", self.format_time(published)))
2158 970a348d3fe9 jp (blog/get): fancy output prints author, published and updated if verbosity > 1 and tags if verbosity > 2 + format published and updated Goffi <goffi@goffi.org> parents: 2157 diff changeset	417 if updated != published:
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	418 meta.append(
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	419 A.color(A.FG_YELLOW, "(updated on ", self.format_time(updated), ")")
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	420 )
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	421 print((" ".join(meta)))
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	422 if tags:
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	423 print((A.color(A.FG_MAGENTA, ", ".join(tags))))
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	424 if (title or tags) and content:
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	425 print("")
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	426 if content:
2161 62dfa6e02f54 jp (base, blog, output(std)): fixed bad unicode handling in stdout, use of jp.disp instead of simple print Goffi <goffi@goffi.org> parents: 2158 diff changeset	427 self.disp(content)
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	428
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	429 print(("\n" + sep + "\n"))
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	430
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	431 async def start(self):
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	432 try:
3308 384283adcce1 plugins XEP-0059, XEP-0060, XEP-0277, XEP-0313: better serialisation: Goffi <goffi@goffi.org> parents: 3241 diff changeset	433 mb_data = data_format.deserialise(
384283adcce1 plugins XEP-0059, XEP-0060, XEP-0277, XEP-0313: better serialisation: Goffi <goffi@goffi.org> parents: 3241 diff changeset	434 await self.host.bridge.mbGet(
384283adcce1 plugins XEP-0059, XEP-0060, XEP-0277, XEP-0313: better serialisation: Goffi <goffi@goffi.org> parents: 3241 diff changeset	435 self.args.service,
384283adcce1 plugins XEP-0059, XEP-0060, XEP-0277, XEP-0313: better serialisation: Goffi <goffi@goffi.org> parents: 3241 diff changeset	436 self.args.node,
384283adcce1 plugins XEP-0059, XEP-0060, XEP-0277, XEP-0313: better serialisation: Goffi <goffi@goffi.org> parents: 3241 diff changeset	437 self.args.max,
384283adcce1 plugins XEP-0059, XEP-0060, XEP-0277, XEP-0313: better serialisation: Goffi <goffi@goffi.org> parents: 3241 diff changeset	438 self.args.items,
384283adcce1 plugins XEP-0059, XEP-0060, XEP-0277, XEP-0313: better serialisation: Goffi <goffi@goffi.org> parents: 3241 diff changeset	439 self.getPubsubExtra(),
3568 04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	440 self.profile,
3308 384283adcce1 plugins XEP-0059, XEP-0060, XEP-0277, XEP-0313: better serialisation: Goffi <goffi@goffi.org> parents: 3241 diff changeset	441 )
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	442 )
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	443 except Exception as e:
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	444 self.disp(f"can't get blog items: {e}", error=True)
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	445 self.host.quit(C.EXIT_BRIDGE_ERRBACK)
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	446 else:
3568 04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	447 items = mb_data.pop("items")
3308 384283adcce1 plugins XEP-0059, XEP-0060, XEP-0277, XEP-0313: better serialisation: Goffi <goffi@goffi.org> parents: 3241 diff changeset	448 await self.output((items, mb_data))
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	449 self.host.quit(C.EXIT_OK)
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	450
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	451
2532 772447ec070f jp: pubsub options refactoring: Goffi <goffi@goffi.org> parents: 2485 diff changeset	452 class Edit(base.CommandBase, BlogPublishCommon, common.BaseEdit):
1866 397ef87958b9 jp (blog): edit command, first draft: Goffi <goffi@goffi.org> parents: 1864 diff changeset	453 def __init__(self, host):
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	454 base.CommandBase.__init__(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	455 self,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	456 host,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	457 "edit",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	458 use_pubsub=True,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	459 pubsub_flags={C.SINGLE_ITEM},
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	460 use_draft=True,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	461 use_verbose=True,
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	462 help=_("edit an existing or new blog post"),
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	463 )
2458 4841ad6a5db4 jp (blog): added "set" command to publish content from stdin without editing Goffi <goffi@goffi.org> parents: 2414 diff changeset	464 BlogPublishCommon.__init__(self)
2269 606ff34d30f2 jp (blog, common): moved and improved edit code from blog: Goffi <goffi@goffi.org> parents: 2267 diff changeset	465 common.BaseEdit.__init__(self, self.host, BLOG_TMP_DIR, use_metadata=True)
1866 397ef87958b9 jp (blog): edit command, first draft: Goffi <goffi@goffi.org> parents: 1864 diff changeset	466
397ef87958b9 jp (blog): edit command, first draft: Goffi <goffi@goffi.org> parents: 1864 diff changeset	467 def add_parser_options(self):
2458 4841ad6a5db4 jp (blog): added "set" command to publish content from stdin without editing Goffi <goffi@goffi.org> parents: 2414 diff changeset	468 BlogPublishCommon.add_parser_options(self)
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	469 self.parser.add_argument(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	470 "-P",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	471 "--preview",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	472 action="store_true",
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	473 help=_("launch a blog preview in parallel"),
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	474 )
3177 f4914ce9d47d jp (blog/edit): added `--no-publish` argument. Goffi <goffi@goffi.org> parents: 3137 diff changeset	475 self.parser.add_argument(
f4914ce9d47d jp (blog/edit): added `--no-publish` argument. Goffi <goffi@goffi.org> parents: 3137 diff changeset	476 "--no-publish",
3241 46f0b388eeea jp (blog/edit): --no-publish is a boolean option Goffi <goffi@goffi.org> parents: 3177 diff changeset	477 action="store_true",
3177 f4914ce9d47d jp (blog/edit): added `--no-publish` argument. Goffi <goffi@goffi.org> parents: 3137 diff changeset	478 help=_('add "publish: False" to metadata'),
f4914ce9d47d jp (blog/edit): added `--no-publish` argument. Goffi <goffi@goffi.org> parents: 3137 diff changeset	479 )
1866 397ef87958b9 jp (blog): edit command, first draft: Goffi <goffi@goffi.org> parents: 1864 diff changeset	480
1872 df1ca137b0cb jp (blog/edit): editor arguments can now be specified on sat.conf, and default on are applied for known editors: Goffi <goffi@goffi.org> parents: 1871 diff changeset	481 def buildMetadataFile(self, content_file_path, mb_data=None):
1868 28b29381db75 jp (blog/edit): added metadata handling through a .json file (named like content temporary file, but with extension replaced by "_metadata.json"). Modification to this file before the end of edition will be taken into account. Goffi <goffi@goffi.org> parents: 1866 diff changeset	482 """Build a metadata file using json
28b29381db75 jp (blog/edit): added metadata handling through a .json file (named like content temporary file, but with extension replaced by "_metadata.json"). Modification to this file before the end of edition will be taken into account. Goffi <goffi@goffi.org> parents: 1866 diff changeset	483
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	484 The file is named after content_file_path, with extension replaced by
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	485 _metadata.json
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	486 @param content_file_path(str): path to the temporary file which will contain the
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	487 body
1868 28b29381db75 jp (blog/edit): added metadata handling through a .json file (named like content temporary file, but with extension replaced by "_metadata.json"). Modification to this file before the end of edition will be taken into account. Goffi <goffi@goffi.org> parents: 1866 diff changeset	488 @param mb_data(dict, None): microblog metadata (for existing items)
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	489 @return (tuple[dict, Path]): merged metadata put originaly in metadata file
1868 28b29381db75 jp (blog/edit): added metadata handling through a .json file (named like content temporary file, but with extension replaced by "_metadata.json"). Modification to this file before the end of edition will be taken into account. Goffi <goffi@goffi.org> parents: 1866 diff changeset	490 and path to temporary metadata file
28b29381db75 jp (blog/edit): added metadata handling through a .json file (named like content temporary file, but with extension replaced by "_metadata.json"). Modification to this file before the end of edition will be taken into account. Goffi <goffi@goffi.org> parents: 1866 diff changeset	491 """
28b29381db75 jp (blog/edit): added metadata handling through a .json file (named like content temporary file, but with extension replaced by "_metadata.json"). Modification to this file before the end of edition will be taken into account. Goffi <goffi@goffi.org> parents: 1866 diff changeset	492 # we first construct metadata from edited item ones and CLI argumments
1876 1088bf7b28e7 jp (blog/edit): metadata file is reused if it already exists Goffi <goffi@goffi.org> parents: 1874 diff changeset	493 # or re-use the existing one if it exists
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	494 meta_file_path = content_file_path.with_name(
3568 04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	495 content_file_path.stem + common.METADATA_SUFF
04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	496 )
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	497 if meta_file_path.exists():
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	498 self.disp("Metadata file already exists, we re-use it")
1876 1088bf7b28e7 jp (blog/edit): metadata file is reused if it already exists Goffi <goffi@goffi.org> parents: 1874 diff changeset	499 try:
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	500 with meta_file_path.open("rb") as f:
1876 1088bf7b28e7 jp (blog/edit): metadata file is reused if it already exists Goffi <goffi@goffi.org> parents: 1874 diff changeset	501 mb_data = json.load(f)
1088bf7b28e7 jp (blog/edit): metadata file is reused if it already exists Goffi <goffi@goffi.org> parents: 1874 diff changeset	502 except (OSError, IOError, ValueError) as e:
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	503 self.disp(
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	504 f"Can't read existing metadata file at {meta_file_path}, "
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	505 f"aborting: {e}",
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	506 error=True,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	507 )
1876 1088bf7b28e7 jp (blog/edit): metadata file is reused if it already exists Goffi <goffi@goffi.org> parents: 1874 diff changeset	508 self.host.quit(1)
1088bf7b28e7 jp (blog/edit): metadata file is reused if it already exists Goffi <goffi@goffi.org> parents: 1874 diff changeset	509 else:
1088bf7b28e7 jp (blog/edit): metadata file is reused if it already exists Goffi <goffi@goffi.org> parents: 1874 diff changeset	510 mb_data = {} if mb_data is None else mb_data.copy()
1088bf7b28e7 jp (blog/edit): metadata file is reused if it already exists Goffi <goffi@goffi.org> parents: 1874 diff changeset	511
3568 04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	512 # in all cases, we want to remove unwanted keys
1868 28b29381db75 jp (blog/edit): added metadata handling through a .json file (named like content temporary file, but with extension replaced by "_metadata.json"). Modification to this file before the end of edition will be taken into account. Goffi <goffi@goffi.org> parents: 1866 diff changeset	513 for key in KEY_TO_REMOVE_METADATA:
28b29381db75 jp (blog/edit): added metadata handling through a .json file (named like content temporary file, but with extension replaced by "_metadata.json"). Modification to this file before the end of edition will be taken into account. Goffi <goffi@goffi.org> parents: 1866 diff changeset	514 try:
28b29381db75 jp (blog/edit): added metadata handling through a .json file (named like content temporary file, but with extension replaced by "_metadata.json"). Modification to this file before the end of edition will be taken into account. Goffi <goffi@goffi.org> parents: 1866 diff changeset	515 del mb_data[key]
28b29381db75 jp (blog/edit): added metadata handling through a .json file (named like content temporary file, but with extension replaced by "_metadata.json"). Modification to this file before the end of edition will be taken into account. Goffi <goffi@goffi.org> parents: 1866 diff changeset	516 except KeyError:
28b29381db75 jp (blog/edit): added metadata handling through a .json file (named like content temporary file, but with extension replaced by "_metadata.json"). Modification to this file before the end of edition will be taken into account. Goffi <goffi@goffi.org> parents: 1866 diff changeset	517 pass
3568 04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	518 # and override metadata with command-line arguments
2458 4841ad6a5db4 jp (blog): added "set" command to publish content from stdin without editing Goffi <goffi@goffi.org> parents: 2414 diff changeset	519 self.setMbDataFromArgs(mb_data)
1868 28b29381db75 jp (blog/edit): added metadata handling through a .json file (named like content temporary file, but with extension replaced by "_metadata.json"). Modification to this file before the end of edition will be taken into account. Goffi <goffi@goffi.org> parents: 1866 diff changeset	520
3241 46f0b388eeea jp (blog/edit): --no-publish is a boolean option Goffi <goffi@goffi.org> parents: 3177 diff changeset	521 if self.args.no_publish:
3177 f4914ce9d47d jp (blog/edit): added `--no-publish` argument. Goffi <goffi@goffi.org> parents: 3137 diff changeset	522 mb_data["publish"] = False
f4914ce9d47d jp (blog/edit): added `--no-publish` argument. Goffi <goffi@goffi.org> parents: 3137 diff changeset	523
3568 04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	524 # then we create the file and write metadata there, as JSON dict
04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	525 # XXX: if we port jp one day on Windows, O_BINARY may need to be added here
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	526 with os.fdopen(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	527 os.open(meta_file_path, os.O_RDWR \| os.O_CREAT \| os.O_TRUNC, 0o600), "w+b"
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	528 ) as f:
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	529 # we need to use an intermediate unicode buffer to write to the file
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	530 # unicode without escaping characters
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	531 unicode_dump = json.dumps(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	532 mb_data,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	533 ensure_ascii=False,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	534 indent=4,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	535 separators=(",", ": "),
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	536 sort_keys=True,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	537 )
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	538 f.write(unicode_dump.encode("utf-8"))
1868 28b29381db75 jp (blog/edit): added metadata handling through a .json file (named like content temporary file, but with extension replaced by "_metadata.json"). Modification to this file before the end of edition will be taken into account. Goffi <goffi@goffi.org> parents: 1866 diff changeset	539
28b29381db75 jp (blog/edit): added metadata handling through a .json file (named like content temporary file, but with extension replaced by "_metadata.json"). Modification to this file before the end of edition will be taken into account. Goffi <goffi@goffi.org> parents: 1866 diff changeset	540 return mb_data, meta_file_path
28b29381db75 jp (blog/edit): added metadata handling through a .json file (named like content temporary file, but with extension replaced by "_metadata.json"). Modification to this file before the end of edition will be taken into account. Goffi <goffi@goffi.org> parents: 1866 diff changeset	541
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	542 async def edit(self, content_file_path, content_file_obj, mb_data=None):
1866 397ef87958b9 jp (blog): edit command, first draft: Goffi <goffi@goffi.org> parents: 1864 diff changeset	543 """Edit the file contening the content using editor, and publish it"""
1868 28b29381db75 jp (blog/edit): added metadata handling through a .json file (named like content temporary file, but with extension replaced by "_metadata.json"). Modification to this file before the end of edition will be taken into account. Goffi <goffi@goffi.org> parents: 1866 diff changeset	544 # we first create metadata file
2270 07caa12be945 jp (blog, common): added --force-item option to avoid magic and use argument as actual item id: Goffi <goffi@goffi.org> parents: 2269 diff changeset	545 meta_ori, meta_file_path = self.buildMetadataFile(content_file_path, mb_data)
1866 397ef87958b9 jp (blog): edit command, first draft: Goffi <goffi@goffi.org> parents: 1864 diff changeset	546
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	547 coroutines = []
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	548
1887 16527dd5a81b blog (jp/edit): added --preview option to launch a "blog preview" in parallel Goffi <goffi@goffi.org> parents: 1886 diff changeset	549 # do we need a preview ?
16527dd5a81b blog (jp/edit): added --preview option to launch a "blog preview" in parallel Goffi <goffi@goffi.org> parents: 1886 diff changeset	550 if self.args.preview:
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	551 self.disp("Preview requested, launching it", 1)
2998 a1b98772af6b Backed out changeset cf0dda0d4cda Goffi <goffi@goffi.org> parents: 2997 diff changeset	552 # we redirect outputs to /dev/null to avoid console pollution in editor
a1b98772af6b Backed out changeset cf0dda0d4cda Goffi <goffi@goffi.org> parents: 2997 diff changeset	553 # if user wants to see messages, (s)he can call "blog preview" directly
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	554 coroutines.append(
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	555 asyncio.create_subprocess_exec(
2998 a1b98772af6b Backed out changeset cf0dda0d4cda Goffi <goffi@goffi.org> parents: 2997 diff changeset	556 sys.argv[0],
a1b98772af6b Backed out changeset cf0dda0d4cda Goffi <goffi@goffi.org> parents: 2997 diff changeset	557 "blog",
a1b98772af6b Backed out changeset cf0dda0d4cda Goffi <goffi@goffi.org> parents: 2997 diff changeset	558 "preview",
a1b98772af6b Backed out changeset cf0dda0d4cda Goffi <goffi@goffi.org> parents: 2997 diff changeset	559 "--inotify",
a1b98772af6b Backed out changeset cf0dda0d4cda Goffi <goffi@goffi.org> parents: 2997 diff changeset	560 "true",
a1b98772af6b Backed out changeset cf0dda0d4cda Goffi <goffi@goffi.org> parents: 2997 diff changeset	561 "-p",
a1b98772af6b Backed out changeset cf0dda0d4cda Goffi <goffi@goffi.org> parents: 2997 diff changeset	562 self.profile,
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	563 str(content_file_path),
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	564 stdout=DEVNULL,
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	565 stderr=DEVNULL,
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	566 )
2998 a1b98772af6b Backed out changeset cf0dda0d4cda Goffi <goffi@goffi.org> parents: 2997 diff changeset	567 )
1887 16527dd5a81b blog (jp/edit): added --preview option to launch a "blog preview" in parallel Goffi <goffi@goffi.org> parents: 1886 diff changeset	568
3568 04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	569 # we launch editor
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	570 coroutines.append(
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	571 self.runEditor(
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	572 "blog_editor_args",
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	573 content_file_path,
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	574 content_file_obj,
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	575 meta_file_path=meta_file_path,
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	576 meta_ori=meta_ori,
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	577 )
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	578 )
2269 606ff34d30f2 jp (blog, common): moved and improved edit code from blog: Goffi <goffi@goffi.org> parents: 2267 diff changeset	579
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	580 await asyncio.gather(*coroutines)
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	581
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	582 async def publish(self, content, mb_data):
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	583 await self.setMbDataContent(content, mb_data)
1866 397ef87958b9 jp (blog): edit command, first draft: Goffi <goffi@goffi.org> parents: 1864 diff changeset	584
2910 b2f323237fce jp, plugin merge-requests: used u'' as default for item id in pubsub arguments + fixed some required arguments: Goffi <goffi@goffi.org> parents: 2876 diff changeset	585 if self.pubsub_item:
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	586 mb_data["id"] = self.pubsub_item
2269 606ff34d30f2 jp (blog, common): moved and improved edit code from blog: Goffi <goffi@goffi.org> parents: 2267 diff changeset	587
2807 0b7ce5daee9b plugin XEP-0277: blog items data are now entirely serialised before going to bridge: Goffi <goffi@goffi.org> parents: 2771 diff changeset	588 mb_data = data_format.serialise(mb_data)
0b7ce5daee9b plugin XEP-0277: blog items data are now entirely serialised before going to bridge: Goffi <goffi@goffi.org> parents: 2771 diff changeset	589
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	590 await self.host.bridge.mbSend(
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	591 self.pubsub_service, self.pubsub_node, mb_data, self.profile
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	592 )
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	593 self.disp("Blog item published")
1866 397ef87958b9 jp (blog): edit command, first draft: Goffi <goffi@goffi.org> parents: 1864 diff changeset	594
2269 606ff34d30f2 jp (blog, common): moved and improved edit code from blog: Goffi <goffi@goffi.org> parents: 2267 diff changeset	595 def getTmpSuff(self):
606ff34d30f2 jp (blog, common): moved and improved edit code from blog: Goffi <goffi@goffi.org> parents: 2267 diff changeset	596 # we get current syntax to determine file extension
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	597 return SYNTAX_EXT.get(self.current_syntax, SYNTAX_EXT[""])
1866 397ef87958b9 jp (blog): edit command, first draft: Goffi <goffi@goffi.org> parents: 1864 diff changeset	598
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	599 async def getItemData(self, service, node, item):
2945 6c264c224614 jp (blog/edit): fixed --last-item after recent change in defaut value of --item Goffi <goffi@goffi.org> parents: 2944 diff changeset	600 items = [item] if item else []
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	601
3308 384283adcce1 plugins XEP-0059, XEP-0060, XEP-0277, XEP-0313: better serialisation: Goffi <goffi@goffi.org> parents: 3241 diff changeset	602 mb_data = data_format.deserialise(
3568 04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	603 await self.host.bridge.mbGet(service, node, 1, items, {}, self.profile)
3308 384283adcce1 plugins XEP-0059, XEP-0060, XEP-0277, XEP-0313: better serialisation: Goffi <goffi@goffi.org> parents: 3241 diff changeset	604 )
3568 04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	605 item = mb_data["items"][0]
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	606
2269 606ff34d30f2 jp (blog, common): moved and improved edit code from blog: Goffi <goffi@goffi.org> parents: 2267 diff changeset	607 try:
3308 384283adcce1 plugins XEP-0059, XEP-0060, XEP-0277, XEP-0313: better serialisation: Goffi <goffi@goffi.org> parents: 3241 diff changeset	608 content = item["content_xhtml"]
2269 606ff34d30f2 jp (blog, common): moved and improved edit code from blog: Goffi <goffi@goffi.org> parents: 2267 diff changeset	609 except KeyError:
3308 384283adcce1 plugins XEP-0059, XEP-0060, XEP-0277, XEP-0313: better serialisation: Goffi <goffi@goffi.org> parents: 3241 diff changeset	610 content = item["content"]
2269 606ff34d30f2 jp (blog, common): moved and improved edit code from blog: Goffi <goffi@goffi.org> parents: 2267 diff changeset	611 if content:
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	612 content = await self.host.bridge.syntaxConvert(
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	613 content, "text", SYNTAX_XHTML, False, self.profile
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	614 )
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	615
2330 74c1dbabeec8 jp (blog/edit): pretty format XHTML before editing it Goffi <goffi@goffi.org> parents: 2327 diff changeset	616 if content and self.current_syntax != SYNTAX_XHTML:
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	617 content = await self.host.bridge.syntaxConvert(
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	618 content, SYNTAX_XHTML, self.current_syntax, False, self.profile
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	619 )
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	620
2330 74c1dbabeec8 jp (blog/edit): pretty format XHTML before editing it Goffi <goffi@goffi.org> parents: 2327 diff changeset	621 if content and self.current_syntax == SYNTAX_XHTML:
2870 2f39682f6d40 jp (blog/edit): fixed handling of XHTML content when it is not already wrapped in <div>…</div> Goffi <goffi@goffi.org> parents: 2808 diff changeset	622 content = content.strip()
3568 04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	623 if not content.startswith("<div>"):
04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	624 content = "<div>" + content + "</div>"
2330 74c1dbabeec8 jp (blog/edit): pretty format XHTML before editing it Goffi <goffi@goffi.org> parents: 2327 diff changeset	625 try:
74c1dbabeec8 jp (blog/edit): pretty format XHTML before editing it Goffi <goffi@goffi.org> parents: 2327 diff changeset	626 from lxml import etree
74c1dbabeec8 jp (blog/edit): pretty format XHTML before editing it Goffi <goffi@goffi.org> parents: 2327 diff changeset	627 except ImportError:
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	628 self.disp(_("You need lxml to edit pretty XHTML"))
2330 74c1dbabeec8 jp (blog/edit): pretty format XHTML before editing it Goffi <goffi@goffi.org> parents: 2327 diff changeset	629 else:
74c1dbabeec8 jp (blog/edit): pretty format XHTML before editing it Goffi <goffi@goffi.org> parents: 2327 diff changeset	630 parser = etree.XMLParser(remove_blank_text=True)
74c1dbabeec8 jp (blog/edit): pretty format XHTML before editing it Goffi <goffi@goffi.org> parents: 2327 diff changeset	631 root = etree.fromstring(content, parser)
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	632 content = etree.tostring(root, encoding=str, pretty_print=True)
2330 74c1dbabeec8 jp (blog/edit): pretty format XHTML before editing it Goffi <goffi@goffi.org> parents: 2327 diff changeset	633
3308 384283adcce1 plugins XEP-0059, XEP-0060, XEP-0277, XEP-0313: better serialisation: Goffi <goffi@goffi.org> parents: 3241 diff changeset	634 return content, item, item["id"]
1866 397ef87958b9 jp (blog): edit command, first draft: Goffi <goffi@goffi.org> parents: 1864 diff changeset	635
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	636 async def start(self):
1866 397ef87958b9 jp (blog): edit command, first draft: Goffi <goffi@goffi.org> parents: 1864 diff changeset	637 # if there are user defined extension, we use them
3626 82e616b70a2a CLI: fix section used for config following name change Goffi <goffi@goffi.org> parents: 3568 diff changeset	638 SYNTAX_EXT.update(
82e616b70a2a CLI: fix section used for config following name change Goffi <goffi@goffi.org> parents: 3568 diff changeset	639 config.getConfig(self.sat_conf, C.CONFIG_SECTION, CONF_SYNTAX_EXT, {})
82e616b70a2a CLI: fix section used for config following name change Goffi <goffi@goffi.org> parents: 3568 diff changeset	640 )
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	641 self.current_syntax = await self.get_current_syntax()
2225 301bb52c8715 jp (blog): service and node can now be specified for edit command Goffi <goffi@goffi.org> parents: 2164 diff changeset	642
3568 04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	643 (
04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	644 self.pubsub_service,
04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	645 self.pubsub_node,
04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	646 self.pubsub_item,
04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	647 content_file_path,
04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	648 content_file_obj,
04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	649 mb_data,
04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	650 ) = await self.getItemPath()
1925 53b51866747f jp (blog/edit): HTTP(S) and XMPP URLs can now be directly used in blog/edit command Goffi <goffi@goffi.org> parents: 1924 diff changeset	651
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	652 await self.edit(content_file_path, content_file_obj, mb_data=mb_data)
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	653 self.host.quit()
1827 74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	654
74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	655
3521 62f490eff51c jp (pubsub, blog): `rename` commands implementation Goffi <goffi@goffi.org> parents: 3520 diff changeset	656 class Rename(base.CommandBase):
62f490eff51c jp (pubsub, blog): `rename` commands implementation Goffi <goffi@goffi.org> parents: 3520 diff changeset	657 def __init__(self, host):
62f490eff51c jp (pubsub, blog): `rename` commands implementation Goffi <goffi@goffi.org> parents: 3520 diff changeset	658 base.CommandBase.__init__(
62f490eff51c jp (pubsub, blog): `rename` commands implementation Goffi <goffi@goffi.org> parents: 3520 diff changeset	659 self,
62f490eff51c jp (pubsub, blog): `rename` commands implementation Goffi <goffi@goffi.org> parents: 3520 diff changeset	660 host,
62f490eff51c jp (pubsub, blog): `rename` commands implementation Goffi <goffi@goffi.org> parents: 3520 diff changeset	661 "rename",
62f490eff51c jp (pubsub, blog): `rename` commands implementation Goffi <goffi@goffi.org> parents: 3520 diff changeset	662 use_pubsub=True,
62f490eff51c jp (pubsub, blog): `rename` commands implementation Goffi <goffi@goffi.org> parents: 3520 diff changeset	663 pubsub_flags={C.SINGLE_ITEM},
62f490eff51c jp (pubsub, blog): `rename` commands implementation Goffi <goffi@goffi.org> parents: 3520 diff changeset	664 help=_("rename an blog item"),
62f490eff51c jp (pubsub, blog): `rename` commands implementation Goffi <goffi@goffi.org> parents: 3520 diff changeset	665 )
62f490eff51c jp (pubsub, blog): `rename` commands implementation Goffi <goffi@goffi.org> parents: 3520 diff changeset	666
62f490eff51c jp (pubsub, blog): `rename` commands implementation Goffi <goffi@goffi.org> parents: 3520 diff changeset	667 def add_parser_options(self):
3568 04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	668 self.parser.add_argument("new_id", help=_("new item id to use"))
3521 62f490eff51c jp (pubsub, blog): `rename` commands implementation Goffi <goffi@goffi.org> parents: 3520 diff changeset	669
62f490eff51c jp (pubsub, blog): `rename` commands implementation Goffi <goffi@goffi.org> parents: 3520 diff changeset	670 async def start(self):
62f490eff51c jp (pubsub, blog): `rename` commands implementation Goffi <goffi@goffi.org> parents: 3520 diff changeset	671 try:
62f490eff51c jp (pubsub, blog): `rename` commands implementation Goffi <goffi@goffi.org> parents: 3520 diff changeset	672 await self.host.bridge.mbRename(
62f490eff51c jp (pubsub, blog): `rename` commands implementation Goffi <goffi@goffi.org> parents: 3520 diff changeset	673 self.args.service,
62f490eff51c jp (pubsub, blog): `rename` commands implementation Goffi <goffi@goffi.org> parents: 3520 diff changeset	674 self.args.node,
62f490eff51c jp (pubsub, blog): `rename` commands implementation Goffi <goffi@goffi.org> parents: 3520 diff changeset	675 self.args.item,
62f490eff51c jp (pubsub, blog): `rename` commands implementation Goffi <goffi@goffi.org> parents: 3520 diff changeset	676 self.args.new_id,
62f490eff51c jp (pubsub, blog): `rename` commands implementation Goffi <goffi@goffi.org> parents: 3520 diff changeset	677 self.profile,
62f490eff51c jp (pubsub, blog): `rename` commands implementation Goffi <goffi@goffi.org> parents: 3520 diff changeset	678 )
62f490eff51c jp (pubsub, blog): `rename` commands implementation Goffi <goffi@goffi.org> parents: 3520 diff changeset	679 except Exception as e:
3568 04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	680 self.disp(f"can't rename item: {e}", error=True)
3521 62f490eff51c jp (pubsub, blog): `rename` commands implementation Goffi <goffi@goffi.org> parents: 3520 diff changeset	681 self.host.quit(C.EXIT_BRIDGE_ERRBACK)
62f490eff51c jp (pubsub, blog): `rename` commands implementation Goffi <goffi@goffi.org> parents: 3520 diff changeset	682 else:
62f490eff51c jp (pubsub, blog): `rename` commands implementation Goffi <goffi@goffi.org> parents: 3520 diff changeset	683 self.disp("Item renamed")
62f490eff51c jp (pubsub, blog): `rename` commands implementation Goffi <goffi@goffi.org> parents: 3520 diff changeset	684 self.host.quit(C.EXIT_OK)
62f490eff51c jp (pubsub, blog): `rename` commands implementation Goffi <goffi@goffi.org> parents: 3520 diff changeset	685
3568 04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	686
2969 eafea3bcf111 jp (blog/preview): fixed call to getCurrentFile Goffi <goffi@goffi.org> parents: 2945 diff changeset	687 class Preview(base.CommandBase, common.BaseEdit):
2532 772447ec070f jp: pubsub options refactoring: Goffi <goffi@goffi.org> parents: 2485 diff changeset	688 # TODO: need to be rewritten with template output
1874 658824755a0c jp (blog): preview command, first draft Goffi <goffi@goffi.org> parents: 1873 diff changeset	689
658824755a0c jp (blog): preview command, first draft Goffi <goffi@goffi.org> parents: 1873 diff changeset	690 def __init__(self, host):
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	691 base.CommandBase.__init__(
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	692 self, host, "preview", use_verbose=True, help=_("preview a blog content")
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	693 )
2969 eafea3bcf111 jp (blog/preview): fixed call to getCurrentFile Goffi <goffi@goffi.org> parents: 2945 diff changeset	694 common.BaseEdit.__init__(self, self.host, BLOG_TMP_DIR, use_metadata=True)
1874 658824755a0c jp (blog): preview command, first draft Goffi <goffi@goffi.org> parents: 1873 diff changeset	695
658824755a0c jp (blog): preview command, first draft Goffi <goffi@goffi.org> parents: 1873 diff changeset	696 def add_parser_options(self):
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	697 self.parser.add_argument(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	698 "--inotify",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	699 type=str,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	700 choices=("auto", "true", "false"),
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	701 default="auto",
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	702 help=_("use inotify to handle preview"),
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	703 )
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	704 self.parser.add_argument(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	705 "file",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	706 nargs="?",
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	707 default="current",
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	708 help=_("path to the content file"),
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	709 )
1874 658824755a0c jp (blog): preview command, first draft Goffi <goffi@goffi.org> parents: 1873 diff changeset	710
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	711 async def showPreview(self):
2271 2fae89f30b8d jp (blog): minor typo fix Goffi <goffi@goffi.org> parents: 2270 diff changeset	712 # we implement showPreview here so we don't have to import webbrowser and urllib
1882 ed444e9aa078 jp (blog/preview): added inotify support, so preview can be updated each time the file is modified (actually IN_CLOSE_WRITE is used, but this may change in the future) Goffi <goffi@goffi.org> parents: 1881 diff changeset	713 # when preview is not used
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	714 url = "file:{}".format(self.urllib.parse.quote(self.preview_file_path))
1882 ed444e9aa078 jp (blog/preview): added inotify support, so preview can be updated each time the file is modified (actually IN_CLOSE_WRITE is used, but this may change in the future) Goffi <goffi@goffi.org> parents: 1881 diff changeset	715 self.webbrowser.open_new_tab(url)
ed444e9aa078 jp (blog/preview): added inotify support, so preview can be updated each time the file is modified (actually IN_CLOSE_WRITE is used, but this may change in the future) Goffi <goffi@goffi.org> parents: 1881 diff changeset	716
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	717 async def _launchPreviewExt(self, cmd_line, opt_name):
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	718 url = "file:{}".format(self.urllib.parse.quote(self.preview_file_path))
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	719 args = common.parse_args(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	720 self.host, cmd_line, url=url, preview_file=self.preview_file_path
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	721 )
1885 edd8dc8df1b9 jp (blog/preview): open and preview commands can be changed in sat.conf with "blog_preview_open_cmd" and "blog_preview_update_cmd" in [jp] section + don't convert syntax when content is empty Goffi <goffi@goffi.org> parents: 1883 diff changeset	722 if not args:
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	723 self.disp(
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	724 'Couln\'t find command in "{name}", abording'.format(name=opt_name),
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	725 error=True,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	726 )
1885 edd8dc8df1b9 jp (blog/preview): open and preview commands can be changed in sat.conf with "blog_preview_open_cmd" and "blog_preview_update_cmd" in [jp] section + don't convert syntax when content is empty Goffi <goffi@goffi.org> parents: 1883 diff changeset	727 self.host.quit(1)
edd8dc8df1b9 jp (blog/preview): open and preview commands can be changed in sat.conf with "blog_preview_open_cmd" and "blog_preview_update_cmd" in [jp] section + don't convert syntax when content is empty Goffi <goffi@goffi.org> parents: 1883 diff changeset	728 subprocess.Popen(args)
edd8dc8df1b9 jp (blog/preview): open and preview commands can be changed in sat.conf with "blog_preview_open_cmd" and "blog_preview_update_cmd" in [jp] section + don't convert syntax when content is empty Goffi <goffi@goffi.org> parents: 1883 diff changeset	729
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	730 async def openPreviewExt(self):
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	731 await self._launchPreviewExt(self.open_cb_cmd, "blog_preview_open_cmd")
1885 edd8dc8df1b9 jp (blog/preview): open and preview commands can be changed in sat.conf with "blog_preview_open_cmd" and "blog_preview_update_cmd" in [jp] section + don't convert syntax when content is empty Goffi <goffi@goffi.org> parents: 1883 diff changeset	732
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	733 async def updatePreviewExt(self):
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	734 await self._launchPreviewExt(self.update_cb_cmd, "blog_preview_update_cmd")
1885 edd8dc8df1b9 jp (blog/preview): open and preview commands can be changed in sat.conf with "blog_preview_open_cmd" and "blog_preview_update_cmd" in [jp] section + don't convert syntax when content is empty Goffi <goffi@goffi.org> parents: 1883 diff changeset	735
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	736 async def updateContent(self):
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	737 with self.content_file_path.open("rb") as f:
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	738 content = f.read().decode("utf-8-sig")
2330 74c1dbabeec8 jp (blog/edit): pretty format XHTML before editing it Goffi <goffi@goffi.org> parents: 2327 diff changeset	739 if content and self.syntax != SYNTAX_XHTML:
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	740 # we use safe=True because we want to have a preview as close as possible
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	741 # to what the people will see
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	742 content = await self.host.bridge.syntaxConvert(
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	743 content, self.syntax, SYNTAX_XHTML, True, self.profile
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	744 )
1882 ed444e9aa078 jp (blog/preview): added inotify support, so preview can be updated each time the file is modified (actually IN_CLOSE_WRITE is used, but this may change in the future) Goffi <goffi@goffi.org> parents: 1881 diff changeset	745
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	746 xhtml = (
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	747 f'<html xmlns="http://www.w3.org/1999/xhtml">'
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	748 f'<head><meta http-equiv="Content-Type" content="text/html;charset=utf-8" />'
3568 04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	749 f"</head>"
04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	750 f"<body>{content}</body>"
04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	751 f"</html>"
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	752 )
1882 ed444e9aa078 jp (blog/preview): added inotify support, so preview can be updated each time the file is modified (actually IN_CLOSE_WRITE is used, but this may change in the future) Goffi <goffi@goffi.org> parents: 1881 diff changeset	753
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	754 with open(self.preview_file_path, "wb") as f:
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	755 f.write(xhtml.encode("utf-8"))
1877 a97db84c048d jp (blog): moved common method in a BlogCommon class + added "current" as an item keyword for blog/edit Goffi <goffi@goffi.org> parents: 1876 diff changeset	756
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	757 async def start(self):
1882 ed444e9aa078 jp (blog/preview): added inotify support, so preview can be updated each time the file is modified (actually IN_CLOSE_WRITE is used, but this may change in the future) Goffi <goffi@goffi.org> parents: 1881 diff changeset	758 import webbrowser
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	759 import urllib.request, urllib.parse, urllib.error
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	760
1882 ed444e9aa078 jp (blog/preview): added inotify support, so preview can be updated each time the file is modified (actually IN_CLOSE_WRITE is used, but this may change in the future) Goffi <goffi@goffi.org> parents: 1881 diff changeset	761 self.webbrowser, self.urllib = webbrowser, urllib
ed444e9aa078 jp (blog/preview): added inotify support, so preview can be updated each time the file is modified (actually IN_CLOSE_WRITE is used, but this may change in the future) Goffi <goffi@goffi.org> parents: 1881 diff changeset	762
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	763 if self.args.inotify != "false":
1882 ed444e9aa078 jp (blog/preview): added inotify support, so preview can be updated each time the file is modified (actually IN_CLOSE_WRITE is used, but this may change in the future) Goffi <goffi@goffi.org> parents: 1881 diff changeset	764 try:
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	765 import aionotify
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	766
1882 ed444e9aa078 jp (blog/preview): added inotify support, so preview can be updated each time the file is modified (actually IN_CLOSE_WRITE is used, but this may change in the future) Goffi <goffi@goffi.org> parents: 1881 diff changeset	767 except ImportError:
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	768 if self.args.inotify == "auto":
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	769 aionotify = None
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	770 self.disp(
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	771 f"aionotify module not found, deactivating feature. You can "
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	772 f"install it with {AIONOTIFY_INSTALL}"
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	773 )
1882 ed444e9aa078 jp (blog/preview): added inotify support, so preview can be updated each time the file is modified (actually IN_CLOSE_WRITE is used, but this may change in the future) Goffi <goffi@goffi.org> parents: 1881 diff changeset	774 else:
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	775 self.disp(
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	776 f"aioinotify not found, can't activate the feature! Please "
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	777 f"install it with {AIONOTIFY_INSTALL}",
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	778 error=True,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	779 )
1882 ed444e9aa078 jp (blog/preview): added inotify support, so preview can be updated each time the file is modified (actually IN_CLOSE_WRITE is used, but this may change in the future) Goffi <goffi@goffi.org> parents: 1881 diff changeset	780 self.host.quit(1)
ed444e9aa078 jp (blog/preview): added inotify support, so preview can be updated each time the file is modified (actually IN_CLOSE_WRITE is used, but this may change in the future) Goffi <goffi@goffi.org> parents: 1881 diff changeset	781 else:
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	782 aionotify = None
1882 ed444e9aa078 jp (blog/preview): added inotify support, so preview can be updated each time the file is modified (actually IN_CLOSE_WRITE is used, but this may change in the future) Goffi <goffi@goffi.org> parents: 1881 diff changeset	783
3046 d9f328374473 jp: dark and light theme: Goffi <goffi@goffi.org> parents: 3040 diff changeset	784 sat_conf = self.sat_conf
3626 82e616b70a2a CLI: fix section used for config following name change Goffi <goffi@goffi.org> parents: 3568 diff changeset	785 SYNTAX_EXT.update(
82e616b70a2a CLI: fix section used for config following name change Goffi <goffi@goffi.org> parents: 3568 diff changeset	786 config.getConfig(sat_conf, C.CONFIG_SECTION, CONF_SYNTAX_EXT, {})
82e616b70a2a CLI: fix section used for config following name change Goffi <goffi@goffi.org> parents: 3568 diff changeset	787 )
1874 658824755a0c jp (blog): preview command, first draft Goffi <goffi@goffi.org> parents: 1873 diff changeset	788
1885 edd8dc8df1b9 jp (blog/preview): open and preview commands can be changed in sat.conf with "blog_preview_open_cmd" and "blog_preview_update_cmd" in [jp] section + don't convert syntax when content is empty Goffi <goffi@goffi.org> parents: 1883 diff changeset	789 try:
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	790 self.open_cb_cmd = config.getConfig(
3626 82e616b70a2a CLI: fix section used for config following name change Goffi <goffi@goffi.org> parents: 3568 diff changeset	791 sat_conf, C.CONFIG_SECTION, "blog_preview_open_cmd", Exception
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	792 )
1885 edd8dc8df1b9 jp (blog/preview): open and preview commands can be changed in sat.conf with "blog_preview_open_cmd" and "blog_preview_update_cmd" in [jp] section + don't convert syntax when content is empty Goffi <goffi@goffi.org> parents: 1883 diff changeset	793 except (NoOptionError, NoSectionError):
edd8dc8df1b9 jp (blog/preview): open and preview commands can be changed in sat.conf with "blog_preview_open_cmd" and "blog_preview_update_cmd" in [jp] section + don't convert syntax when content is empty Goffi <goffi@goffi.org> parents: 1883 diff changeset	794 self.open_cb_cmd = None
edd8dc8df1b9 jp (blog/preview): open and preview commands can be changed in sat.conf with "blog_preview_open_cmd" and "blog_preview_update_cmd" in [jp] section + don't convert syntax when content is empty Goffi <goffi@goffi.org> parents: 1883 diff changeset	795 open_cb = self.showPreview
edd8dc8df1b9 jp (blog/preview): open and preview commands can be changed in sat.conf with "blog_preview_open_cmd" and "blog_preview_update_cmd" in [jp] section + don't convert syntax when content is empty Goffi <goffi@goffi.org> parents: 1883 diff changeset	796 else:
edd8dc8df1b9 jp (blog/preview): open and preview commands can be changed in sat.conf with "blog_preview_open_cmd" and "blog_preview_update_cmd" in [jp] section + don't convert syntax when content is empty Goffi <goffi@goffi.org> parents: 1883 diff changeset	797 open_cb = self.openPreviewExt
edd8dc8df1b9 jp (blog/preview): open and preview commands can be changed in sat.conf with "blog_preview_open_cmd" and "blog_preview_update_cmd" in [jp] section + don't convert syntax when content is empty Goffi <goffi@goffi.org> parents: 1883 diff changeset	798
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	799 self.update_cb_cmd = config.getConfig(
3626 82e616b70a2a CLI: fix section used for config following name change Goffi <goffi@goffi.org> parents: 3568 diff changeset	800 sat_conf, C.CONFIG_SECTION, "blog_preview_update_cmd", self.open_cb_cmd
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	801 )
1885 edd8dc8df1b9 jp (blog/preview): open and preview commands can be changed in sat.conf with "blog_preview_open_cmd" and "blog_preview_update_cmd" in [jp] section + don't convert syntax when content is empty Goffi <goffi@goffi.org> parents: 1883 diff changeset	802 if self.update_cb_cmd is None:
edd8dc8df1b9 jp (blog/preview): open and preview commands can be changed in sat.conf with "blog_preview_open_cmd" and "blog_preview_update_cmd" in [jp] section + don't convert syntax when content is empty Goffi <goffi@goffi.org> parents: 1883 diff changeset	803 update_cb = self.showPreview
edd8dc8df1b9 jp (blog/preview): open and preview commands can be changed in sat.conf with "blog_preview_open_cmd" and "blog_preview_update_cmd" in [jp] section + don't convert syntax when content is empty Goffi <goffi@goffi.org> parents: 1883 diff changeset	804 else:
edd8dc8df1b9 jp (blog/preview): open and preview commands can be changed in sat.conf with "blog_preview_open_cmd" and "blog_preview_update_cmd" in [jp] section + don't convert syntax when content is empty Goffi <goffi@goffi.org> parents: 1883 diff changeset	805 update_cb = self.updatePreviewExt
1882 ed444e9aa078 jp (blog/preview): added inotify support, so preview can be updated each time the file is modified (actually IN_CLOSE_WRITE is used, but this may change in the future) Goffi <goffi@goffi.org> parents: 1881 diff changeset	806
3568 04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	807 # which file do we need to edit?
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	808 if self.args.file == "current":
2969 eafea3bcf111 jp (blog/preview): fixed call to getCurrentFile Goffi <goffi@goffi.org> parents: 2945 diff changeset	809 self.content_file_path = self.getCurrentFile(self.profile)
1874 658824755a0c jp (blog): preview command, first draft Goffi <goffi@goffi.org> parents: 1873 diff changeset	810 else:
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	811 try:
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	812 self.content_file_path = Path(self.args.file).resolve(strict=True)
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	813 except FileNotFoundError:
3568 04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	814 self.disp(_('File "{file}" doesn\'t exist!').format(file=self.args.file))
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	815 self.host.quit(C.EXIT_NOT_FOUND)
1874 658824755a0c jp (blog): preview command, first draft Goffi <goffi@goffi.org> parents: 1873 diff changeset	816
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	817 self.syntax = await guessSyntaxFromPath(
3568 04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	818 self.host, sat_conf, self.content_file_path
04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	819 )
1882 ed444e9aa078 jp (blog/preview): added inotify support, so preview can be updated each time the file is modified (actually IN_CLOSE_WRITE is used, but this may change in the future) Goffi <goffi@goffi.org> parents: 1881 diff changeset	820
1877 a97db84c048d jp (blog): moved common method in a BlogCommon class + added "current" as an item keyword for blog/edit Goffi <goffi@goffi.org> parents: 1876 diff changeset	821 # at this point the syntax is converted, we can display the preview
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	822 preview_file = tempfile.NamedTemporaryFile(suffix=".xhtml", delete=False)
1882 ed444e9aa078 jp (blog/preview): added inotify support, so preview can be updated each time the file is modified (actually IN_CLOSE_WRITE is used, but this may change in the future) Goffi <goffi@goffi.org> parents: 1881 diff changeset	823 self.preview_file_path = preview_file.name
ed444e9aa078 jp (blog/preview): added inotify support, so preview can be updated each time the file is modified (actually IN_CLOSE_WRITE is used, but this may change in the future) Goffi <goffi@goffi.org> parents: 1881 diff changeset	824 preview_file.close()
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	825 await self.updateContent()
1877 a97db84c048d jp (blog): moved common method in a BlogCommon class + added "current" as an item keyword for blog/edit Goffi <goffi@goffi.org> parents: 1876 diff changeset	826
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	827 if aionotify is None:
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	828 # XXX: we don't delete file automatically because browser needs it
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	829 # (and webbrowser.open can return before it is read)
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	830 self.disp(
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	831 f"temporary file created at {self.preview_file_path}\nthis file will NOT "
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	832 f"BE DELETED AUTOMATICALLY, please delete it yourself when you have "
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	833 f"finished"
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	834 )
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	835 await open_cb()
1882 ed444e9aa078 jp (blog/preview): added inotify support, so preview can be updated each time the file is modified (actually IN_CLOSE_WRITE is used, but this may change in the future) Goffi <goffi@goffi.org> parents: 1881 diff changeset	836 else:
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	837 await open_cb()
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	838 watcher = aionotify.Watcher()
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	839 watcher_kwargs = {
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	840 # Watcher don't accept Path so we convert to string
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	841 "path": str(self.content_file_path),
3568 04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	842 "alias": "content_file",
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	843 "flags": aionotify.Flags.CLOSE_WRITE
3568 04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	844 \| aionotify.Flags.DELETE_SELF
04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	845 \| aionotify.Flags.MOVE_SELF,
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	846 }
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	847 watcher.watch(**watcher_kwargs)
1886 f3db27508b31 jp (blog/preview): inotify improvments: Goffi <goffi@goffi.org> parents: 1885 diff changeset	848
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	849 loop = asyncio.get_event_loop()
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	850 await watcher.setup(loop)
1886 f3db27508b31 jp (blog/preview): inotify improvments: Goffi <goffi@goffi.org> parents: 1885 diff changeset	851
1882 ed444e9aa078 jp (blog/preview): added inotify support, so preview can be updated each time the file is modified (actually IN_CLOSE_WRITE is used, but this may change in the future) Goffi <goffi@goffi.org> parents: 1881 diff changeset	852 try:
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	853 while True:
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	854 event = await watcher.get_event()
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	855 self.disp("Content updated", 1)
3568 04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	856 if event.flags & (
04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	857 aionotify.Flags.DELETE_SELF \| aionotify.Flags.MOVE_SELF
04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	858 ):
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	859 self.disp(
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	860 "DELETE/MOVE event catched, changing the watch",
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	861 2,
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	862 )
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	863 try:
3568 04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	864 watcher.unwatch("content_file")
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	865 except IOError as e:
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	866 self.disp(
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	867 f"Can't remove the watch: {e}",
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	868 2,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	869 )
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	870 watcher = aionotify.Watcher()
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	871 watcher.watch(**watcher_kwargs)
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	872 try:
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	873 await watcher.setup(loop)
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	874 except OSError:
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	875 # if the new file is not here yet we can have an error
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	876 # as a workaround, we do a little rest and try again
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	877 await asyncio.sleep(1)
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	878 await watcher.setup(loop)
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	879 await self.updateContent()
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	880 await update_cb()
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	881 except FileNotFoundError:
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	882 self.disp("The file seems to have been deleted.", error=True)
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	883 self.host.quit(C.EXIT_NOT_FOUND)
1882 ed444e9aa078 jp (blog/preview): added inotify support, so preview can be updated each time the file is modified (actually IN_CLOSE_WRITE is used, but this may change in the future) Goffi <goffi@goffi.org> parents: 1881 diff changeset	884 finally:
ed444e9aa078 jp (blog/preview): added inotify support, so preview can be updated each time the file is modified (actually IN_CLOSE_WRITE is used, but this may change in the future) Goffi <goffi@goffi.org> parents: 1881 diff changeset	885 os.unlink(self.preview_file_path)
1886 f3db27508b31 jp (blog/preview): inotify improvments: Goffi <goffi@goffi.org> parents: 1885 diff changeset	886 try:
3568 04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	887 watcher.unwatch("content_file")
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	888 except IOError as e:
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	889 self.disp(
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	890 f"Can't remove the watch: {e}",
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	891 2,
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	892 )
1874 658824755a0c jp (blog): preview command, first draft Goffi <goffi@goffi.org> parents: 1873 diff changeset	893
658824755a0c jp (blog): preview command, first draft Goffi <goffi@goffi.org> parents: 1873 diff changeset	894
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	895 class Import(base.CommandBase):
1827 74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	896 def __init__(self, host):
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	897 super(Import, self).__init__(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	898 host,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	899 "import",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	900 use_pubsub=True,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	901 use_progress=True,
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	902 help=_("import an external blog"),
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	903 )
1827 74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	904
74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	905 def add_parser_options(self):
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	906 self.parser.add_argument(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	907 "importer",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	908 nargs="?",
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	909 help=_("importer name, nothing to display importers list"),
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	910 )
3568 04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	911 self.parser.add_argument("--host", help=_("original blog host"))
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	912 self.parser.add_argument(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	913 "--no-images-upload",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	914 action="store_true",
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	915 help=_("do NOT upload images (default: do upload images)"),
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	916 )
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	917 self.parser.add_argument(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	918 "--upload-ignore-host",
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	919 help=_("do not upload images from this host (default: upload all images)"),
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	920 )
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	921 self.parser.add_argument(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	922 "--ignore-tls-errors",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	923 action="store_true",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	924 help=_("ignore invalide TLS certificate for uploads"),
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	925 )
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	926 self.parser.add_argument(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	927 "-o",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	928 "--option",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	929 action="append",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	930 nargs=2,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	931 default=[],
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	932 metavar=("NAME", "VALUE"),
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	933 help=_("importer specific options (see importer description)"),
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	934 )
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	935 self.parser.add_argument(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	936 "location",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	937 nargs="?",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	938 help=_(
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	939 "importer data location (see importer description), nothing to show "
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	940 "importer description"
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	941 ),
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	942 )
1827 74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	943
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	944 async def onProgressStarted(self, metadata):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	945 self.disp(_("Blog upload started"), 2)
1834 6209de5e3e25 jp (blog): import now show progression + value to add to sat.conf for URLs redirection Goffi <goffi@goffi.org> parents: 1827 diff changeset	946
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	947 async def onProgressFinished(self, metadata):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	948 self.disp(_("Blog uploaded successfully"), 2)
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	949 redirections = {
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	950 k[len(URL_REDIRECT_PREFIX) :]: v
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	951 for k, v in metadata.items()
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	952 if k.startswith(URL_REDIRECT_PREFIX)
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	953 }
1834 6209de5e3e25 jp (blog): import now show progression + value to add to sat.conf for URLs redirection Goffi <goffi@goffi.org> parents: 1827 diff changeset	954 if redirections:
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	955 conf = "\n".join(
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	956 [
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	957 "url_redirections_dict = {}".format(
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	958 # we need to add ' ' before each new line
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	959 # and to double each '%' for ConfigParser
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	960 "\n ".join(
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	961 json.dumps(redirections, indent=1, separators=(",", ": "))
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	962 .replace("%", "%%")
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	963 .split("\n")
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	964 )
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	965 ),
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	966 ]
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	967 )
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	968 self.disp(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	969 _(
3568 04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	970 "\nTo redirect old URLs to new ones, put the following lines in your"
04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	971 " sat.conf file, in [libervia] section:\n\n{conf}"
04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	972 ).format(conf=conf)
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	973 )
1834 6209de5e3e25 jp (blog): import now show progression + value to add to sat.conf for URLs redirection Goffi <goffi@goffi.org> parents: 1827 diff changeset	974
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	975 async def onProgressError(self, error_msg):
3568 04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	976 self.disp(
04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	977 _("Error while uploading blog: {error_msg}").format(error_msg=error_msg),
04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	978 error=True,
04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	979 )
1834 6209de5e3e25 jp (blog): import now show progression + value to add to sat.conf for URLs redirection Goffi <goffi@goffi.org> parents: 1827 diff changeset	980
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	981 async def start(self):
1827 74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	982 if self.args.location is None:
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	983 for name in ("option", "service", "no_images_upload"):
1827 74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	984 if getattr(self.args, name):
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	985 self.parser.error(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	986 _(
3568 04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	987 "{name} argument can't be used without location argument"
04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	988 ).format(name=name)
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	989 )
1827 74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	990 if self.args.importer is None:
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	991 self.disp(
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	992 "\n".join(
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	993 [
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	994 f"{name}: {desc}"
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	995 for name, desc in await self.host.bridge.blogImportList()
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	996 ]
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	997 )
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	998 )
1827 74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	999 else:
74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	1000 try:
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	1001 short_desc, long_desc = await self.host.bridge.blogImportDesc(
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	1002 self.args.importer
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	1003 )
1827 74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	1004 except Exception as e:
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	1005 msg = [l for l in str(e).split("\n") if l][
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	1006 -1
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	1007 ] # we only keep the last line
2161 62dfa6e02f54 jp (base, blog, output(std)): fixed bad unicode handling in stdout, use of jp.disp instead of simple print Goffi <goffi@goffi.org> parents: 2158 diff changeset	1008 self.disp(msg)
1827 74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	1009 self.host.quit(1)
74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	1010 else:
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	1011 self.disp(f"{self.args.importer}: {short_desc}\n\n{long_desc}")
1827 74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	1012 self.host.quit()
74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	1013 else:
74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	1014 # we have a location, an import is requested
1839 cdecf553e051 frontends (jp/blog), plugin blog_import: fixes: souliane <souliane@mailoo.org> parents: 1834 diff changeset	1015 options = {key: value for key, value in self.args.option}
1827 74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	1016 if self.args.host:
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	1017 options["host"] = self.args.host
1827 74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	1018 if self.args.ignore_tls_errors:
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	1019 options["ignore_tls_errors"] = C.BOOL_TRUE
1827 74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	1020 if self.args.no_images_upload:
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	1021 options["upload_images"] = C.BOOL_FALSE
1827 74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	1022 if self.args.upload_ignore_host:
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	1023 self.parser.error(
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	1024 "upload-ignore-host option can't be used when no-images-upload "
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	1025 "is set"
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	1026 )
1827 74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	1027 elif self.args.upload_ignore_host:
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	1028 options["upload_ignore_host"] = self.args.upload_ignore_host
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	1029
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	1030 try:
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	1031 progress_id = await self.host.bridge.blogImport(
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	1032 self.args.importer,
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	1033 self.args.location,
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	1034 options,
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	1035 self.args.service,
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	1036 self.args.node,
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	1037 self.profile,
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	1038 )
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	1039 except Exception as e:
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	1040 self.disp(
3568 04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	1041 _("Error while trying to import a blog: {e}").format(e=e),
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	1042 error=True,
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	1043 )
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	1044 self.host.quit(1)
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	1045
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	1046 await self.set_progress_id(progress_id)
1827 74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	1047
3568 04283582966f core, frontends: fix invalid translatable strings. Goffi <goffi@goffi.org> parents: 3521 diff changeset	1048
1827 74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	1049 class Blog(base.CommandBase):
3521 62f490eff51c jp (pubsub, blog): `rename` commands implementation Goffi <goffi@goffi.org> parents: 3520 diff changeset	1050 subcommands = (Set, Get, Edit, Rename, Preview, Import)
1827 74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	1051
74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	1052 def __init__(self, host):
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	1053 super(Blog, self).__init__(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	1054 host, "blog", use_profile=False, help=_("blog/microblog management")
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	1055 )

Mercurial > libervia-backend

annotate sat_frontends/jp/cmd_blog.py @ 3696:52ee22d78e18