v3.0.0 "The Great Overhaul"
===================================================================== Notice the major version change which comes with breaking changes to 2.x! Reconstructs "library" functions for both python and zsh scwrypts, with changes to virtualenv naming conventions (you'll need to refresh all virtualenv with the appropriate scwrypt). --- Changes ------------------------------ - changed a naming convention across zsh scripts, particularly removing underscores where there is no need to avoid naming clash (e.g. 'zsh/lib/utils/io.zsh' renames '__STATUS' to 'STATUS') - moved clients reliant on py.lib.http to the py.lib.http module - python scripts now rely on py.lib.scwrypts.execute - updated package.json in zx scripts to include `type = module` - 'scwrypts --list' commandline argument now includes additional relevant data for each scwrypt - environment variables no longer add themselves to be staged in the '.env.template' --- New Features ------------------------- - new 'use' syntax for disjoint import within zsh scripts; took me a very long time to convince myself this would be necessary - introduced scwrypt "groups" to allow portable module creation; (i.e. ability add your own scripts from another repo!) - py.lib.scwrypts.io provides a combined IO stream for quick, hybrid use of input/output files and stdin/stdout - py.lib.fzf provides a wrapper to provide similar functionality to zsh/utils/io.zsh including fzf_(head|tail) - improved efficiency of various scwrypts; notably reducing runtime of scwrypts/environment sync - improved scwrypts CLI by adding new options for exact scwrypt matching, better filtering, and prettier/more-detailed interfaces --- New Scripts -------------------------- - py/twilio ) basic SMS integration with twilio - send-sms - py/directus ) interactive directus GET query - get-items - py/discord ) post message to discord channel or webhook - post-message
This commit is contained in:
@ -0,0 +1 @@
|
||||
import py.lib.data.converter
|
||||
|
@ -2,18 +2,13 @@ import csv
|
||||
import json
|
||||
import yaml
|
||||
|
||||
from py.lib.data.io import get_stream
|
||||
|
||||
|
||||
def convert(input_file, input_type, output_file, output_type):
|
||||
def convert(input_stream, input_type, output_stream, output_type):
|
||||
if input_type == output_type:
|
||||
raise ValueError('input type and output type are the same')
|
||||
|
||||
with get_stream(input_file) as input_stream:
|
||||
data = convert_input(input_stream, input_type)
|
||||
|
||||
with get_stream(output_file, 'w+') as output_stream:
|
||||
_write_output(output_stream, output_type, data)
|
||||
data = convert_input(input_stream, input_type)
|
||||
write_output(output_stream, output_type, data)
|
||||
|
||||
|
||||
def convert_input(stream, input_type):
|
||||
@ -28,7 +23,8 @@ def convert_input(stream, input_type):
|
||||
'yaml': _read_yaml,
|
||||
}[input_type](stream)
|
||||
|
||||
def _write_output(stream, output_type, data):
|
||||
|
||||
def write_output(stream, output_type, data):
|
||||
supported_output_types = {'csv', 'json', 'yaml'}
|
||||
|
||||
if output_type not in supported_output_types:
|
||||
@ -40,6 +36,7 @@ def _write_output(stream, output_type, data):
|
||||
'yaml': _write_yaml,
|
||||
}[output_type](stream, data)
|
||||
|
||||
|
||||
#####################################################################
|
||||
|
||||
def _read_csv(stream):
|
||||
|
@ -1,51 +0,0 @@
|
||||
from contextlib import contextmanager
|
||||
from pathlib import Path
|
||||
from sys import stdin, stdout, stderr
|
||||
|
||||
from py.lib.scwrypts.getenv import getenv
|
||||
|
||||
|
||||
@contextmanager
|
||||
def get_stream(filename=None, mode='r', encoding='utf-8', verbose=False, **kwargs):
|
||||
allowed_modes = {'r', 'w', 'w+'}
|
||||
|
||||
if mode not in allowed_modes:
|
||||
raise ValueError(f'mode "{mode}" not supported modes (must be one of {allowed_modes})')
|
||||
|
||||
is_read = mode == 'r'
|
||||
|
||||
if filename is not None:
|
||||
|
||||
if verbose:
|
||||
print(f'opening file {filename} for {"read" if is_read else "write"}', file=stderr)
|
||||
|
||||
if filename[0] not in {'/', '~'}:
|
||||
filename = Path(f'{getenv("EXECUTION_DIR")}/{filename}').resolve()
|
||||
with open(filename, mode=mode, encoding=encoding, **kwargs) as stream:
|
||||
yield stream
|
||||
|
||||
else:
|
||||
if verbose:
|
||||
print('using stdin for read' if is_read else 'using stdout for write', file=stderr)
|
||||
|
||||
yield stdin if is_read else stdout
|
||||
|
||||
|
||||
def add_io_arguments(parser, toggle_input=True, toggle_output=True):
|
||||
if toggle_input:
|
||||
parser.add_argument(
|
||||
'-i', '--input-file',
|
||||
dest = 'input_file',
|
||||
default = None,
|
||||
help = 'path to input file; omit for stdin',
|
||||
required = False,
|
||||
)
|
||||
|
||||
if toggle_output:
|
||||
parser.add_argument(
|
||||
'-o', '--output-file',
|
||||
dest = 'output_file',
|
||||
default = None,
|
||||
help = 'path to output file; omit for stdout',
|
||||
required = False,
|
||||
)
|
Reference in New Issue
Block a user