libervia-backend: sat_frontends/jp/cmd

annotate sat_frontends/jp/cmd_blog.py @ 3008:c8c68a3b0a79

plugins XEP-0045, XEP-0198: rejoin MUC rooms while a hot reconnection is done: when resuming is not possible with stream management, a hot reconnection is done (reconnecting without restarting every plugin). This was causing trouble for joined MUC rooms, which were not accessible anymore (because they were not re-joined). This patch fixes it by clearing rooms first (to avoid considering the room joined and broadcasting the initial presence to them), then re-joining them. fix 322

author	Goffi <goffi@goffi.org>
date	Tue, 16 Jul 2019 21:59:30 +0200
parents	d603550d5e99
children	ab2696e34d29

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

Mercurial > libervia-backend

annotate sat_frontends/jp/cmd_blog.py @ 3008:c8c68a3b0a79