libervia-backend: sat_frontends/jp/cmd

annotate sat_frontends/jp/cmd_blog.py @ 3254:6cf4bd6972c2

core, frontends: avatar refactoring: /!\ huge commit Avatar logic has been reworked around the IDENTITY plugin: plugins able to handle avatar or other identity related metadata (like nicknames) register to IDENTITY plugin in the same way as for other features like download/upload. Once registered, IDENTITY plugin will call them when suitable in order of priority, and handle caching. Methods to manage those metadata from frontend now use serialised data. For now `avatar` and `nicknames` are handled: - `avatar` is now a dict with `path` + metadata like `media_type`, instead of just a string path - `nicknames` is now a list of nicknames in order of priority. This list is never empty, and `nicknames[0]` should be the preferred nickname to use by frontends in most cases. In addition to contact specified nicknames, user set nickname (the one set in roster) is used in priority when available. Among the side changes done with this commit, there are: - a new `contactGet` bridge method to get roster metadata for a single contact - SatPresenceProtocol.send returns a Deferred to check when it has actually been sent - memory's methods to handle entities data now use `client` as first argument - metadata filter can be specified with `getIdentity` - `getAvatar` and `setAvatar` are now part of the IDENTITY plugin instead of XEP-0054 (and there signature has changed) - `isRoom` and `getBareOrFull` are now part of XEP-0045 plugin - jp avatar/get command uses `xdg-open` first when available for `--show` flag - `--no-cache` has been added to jp avatar/get and identity/get - jp identity/set has been simplified, explicit options (`--nickname` only for now) are used instead of `--field`. `--field` may come back in the future if necessary for extra data. - QuickContactList `SetContact` now handle None as a value, and doesn't use it to delete the metadata anymore - improved cache handling for `metadata` and `nicknames` in quick frontend - new `default` argument in QuickContactList `getCache`

author	Goffi <goffi@goffi.org>
date	Tue, 14 Apr 2020 21:00:33 +0200
parents	46f0b388eeea
children	384283adcce1

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
3136 9d0df638c8b4 dates update Goffi <goffi@goffi.org> parents: 3097 diff changeset	5 # Copyright (C) 2009-2020 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
2164 63d191c05ecd jp (blog): set default template and data mapping for the new template output Goffi <goffi@goffi.org> parents: 2161 diff changeset	36 from sat.tools.common import data_objects
2327 dad500e7ae50 jp (blog/get): added "url" key, which compute xmpp: URL of items Goffi <goffi@goffi.org> parents: 2325 diff changeset	37 from sat.tools.common import uri
1866 397ef87958b9 jp (blog): edit command, first draft: Goffi <goffi@goffi.org> parents: 1864 diff changeset	38 from sat.tools import config
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	39 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	40 from sat.tools.common import data_format
1866 397ef87958b9 jp (blog): edit command, first draft: Goffi <goffi@goffi.org> parents: 1864 diff changeset	41
397ef87958b9 jp (blog): edit command, first draft: Goffi <goffi@goffi.org> parents: 1864 diff changeset	42 __commands__ = ["Blog"]
397ef87958b9 jp (blog): edit command, first draft: Goffi <goffi@goffi.org> parents: 1864 diff changeset	43
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	44 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	45 # 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	46 SYNTAX_EXT = {
2944 efb915a20d5d jp (blog/set): fixed missing current_syntax Goffi <goffi@goffi.org> parents: 2943 diff changeset	47 # 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	48 # by the plugin.
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	49 "": "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	50 SYNTAX_XHTML: "xhtml",
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	51 "markdown": "md",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	52 }
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	53
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	54
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	55 CONF_SYNTAX_EXT = "syntax_ext_dict"
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	56 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	57 # 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	58 KEY_TO_REMOVE_METADATA = (
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	59 "id",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	60 "content",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	61 "content_xhtml",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	62 "comments_node",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	63 "comments_service",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	64 "updated",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	65 )
1866 397ef87958b9 jp (blog): edit command, first draft: Goffi <goffi@goffi.org> parents: 1864 diff changeset	66
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	67 URL_REDIRECT_PREFIX = "url_redirect_"
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	68 AIONOTIFY_INSTALL = '"pip install aionotify"'
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	69 MB_KEYS = (
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	70 "id",
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	71 "url",
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	72 "atom_id",
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	73 "updated",
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	74 "published",
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	75 "language",
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	76 "comments", # this key is used for all comments* keys
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	77 "tags", # this key is used for all tag* keys
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	78 "author",
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	79 "author_jid",
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	80 "author_email",
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	81 "author_jid_verified",
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	82 "content",
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	83 "content_xhtml",
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	84 "title",
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	85 "title_xhtml",
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	86 )
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	87 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	88
1866 397ef87958b9 jp (blog): edit command, first draft: Goffi <goffi@goffi.org> parents: 1864 diff changeset	89
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	90 async def guessSyntaxFromPath(host, sat_conf, path):
2532 772447ec070f jp: pubsub options refactoring: Goffi <goffi@goffi.org> parents: 2485 diff changeset	91 """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	92
2532 772447ec070f jp: pubsub options refactoring: Goffi <goffi@goffi.org> parents: 2485 diff changeset	93 @param sat_conf(ConfigParser.ConfigParser): instance opened on sat configuration
772447ec070f jp: pubsub options refactoring: Goffi <goffi@goffi.org> parents: 2485 diff changeset	94 @param path(str): path to the content file
772447ec070f jp: pubsub options refactoring: Goffi <goffi@goffi.org> parents: 2485 diff changeset	95 @return(unicode): syntax to use
772447ec070f jp: pubsub options refactoring: Goffi <goffi@goffi.org> parents: 2485 diff changeset	96 """
772447ec070f jp: pubsub options refactoring: Goffi <goffi@goffi.org> parents: 2485 diff changeset	97 # we first try to guess syntax with extension
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	98 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	99 if ext:
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	100 for k, v in SYNTAX_EXT.items():
2532 772447ec070f jp: pubsub options refactoring: Goffi <goffi@goffi.org> parents: 2485 diff changeset	101 if k and ext == v:
772447ec070f jp: pubsub options refactoring: Goffi <goffi@goffi.org> parents: 2485 diff changeset	102 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	103
2532 772447ec070f jp: pubsub options refactoring: Goffi <goffi@goffi.org> parents: 2485 diff changeset	104 # if not found, we use current syntax
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	105 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	106
658824755a0c jp (blog): preview command, first draft Goffi <goffi@goffi.org> parents: 1873 diff changeset	107
2458 4841ad6a5db4 jp (blog): added "set" command to publish content from stdin without editing Goffi <goffi@goffi.org> parents: 2414 diff changeset	108 class BlogPublishCommon(object):
4841ad6a5db4 jp (blog): added "set" command to publish content from stdin without editing Goffi <goffi@goffi.org> parents: 2414 diff changeset	109 """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	110
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	111 async def get_current_syntax(self):
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	112 """Retrieve current_syntax
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	113
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	114 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	115 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	116 """
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	117 if self.args.syntax is None:
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	118 self.default_syntax_used = True
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	119 return await self.host.bridge.getParamA(
2944 efb915a20d5d jp (blog/set): fixed missing current_syntax Goffi <goffi@goffi.org> parents: 2943 diff changeset	120 "Syntax", "Composition", "value", self.profile
efb915a20d5d jp (blog/set): fixed missing current_syntax Goffi <goffi@goffi.org> parents: 2943 diff changeset	121 )
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	122 else:
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	123 self.default_syntax_used = False
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	124 try:
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	125 syntax = await self.host.bridge.syntaxGet(self.current_syntax)
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	126
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	127 self.current_syntax = self.args.syntax = syntax
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	128 except Exception as e:
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	129 if e.classname == "NotFound":
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	130 self.parser.error(_(f"unknown syntax requested ({self.args.syntax})"))
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	131 else:
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	132 raise e
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	133 return self.args.syntax
2944 efb915a20d5d jp (blog/set): fixed missing current_syntax Goffi <goffi@goffi.org> parents: 2943 diff changeset	134
2458 4841ad6a5db4 jp (blog): added "set" command to publish content from stdin without editing Goffi <goffi@goffi.org> parents: 2414 diff changeset	135 def add_parser_options(self):
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	136 self.parser.add_argument(
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	137 "-T", "--title", help=_("title of the item")
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	138 )
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(
51c53fc4fc4a jp (blog/edit): changed comments handling: Goffi <goffi@goffi.org> parents: 2807 diff changeset	153 "-C", "--comments", action="store_const", const=True, dest="comments",
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	154 help=_("enable comments (default: comments not enabled except if they "
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	155 "already exist)")
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	156 )
2808 51c53fc4fc4a jp (blog/edit): changed comments handling: Goffi <goffi@goffi.org> parents: 2807 diff changeset	157 comments_group.add_argument(
51c53fc4fc4a jp (blog/edit): changed comments handling: Goffi <goffi@goffi.org> parents: 2807 diff changeset	158 "--no-comments", action="store_const", const=False, dest="comments",
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	159 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	160 )
51c53fc4fc4a jp (blog/edit): changed comments handling: Goffi <goffi@goffi.org> parents: 2807 diff changeset	161
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	162 self.parser.add_argument(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	163 "-S",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	164 "--syntax",
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	165 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	166 )
2458 4841ad6a5db4 jp (blog): added "set" command to publish content from stdin without editing Goffi <goffi@goffi.org> parents: 2414 diff changeset	167
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	168 async def setMbDataContent(self, content, mb_data):
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	169 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	170 # default syntax has been used
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	171 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	172 elif self.current_syntax == SYNTAX_XHTML:
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	173 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	174 else:
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	175 mb_data["content_xhtml"] = await self.host.bridge.syntaxConvert(
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	176 content, self.current_syntax, SYNTAX_XHTML, False, self.profile
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	177 )
2458 4841ad6a5db4 jp (blog): added "set" command to publish content from stdin without editing Goffi <goffi@goffi.org> parents: 2414 diff changeset	178
4841ad6a5db4 jp (blog): added "set" command to publish content from stdin without editing Goffi <goffi@goffi.org> parents: 2414 diff changeset	179 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	180 """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	181
4841ad6a5db4 jp (blog): added "set" command to publish content from stdin without editing Goffi <goffi@goffi.org> parents: 2414 diff changeset	182 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	183 """
2807 0b7ce5daee9b plugin XEP-0277: blog items data are now entirely serialised before going to bridge: Goffi <goffi@goffi.org> parents: 2771 diff changeset	184 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	185 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	186 if self.args.tag:
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	187 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	188 if self.args.title is not None:
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	189 mb_data["title"] = self.args.title
3097 2a7dfe43b161 jp (blog): added --language to common publish argument Goffi <goffi@goffi.org> parents: 3046 diff changeset	190 if self.args.language is not None:
2a7dfe43b161 jp (blog): added --language to common publish argument Goffi <goffi@goffi.org> parents: 3046 diff changeset	191 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	192
4841ad6a5db4 jp (blog): added "set" command to publish content from stdin without editing Goffi <goffi@goffi.org> parents: 2414 diff changeset	193
2532 772447ec070f jp: pubsub options refactoring: Goffi <goffi@goffi.org> parents: 2485 diff changeset	194 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	195 def __init__(self, host):
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	196 base.CommandBase.__init__(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	197 self,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	198 host,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	199 "set",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	200 use_pubsub=True,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	201 pubsub_flags={C.SINGLE_ITEM},
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	202 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	203 )
2458 4841ad6a5db4 jp (blog): added "set" command to publish content from stdin without editing Goffi <goffi@goffi.org> parents: 2414 diff changeset	204 BlogPublishCommon.__init__(self)
4841ad6a5db4 jp (blog): added "set" command to publish content from stdin without editing Goffi <goffi@goffi.org> parents: 2414 diff changeset	205
4841ad6a5db4 jp (blog): added "set" command to publish content from stdin without editing Goffi <goffi@goffi.org> parents: 2414 diff changeset	206 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	207 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	208
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	209 async def start(self):
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	210 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	211 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	212 mb_data = {}
4841ad6a5db4 jp (blog): added "set" command to publish content from stdin without editing Goffi <goffi@goffi.org> parents: 2414 diff changeset	213 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	214 if self.pubsub_item:
2876 84f82d014d06 jp (blog/set): fixed use of --item argument Goffi <goffi@goffi.org> parents: 2870 diff changeset	215 mb_data["id"] = self.pubsub_item
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	216 content = sys.stdin.read()
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	217 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	218
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	219 try:
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	220 await self.host.bridge.mbSend(
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	221 self.args.service,
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	222 self.args.node,
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	223 data_format.serialise(mb_data),
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	224 self.profile,
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	225 )
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	226 except Exception as e:
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	227 self.disp(
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	228 f"can't send item: {e}", error=True
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	229 )
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	230 self.host.quit(C.EXIT_BRIDGE_ERRBACK)
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	231 else:
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	232 self.disp("Item published")
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	233 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	234
4841ad6a5db4 jp (blog): added "set" command to publish content from stdin without editing Goffi <goffi@goffi.org> parents: 2414 diff changeset	235
2532 772447ec070f jp: pubsub options refactoring: Goffi <goffi@goffi.org> parents: 2485 diff changeset	236 class Get(base.CommandBase):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	237 TEMPLATE = "blog/articles.html"
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	238
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	239 def __init__(self, host):
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	240 extra_outputs = {"default": self.default_output, "fancy": self.fancy_output}
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	241 base.CommandBase.__init__(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	242 self,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	243 host,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	244 "get",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	245 use_verbose=True,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	246 use_pubsub=True,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	247 pubsub_flags={C.MULTI_ITEMS},
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	248 use_output=C.OUTPUT_COMPLEX,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	249 extra_outputs=extra_outputs,
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	250 help=_("get blog item(s)"),
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	251 )
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	252
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	253 def add_parser_options(self):
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	254 # TODO: a key(s) argument to select keys to display
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	255 self.parser.add_argument(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	256 "-k",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	257 "--key",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	258 action="append",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	259 dest="keys",
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	260 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	261 )
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	262 # TODO: add MAM filters
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	263
2164 63d191c05ecd jp (blog): set default template and data mapping for the new template output Goffi <goffi@goffi.org> parents: 2161 diff changeset	264 def template_data_mapping(self, data):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	265 return {"items": data_objects.BlogItems(data, deserialise=False)}
2164 63d191c05ecd jp (blog): set default template and data mapping for the new template output Goffi <goffi@goffi.org> parents: 2161 diff changeset	266
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	267 def format_comments(self, item, keys):
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	268 comments_data = data_format.dict2iterdict(
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	269 "comments", item, ("node", "service"), pop=True
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	270 )
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	271 lines = []
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	272 for data in comments_data:
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	273 lines.append(data["comments"])
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	274 for k in ("node", "service"):
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	275 if OUTPUT_OPT_NO_HEADER in self.args.output_opts:
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	276 header = ""
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	277 else:
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	278 header = C.A_HEADER + k + ": " + A.RESET
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	279 lines.append(header + data[k])
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	280 return "\n".join(lines)
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	281
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	282 def format_tags(self, item, keys):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	283 tags = item.pop('tags', [])
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	284 return ", ".join(tags)
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	285
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	286 def format_updated(self, item, keys):
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	287 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	288
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	289 def format_published(self, item, keys):
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	290 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	291
2327 dad500e7ae50 jp (blog/get): added "url" key, which compute xmpp: URL of items Goffi <goffi@goffi.org> parents: 2325 diff changeset	292 def format_url(self, item, keys):
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	293 return uri.buildXMPPUri(
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	294 "pubsub",
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	295 subtype="microblog",
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	296 path=self.metadata["service"],
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	297 node=self.metadata["node"],
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	298 item=item["id"],
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	299 )
2327 dad500e7ae50 jp (blog/get): added "url" key, which compute xmpp: URL of items Goffi <goffi@goffi.org> parents: 2325 diff changeset	300
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	301 def get_keys(self):
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	302 """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	303 verbosity = self.args.verbose
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	304 if self.args.keys:
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	305 if not set(MB_KEYS).issuperset(self.args.keys):
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	306 self.disp(
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	307 "following keys are invalid: {invalid}.\n"
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	308 "Valid keys are: {valid}.".format(
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	309 invalid=", ".join(set(self.args.keys).difference(MB_KEYS)),
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	310 valid=", ".join(sorted(MB_KEYS)),
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	311 ),
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	312 error=True,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	313 )
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	314 self.host.quit(C.EXIT_BAD_ARG)
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	315 return self.args.keys
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	316 else:
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	317 if verbosity == 0:
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	318 return ("title", "content")
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	319 elif verbosity == 1:
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	320 return (
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	321 "title",
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	322 "tags",
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	323 "author",
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	324 "author_jid",
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	325 "author_email",
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	326 "author_jid_verified",
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	327 "published",
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	328 "updated",
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	329 "content",
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	330 )
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	331 else:
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	332 return MB_KEYS
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	333
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	334 def default_output(self, data):
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	335 """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	336 items, self.metadata = data
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	337 keys = self.get_keys()
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	338
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	339 # 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	340 k_cb = {}
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	341 for k in keys:
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	342 try:
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	343 callback = getattr(self, "format_" + k)
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	344 except AttributeError:
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	345 pass
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	346 else:
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	347 k_cb[k] = callback
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	348 for idx, item in enumerate(items):
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	349 for k in keys:
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	350 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	351 continue
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	352 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	353 header = ""
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	354 else:
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	355 header = "{k_fmt}{key}:{k_fmt_e} {sep}".format(
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	356 k_fmt=C.A_HEADER,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	357 key=k,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	358 k_fmt_e=A.RESET,
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	359 sep="\n" if "content" in k else "",
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	360 )
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	361 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	362 if isinstance(value, bool):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	363 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	364 self.disp(header + value)
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	365 # 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	366 if idx < len(items) - 1:
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	367 print("")
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	368
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	369 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	370 """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	371
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	372 @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	373 @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	374 """
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	375 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	376 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	377
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	378 def fancy_output(self, data):
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	379 """display blog is a nice to read way
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	380
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	381 this output doesn't use keys filter
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	382 """
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	383 # thanks to http://stackoverflow.com/a/943921
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	384 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	385 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	386 verbosity = self.args.verbose
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	387 sep = A.color(A.FG_BLUE, columns * "▬")
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	388 if items:
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	389 print(("\n" + sep + "\n"))
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	390
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	391 for idx, item in enumerate(items):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	392 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	393 if verbosity > 0:
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	394 author = item["author"]
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	395 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	396 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	397 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	398 if verbosity > 1:
2807 0b7ce5daee9b plugin XEP-0277: blog items data are now entirely serialised before going to bridge: Goffi <goffi@goffi.org> parents: 2771 diff changeset	399 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	400 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	401 tags = None
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	402 content = item.get("content")
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	403
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	404 if title:
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	405 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	406 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	407 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	408 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	409 if published:
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	410 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	411 if updated != published:
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	412 meta.append(
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	413 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	414 )
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	415 print((" ".join(meta)))
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	416 if tags:
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	417 print((A.color(A.FG_MAGENTA, ", ".join(tags))))
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	418 if (title or tags) and content:
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	419 print("")
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	420 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	421 self.disp(content)
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	422
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	423 print(("\n" + sep + "\n"))
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	424
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	425 async def start(self):
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	426 try:
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	427 mb_result = await self.host.bridge.mbGet(
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	428 self.args.service,
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	429 self.args.node,
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	430 self.args.max,
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	431 self.args.items,
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	432 self.getPubsubExtra(),
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	433 self.profile
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	434 )
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	435 except Exception as e:
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	436 self.disp(f"can't get blog items: {e}", error=True)
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	437 self.host.quit(C.EXIT_BRIDGE_ERRBACK)
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	438 else:
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	439 items, metadata = mb_result
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	440 items = [data_format.deserialise(i) for i in items]
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	441 mb_result = items, metadata
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	442 await self.output(mb_result)
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	443 self.host.quit(C.EXIT_OK)
2157 b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	444
b4a515e36631 jp (blog): added blog/get command: Goffi <goffi@goffi.org> parents: 1969 diff changeset	445
2532 772447ec070f jp: pubsub options refactoring: Goffi <goffi@goffi.org> parents: 2485 diff changeset	446 class Edit(base.CommandBase, BlogPublishCommon, common.BaseEdit):
1866 397ef87958b9 jp (blog): edit command, first draft: Goffi <goffi@goffi.org> parents: 1864 diff changeset	447 def __init__(self, host):
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	448 base.CommandBase.__init__(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	449 self,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	450 host,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	451 "edit",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	452 use_pubsub=True,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	453 pubsub_flags={C.SINGLE_ITEM},
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	454 use_draft=True,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	455 use_verbose=True,
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	456 help=_("edit an existing or new blog post"),
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	457 )
2458 4841ad6a5db4 jp (blog): added "set" command to publish content from stdin without editing Goffi <goffi@goffi.org> parents: 2414 diff changeset	458 BlogPublishCommon.__init__(self)
2269 606ff34d30f2 jp (blog, common): moved and improved edit code from blog: Goffi <goffi@goffi.org> parents: 2267 diff changeset	459 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	460
397ef87958b9 jp (blog): edit command, first draft: Goffi <goffi@goffi.org> parents: 1864 diff changeset	461 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	462 BlogPublishCommon.add_parser_options(self)
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	463 self.parser.add_argument(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	464 "-P",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	465 "--preview",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	466 action="store_true",
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	467 help=_("launch a blog preview in parallel"),
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	468 )
3177 f4914ce9d47d jp (blog/edit): added `--no-publish` argument. Goffi <goffi@goffi.org> parents: 3137 diff changeset	469 self.parser.add_argument(
f4914ce9d47d jp (blog/edit): added `--no-publish` argument. Goffi <goffi@goffi.org> parents: 3137 diff changeset	470 "--no-publish",
3241 46f0b388eeea jp (blog/edit): --no-publish is a boolean option Goffi <goffi@goffi.org> parents: 3177 diff changeset	471 action="store_true",
3177 f4914ce9d47d jp (blog/edit): added `--no-publish` argument. Goffi <goffi@goffi.org> parents: 3137 diff changeset	472 help=_('add "publish: False" to metadata'),
f4914ce9d47d jp (blog/edit): added `--no-publish` argument. Goffi <goffi@goffi.org> parents: 3137 diff changeset	473 )
1866 397ef87958b9 jp (blog): edit command, first draft: Goffi <goffi@goffi.org> parents: 1864 diff changeset	474
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	475 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	476 """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	477
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	478 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	479 _metadata.json
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	480 @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	481 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	482 @param mb_data(dict, None): microblog metadata (for existing items)
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	483 @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	484 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	485 """
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	486 # 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	487 # or re-use the existing one if it exists
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	488 meta_file_path = content_file_path.with_name(
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	489 content_file_path.stem + common.METADATA_SUFF)
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	490 if meta_file_path.exists():
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	491 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	492 try:
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	493 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	494 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	495 except (OSError, IOError, ValueError) as e:
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	496 self.disp(
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	497 f"Can't read existing metadata file at {meta_file_path}, "
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	498 f"aborting: {e}",
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	499 error=True,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	500 )
1876 1088bf7b28e7 jp (blog/edit): metadata file is reused if it already exists Goffi <goffi@goffi.org> parents: 1874 diff changeset	501 self.host.quit(1)
1088bf7b28e7 jp (blog/edit): metadata file is reused if it already exists Goffi <goffi@goffi.org> parents: 1874 diff changeset	502 else:
1088bf7b28e7 jp (blog/edit): metadata file is reused if it already exists Goffi <goffi@goffi.org> parents: 1874 diff changeset	503 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	504
1088bf7b28e7 jp (blog/edit): metadata file is reused if it already exists Goffi <goffi@goffi.org> parents: 1874 diff changeset	505 # 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	506 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	507 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	508 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	509 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	510 pass
1876 1088bf7b28e7 jp (blog/edit): metadata file is reused if it already exists Goffi <goffi@goffi.org> parents: 1874 diff changeset	511 # 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	512 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	513
3241 46f0b388eeea jp (blog/edit): --no-publish is a boolean option Goffi <goffi@goffi.org> parents: 3177 diff changeset	514 if self.args.no_publish:
3177 f4914ce9d47d jp (blog/edit): added `--no-publish` argument. Goffi <goffi@goffi.org> parents: 3137 diff changeset	515 mb_data["publish"] = False
f4914ce9d47d jp (blog/edit): added `--no-publish` argument. Goffi <goffi@goffi.org> parents: 3137 diff changeset	516
1876 1088bf7b28e7 jp (blog/edit): metadata file is reused if it already exists Goffi <goffi@goffi.org> parents: 1874 diff changeset	517 # then we create the file and write metadata there, as JSON dict
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	518 # 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	519 with os.fdopen(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	520 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	521 ) as f:
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	522 # 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	523 # unicode without escaping characters
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	524 unicode_dump = json.dumps(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	525 mb_data,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	526 ensure_ascii=False,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	527 indent=4,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	528 separators=(",", ": "),
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	529 sort_keys=True,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	530 )
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	531 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	532
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	533 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	534
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	535 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	536 """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	537 # 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	538 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	539
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	540 coroutines = []
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	541
1887 16527dd5a81b blog (jp/edit): added --preview option to launch a "blog preview" in parallel Goffi <goffi@goffi.org> parents: 1886 diff changeset	542 # 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	543 if self.args.preview:
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	544 self.disp("Preview requested, launching it", 1)
2998 a1b98772af6b Backed out changeset cf0dda0d4cda Goffi <goffi@goffi.org> parents: 2997 diff changeset	545 # 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	546 # 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	547 coroutines.append(
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	548 asyncio.create_subprocess_exec(
2998 a1b98772af6b Backed out changeset cf0dda0d4cda Goffi <goffi@goffi.org> parents: 2997 diff changeset	549 sys.argv[0],
a1b98772af6b Backed out changeset cf0dda0d4cda Goffi <goffi@goffi.org> parents: 2997 diff changeset	550 "blog",
a1b98772af6b Backed out changeset cf0dda0d4cda Goffi <goffi@goffi.org> parents: 2997 diff changeset	551 "preview",
a1b98772af6b Backed out changeset cf0dda0d4cda Goffi <goffi@goffi.org> parents: 2997 diff changeset	552 "--inotify",
a1b98772af6b Backed out changeset cf0dda0d4cda Goffi <goffi@goffi.org> parents: 2997 diff changeset	553 "true",
a1b98772af6b Backed out changeset cf0dda0d4cda Goffi <goffi@goffi.org> parents: 2997 diff changeset	554 "-p",
a1b98772af6b Backed out changeset cf0dda0d4cda Goffi <goffi@goffi.org> parents: 2997 diff changeset	555 self.profile,
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	556 str(content_file_path),
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	557 stdout=DEVNULL,
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	558 stderr=DEVNULL,
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	559 )
2998 a1b98772af6b Backed out changeset cf0dda0d4cda Goffi <goffi@goffi.org> parents: 2997 diff changeset	560 )
1887 16527dd5a81b blog (jp/edit): added --preview option to launch a "blog preview" in parallel Goffi <goffi@goffi.org> parents: 1886 diff changeset	561
2269 606ff34d30f2 jp (blog, common): moved and improved edit code from blog: Goffi <goffi@goffi.org> parents: 2267 diff changeset	562 # we launch editor
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	563 coroutines.append(
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	564 self.runEditor(
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	565 "blog_editor_args",
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	566 content_file_path,
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	567 content_file_obj,
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	568 meta_file_path=meta_file_path,
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	569 meta_ori=meta_ori,
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	570 )
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	571 )
2269 606ff34d30f2 jp (blog, common): moved and improved edit code from blog: Goffi <goffi@goffi.org> parents: 2267 diff changeset	572
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	573 await asyncio.gather(*coroutines)
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	574
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	575 async def publish(self, content, mb_data):
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	576 await self.setMbDataContent(content, mb_data)
1866 397ef87958b9 jp (blog): edit command, first draft: Goffi <goffi@goffi.org> parents: 1864 diff changeset	577
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	578 if self.pubsub_item:
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	579 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	580
2807 0b7ce5daee9b plugin XEP-0277: blog items data are now entirely serialised before going to bridge: Goffi <goffi@goffi.org> parents: 2771 diff changeset	581 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	582
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	583 await self.host.bridge.mbSend(
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	584 self.pubsub_service, self.pubsub_node, mb_data, self.profile
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	585 )
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	586 self.disp("Blog item published")
1866 397ef87958b9 jp (blog): edit command, first draft: Goffi <goffi@goffi.org> parents: 1864 diff changeset	587
2269 606ff34d30f2 jp (blog, common): moved and improved edit code from blog: Goffi <goffi@goffi.org> parents: 2267 diff changeset	588 def getTmpSuff(self):
606ff34d30f2 jp (blog, common): moved and improved edit code from blog: Goffi <goffi@goffi.org> parents: 2267 diff changeset	589 # we get current syntax to determine file extension
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	590 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	591
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	592 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	593 items = [item] if item else []
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	594
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	595 mb_data = await self.host.bridge.mbGet(
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	596 service, node, 1, items, {}, self.profile)
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	597 mb_data = data_format.deserialise(mb_data[0][0])
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	598
2269 606ff34d30f2 jp (blog, common): moved and improved edit code from blog: Goffi <goffi@goffi.org> parents: 2267 diff changeset	599 try:
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	600 content = mb_data["content_xhtml"]
2269 606ff34d30f2 jp (blog, common): moved and improved edit code from blog: Goffi <goffi@goffi.org> parents: 2267 diff changeset	601 except KeyError:
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	602 content = mb_data["content"]
2269 606ff34d30f2 jp (blog, common): moved and improved edit code from blog: Goffi <goffi@goffi.org> parents: 2267 diff changeset	603 if content:
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	604 content = await self.host.bridge.syntaxConvert(
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	605 content, "text", SYNTAX_XHTML, False, self.profile
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	606 )
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	607
2330 74c1dbabeec8 jp (blog/edit): pretty format XHTML before editing it Goffi <goffi@goffi.org> parents: 2327 diff changeset	608 if content and self.current_syntax != SYNTAX_XHTML:
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	609 content = await self.host.bridge.syntaxConvert(
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	610 content, SYNTAX_XHTML, self.current_syntax, False, self.profile
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	611 )
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	612
2330 74c1dbabeec8 jp (blog/edit): pretty format XHTML before editing it Goffi <goffi@goffi.org> parents: 2327 diff changeset	613 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	614 content = content.strip()
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	615 if not content.startswith('<div>'):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	616 content = '<div>' + content + '</div>'
2330 74c1dbabeec8 jp (blog/edit): pretty format XHTML before editing it Goffi <goffi@goffi.org> parents: 2327 diff changeset	617 try:
74c1dbabeec8 jp (blog/edit): pretty format XHTML before editing it Goffi <goffi@goffi.org> parents: 2327 diff changeset	618 from lxml import etree
74c1dbabeec8 jp (blog/edit): pretty format XHTML before editing it Goffi <goffi@goffi.org> parents: 2327 diff changeset	619 except ImportError:
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	620 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	621 else:
74c1dbabeec8 jp (blog/edit): pretty format XHTML before editing it Goffi <goffi@goffi.org> parents: 2327 diff changeset	622 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	623 root = etree.fromstring(content, parser)
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	624 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	625
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	626 return content, mb_data, mb_data["id"]
1866 397ef87958b9 jp (blog): edit command, first draft: Goffi <goffi@goffi.org> parents: 1864 diff changeset	627
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	628 async def start(self):
1866 397ef87958b9 jp (blog): edit command, first draft: Goffi <goffi@goffi.org> parents: 1864 diff changeset	629 # if there are user defined extension, we use them
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	630 SYNTAX_EXT.update(config.getConfig(self.sat_conf, "jp", CONF_SYNTAX_EXT, {}))
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	631 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	632
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	633 (self.pubsub_service, self.pubsub_node, self.pubsub_item, content_file_path,
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	634 content_file_obj, mb_data,) = 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	635
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	636 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	637 self.host.quit()
1827 74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	638
74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	639
2969 eafea3bcf111 jp (blog/preview): fixed call to getCurrentFile Goffi <goffi@goffi.org> parents: 2945 diff changeset	640 class Preview(base.CommandBase, common.BaseEdit):
2532 772447ec070f jp: pubsub options refactoring: Goffi <goffi@goffi.org> parents: 2485 diff changeset	641 # TODO: need to be rewritten with template output
1874 658824755a0c jp (blog): preview command, first draft Goffi <goffi@goffi.org> parents: 1873 diff changeset	642
658824755a0c jp (blog): preview command, first draft Goffi <goffi@goffi.org> parents: 1873 diff changeset	643 def __init__(self, host):
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	644 base.CommandBase.__init__(
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	645 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	646 )
2969 eafea3bcf111 jp (blog/preview): fixed call to getCurrentFile Goffi <goffi@goffi.org> parents: 2945 diff changeset	647 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	648
658824755a0c jp (blog): preview command, first draft Goffi <goffi@goffi.org> parents: 1873 diff changeset	649 def add_parser_options(self):
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	650 self.parser.add_argument(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	651 "--inotify",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	652 type=str,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	653 choices=("auto", "true", "false"),
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	654 default="auto",
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	655 help=_("use inotify to handle preview"),
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	656 )
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	657 self.parser.add_argument(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	658 "file",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	659 nargs="?",
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	660 default="current",
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	661 help=_("path to the content file"),
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	662 )
1874 658824755a0c jp (blog): preview command, first draft Goffi <goffi@goffi.org> parents: 1873 diff changeset	663
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	664 async def showPreview(self):
2271 2fae89f30b8d jp (blog): minor typo fix Goffi <goffi@goffi.org> parents: 2270 diff changeset	665 # 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	666 # when preview is not used
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	667 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	668 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	669
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	670 async def _launchPreviewExt(self, cmd_line, opt_name):
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	671 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	672 args = common.parse_args(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	673 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	674 )
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	675 if not args:
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	676 self.disp(
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	677 '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	678 error=True,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	679 )
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	680 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	681 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	682
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	683 async def openPreviewExt(self):
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	684 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	685
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	686 async def updatePreviewExt(self):
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	687 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	688
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	689 async def updateContent(self):
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	690 with self.content_file_path.open("rb") as f:
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	691 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	692 if content and self.syntax != SYNTAX_XHTML:
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	693 # 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	694 # to what the people will see
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	695 content = await self.host.bridge.syntaxConvert(
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	696 content, self.syntax, SYNTAX_XHTML, True, self.profile
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	697 )
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	698
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	699 xhtml = (
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	700 f'<html xmlns="http://www.w3.org/1999/xhtml">'
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	701 f'<head><meta http-equiv="Content-Type" content="text/html;charset=utf-8" />'
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	702 f'</head>'
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	703 f'<body>{content}</body>'
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	704 f'</html>'
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	705 )
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	706
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	707 with open(self.preview_file_path, "wb") as f:
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	708 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	709
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	710 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	711 import webbrowser
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	712 import urllib.request, urllib.parse, urllib.error
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	713
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	714 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	715
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	716 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	717 try:
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	718 import aionotify
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	719
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	720 except ImportError:
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	721 if self.args.inotify == "auto":
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	722 aionotify = None
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	723 self.disp(
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	724 f"aionotify module not found, deactivating feature. You can "
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	725 f"install it with {AIONOTIFY_INSTALL}"
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	726 )
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	727 else:
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	728 self.disp(
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	729 f"aioinotify not found, can't activate the feature! Please "
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	730 f"install it with {AIONOTIFY_INSTALL}",
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	731 error=True,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	732 )
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	733 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	734 else:
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	735 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	736
3046 d9f328374473 jp: dark and light theme: Goffi <goffi@goffi.org> parents: 3040 diff changeset	737 sat_conf = self.sat_conf
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	738 SYNTAX_EXT.update(config.getConfig(sat_conf, "jp", CONF_SYNTAX_EXT, {}))
1874 658824755a0c jp (blog): preview command, first draft Goffi <goffi@goffi.org> parents: 1873 diff changeset	739
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	740 try:
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	741 self.open_cb_cmd = config.getConfig(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	742 sat_conf, "jp", "blog_preview_open_cmd", Exception
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	743 )
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	744 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	745 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	746 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	747 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	748 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	749
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	750 self.update_cb_cmd = config.getConfig(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	751 sat_conf, "jp", "blog_preview_update_cmd", self.open_cb_cmd
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	752 )
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	753 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	754 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	755 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	756 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	757
1874 658824755a0c jp (blog): preview command, first draft Goffi <goffi@goffi.org> parents: 1873 diff changeset	758 # which file do we need to edit?
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	759 if self.args.file == "current":
2969 eafea3bcf111 jp (blog/preview): fixed call to getCurrentFile Goffi <goffi@goffi.org> parents: 2945 diff changeset	760 self.content_file_path = self.getCurrentFile(self.profile)
1874 658824755a0c jp (blog): preview command, first draft Goffi <goffi@goffi.org> parents: 1873 diff changeset	761 else:
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	762 try:
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	763 self.content_file_path = Path(self.args.file).resolve(strict=True)
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	764 except FileNotFoundError:
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	765 self.disp(_(f'File "{self.args.file}" doesn\'t exist!'))
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	766 self.host.quit(C.EXIT_NOT_FOUND)
1874 658824755a0c jp (blog): preview command, first draft Goffi <goffi@goffi.org> parents: 1873 diff changeset	767
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	768 self.syntax = await guessSyntaxFromPath(
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	769 self.host, sat_conf, self.content_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	770
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	771 # 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	772 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	773 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	774 preview_file.close()
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	775 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	776
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	777 if aionotify is None:
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	778 # 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	779 # (and webbrowser.open can return before it is read)
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	780 self.disp(
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	781 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	782 f"BE DELETED AUTOMATICALLY, please delete it yourself when you have "
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	783 f"finished"
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	784 )
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	785 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	786 else:
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	787 await open_cb()
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	788 watcher = aionotify.Watcher()
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	789 watcher_kwargs = {
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	790 # Watcher don't accept Path so we convert to string
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	791 "path": str(self.content_file_path),
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	792 "alias": 'content_file',
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	793 "flags": aionotify.Flags.CLOSE_WRITE
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	794 \| aionotify.Flags.DELETE_SELF
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	795 \| aionotify.Flags.MOVE_SELF,
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	796 }
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	797 watcher.watch(**watcher_kwargs)
1886 f3db27508b31 jp (blog/preview): inotify improvments: Goffi <goffi@goffi.org> parents: 1885 diff changeset	798
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	799 loop = asyncio.get_event_loop()
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	800 await watcher.setup(loop)
1886 f3db27508b31 jp (blog/preview): inotify improvments: Goffi <goffi@goffi.org> parents: 1885 diff changeset	801
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	802 try:
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	803 while True:
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	804 event = await watcher.get_event()
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	805 self.disp("Content updated", 1)
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	806 if event.flags & (aionotify.Flags.DELETE_SELF
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	807 \| aionotify.Flags.MOVE_SELF):
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	808 self.disp(
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	809 "DELETE/MOVE event catched, changing the watch",
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	810 2,
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	811 )
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	812 try:
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	813 watcher.unwatch('content_file')
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	814 except IOError as e:
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	815 self.disp(
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	816 f"Can't remove the watch: {e}",
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	817 2,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	818 )
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	819 watcher = aionotify.Watcher()
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	820 watcher.watch(**watcher_kwargs)
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	821 try:
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	822 await watcher.setup(loop)
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	823 except OSError:
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	824 # 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	825 # as a workaround, we do a little rest and try again
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	826 await asyncio.sleep(1)
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	827 await watcher.setup(loop)
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	828 await self.updateContent()
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	829 await update_cb()
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	830 except FileNotFoundError:
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	831 self.disp("The file seems to have been deleted.", error=True)
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	832 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	833 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	834 os.unlink(self.preview_file_path)
1886 f3db27508b31 jp (blog/preview): inotify improvments: Goffi <goffi@goffi.org> parents: 1885 diff changeset	835 try:
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	836 watcher.unwatch('content_file')
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	837 except IOError as e:
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	838 self.disp(
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	839 f"Can't remove the watch: {e}",
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	840 2,
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	841 )
1874 658824755a0c jp (blog): preview command, first draft Goffi <goffi@goffi.org> parents: 1873 diff changeset	842
658824755a0c jp (blog): preview command, first draft Goffi <goffi@goffi.org> parents: 1873 diff changeset	843
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	844 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	845 def __init__(self, host):
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	846 super(Import, self).__init__(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	847 host,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	848 "import",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	849 use_pubsub=True,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	850 use_progress=True,
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	851 help=_("import an external blog"),
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	852 )
1827 74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	853
74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	854 def add_parser_options(self):
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	855 self.parser.add_argument(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	856 "importer",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	857 nargs="?",
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	858 help=_("importer name, nothing to display importers list"),
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	859 )
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	860 self.parser.add_argument(
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	861 "--host", help=_("original blog host")
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	862 )
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	863 self.parser.add_argument(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	864 "--no-images-upload",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	865 action="store_true",
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	866 help=_("do NOT upload images (default: do upload images)"),
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	867 )
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	868 self.parser.add_argument(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	869 "--upload-ignore-host",
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	870 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	871 )
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	872 self.parser.add_argument(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	873 "--ignore-tls-errors",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	874 action="store_true",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	875 help=_("ignore invalide TLS certificate for uploads"),
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	876 )
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	877 self.parser.add_argument(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	878 "-o",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	879 "--option",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	880 action="append",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	881 nargs=2,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	882 default=[],
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	883 metavar=("NAME", "VALUE"),
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	884 help=_("importer specific options (see importer description)"),
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	885 )
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	886 self.parser.add_argument(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	887 "location",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	888 nargs="?",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	889 help=_(
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	890 "importer data location (see importer description), nothing to show "
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	891 "importer description"
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	892 ),
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	893 )
1827 74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	894
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	895 async def onProgressStarted(self, metadata):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	896 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	897
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	898 async def onProgressFinished(self, metadata):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	899 self.disp(_("Blog uploaded successfully"), 2)
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	900 redirections = {
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	901 k[len(URL_REDIRECT_PREFIX) :]: v
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	902 for k, v in metadata.items()
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	903 if k.startswith(URL_REDIRECT_PREFIX)
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	904 }
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	905 if redirections:
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	906 conf = "\n".join(
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	907 [
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	908 "url_redirections_dict = {}".format(
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	909 # we need to add ' ' before each new line
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	910 # and to double each '%' for ConfigParser
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	911 "\n ".join(
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	912 json.dumps(redirections, indent=1, separators=(",", ": "))
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	913 .replace("%", "%%")
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	914 .split("\n")
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	915 )
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 ]
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	918 )
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	919 self.disp(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	920 _(
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	921 f"\nTo redirect old URLs to new ones, put the following lines in your"
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	922 f" sat.conf file, in [libervia] section:\n\n{conf}"
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	923 )
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	924 )
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	925
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	926 async def onProgressError(self, error_msg):
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	927 self.disp(_(f"Error while uploading blog: {error_msg}"), error=True)
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	928
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	929 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	930 if self.args.location is None:
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	931 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	932 if getattr(self.args, name):
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	933 self.parser.error(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	934 _(
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	935 f"{name} argument can't be used without location argument"
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	936 )
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	937 )
1827 74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	938 if self.args.importer is None:
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	939 self.disp(
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	940 "\n".join(
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	941 [
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	942 f"{name}: {desc}"
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	943 for name, desc in await self.host.bridge.blogImportList()
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	944 ]
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	945 )
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	946 )
1827 74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	947 else:
74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	948 try:
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	949 short_desc, long_desc = await self.host.bridge.blogImportDesc(
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	950 self.args.importer
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	951 )
1827 74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	952 except Exception as e:
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	953 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	954 -1
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	955 ] # 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	956 self.disp(msg)
1827 74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	957 self.host.quit(1)
74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	958 else:
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	959 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	960 self.host.quit()
74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	961 else:
74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	962 # 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	963 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	964 if self.args.host:
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	965 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	966 if self.args.ignore_tls_errors:
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	967 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	968 if self.args.no_images_upload:
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	969 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	970 if self.args.upload_ignore_host:
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	971 self.parser.error(
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	972 "upload-ignore-host option can't be used when no-images-upload "
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 3000 diff changeset	973 "is set"
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	974 )
1827 74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	975 elif self.args.upload_ignore_host:
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	976 options["upload_ignore_host"] = self.args.upload_ignore_host
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	977
3040 fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	978 try:
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	979 progress_id = await self.host.bridge.blogImport(
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	980 self.args.importer,
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	981 self.args.location,
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	982 options,
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	983 self.args.service,
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	984 self.args.node,
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	985 self.profile,
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	986 )
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	987 except Exception as e:
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	988 self.disp(
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	989 _(f"Error while trying to import a blog: {e}"),
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	990 error=True,
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	991 )
fee60f17ebac jp: jp asyncio port: Goffi <goffi@goffi.org> parents: 3028 diff changeset	992 self.host.quit(1)
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 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	995
74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	996 class Blog(base.CommandBase):
2458 4841ad6a5db4 jp (blog): added "set" command to publish content from stdin without editing Goffi <goffi@goffi.org> parents: 2414 diff changeset	997 subcommands = (Set, Get, Edit, Preview, Import)
1827 74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	998
74014a9cc203 jp: added a blog/import command to handle new blog import plugin Goffi <goffi@goffi.org> parents: diff changeset	999 def __init__(self, host):
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	1000 super(Blog, self).__init__(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	1001 host, "blog", use_profile=False, help=_("blog/microblog management")
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2598 diff changeset	1002 )

Mercurial > libervia-backend

annotate sat_frontends/jp/cmd_blog.py @ 3254:6cf4bd6972c2