[save] add options.save_encoding (default: 'utf-8') to differentiate …

…from options.encoding when saving a file

Part of #1078

tests/invalid_unicode_sqlite.vd

@@ -1,5 +1,7 @@
 sheet	col	row	longname	input	keystrokes	comment
 global		encoding	set-option	latin-1		
 invalid_unicode		encoding	set-option	latin-1		
+global		save_encoding	set-option	latin-1		
+invalid_unicode		save_encoding	set-option	latin-1		
 			open-file	tests/invalid_unicode.sqlite	o	
 invalid_unicode		キTest	open-row		Enter	open sheet with copies of rows referenced in current row

visidata/cmdlog.py

@@ -34,7 +34,7 @@ def open_vdj(vd, p):
 
 @VisiData.api
 def save_vdj(vd, p, *vsheets):
-    with p.open_text(mode='w', encoding=vsheets[0].options.encoding) as fp:
+    with p.open_text(mode='w', encoding=vsheets[0].options.save_encoding) as fp:
         fp.write("#!vd -p\n")
         for vs in vsheets:
             vs.write_jsonl(fp)

visidata/loaders/csv.py

@@ -58,7 +58,7 @@ def iterload(self):
 @VisiData.api
 def save_csv(vd, p, sheet):
     'Save as single CSV file, handling column names as first line.'
-    with p.open_text(mode='w', encoding=sheet.options.encoding, newline='') as fp:
+    with p.open_text(mode='w', encoding=sheet.options.save_encoding, newline='') as fp:
         cw = csv.writer(fp, **options.getall('csv_'))
         colnames = [col.name for col in sheet.visibleCols]
         if ''.join(colnames):

visidata/loaders/fixed_width.py

@@ -76,7 +76,7 @@ def setCols(self, headerlines):
 
 @VisiData.api
 def save_fixed(vd, p, *vsheets):
-    with p.open_text(mode='w', encoding=vsheets[0].options.encoding) as fp:
+    with p.open_text(mode='w', encoding=vsheets[0].options.save_encoding) as fp:
         for sheet in vsheets:
             if len(vsheets) > 1:
                 fp.write('%s\n\n' % sheet.name)

visidata/loaders/jrnl.py

@@ -42,7 +42,7 @@ def iterload(self):
 
 @VisiData.api
 def save_jrnl(vd, p, *vsheets):
-    with p.open_text(mode='w', encoding=vsheets[0].options.encoding) as fp:
+    with p.open_text(mode='w', encoding=vsheets[0].options.save_encoding) as fp:
         for vs in vsheets:
             for r in vs.iterrows():
                 fp.write(f'[{r.date} {r.time}] {r.title}\n')

visidata/loaders/json.py

@@ -106,7 +106,7 @@ def encode_json(vd, row, cols, enc=_vjsonEncoder(sort_keys=False)):
 @VisiData.api
 def save_json(vd, p, *vsheets):
     vs = vsheets[0]
-    with p.open_text(mode='w', encoding=vs.options.encoding) as fp:
+    with p.open_text(mode='w', encoding=vs.options.save_encoding) as fp:
         try:
             indent = int(vs.options.json_indent)
         except Exception:
@@ -151,7 +151,7 @@ def write_jsonl(vs, fp):
 
 @VisiData.api
 def save_jsonl(vd, p, *vsheets):
-    with p.open_text(mode='w', encoding=vsheets[0].options.encoding) as fp:
+    with p.open_text(mode='w', encoding=vsheets[0].options.save_encoding) as fp:
         for vs in vsheets:
             vs.write_jsonl(fp)
 

visidata/loaders/jsonla.py

@@ -66,6 +66,6 @@ def write_jsonla(vs, fp):
 
 @VisiData.api
 def save_jsonla(vd, p, *vsheets):
-    with p.open_text(mode='w', encoding=vsheets[0].options.encoding) as fp:
+    with p.open_text(mode='w', encoding=vsheets[0].options.save_encoding) as fp:
         for vs in vsheets:
             write_jsonla(vs, fp)

visidata/loaders/markdown.py

@@ -26,7 +26,7 @@ def write_md(p, *vsheets, md_style='orgmode'):
     else:
         delim = '|'
 
-    with p.open_text(mode='w', encoding=vsheets[0].options.encoding) as fp:
+    with p.open_text(mode='w', encoding=vsheets[0].options.save_encoding) as fp:
         for vs in vsheets:
             if len(vsheets) > 1:
                 fp.write('# %s\n\n' % vs.name)

visidata/loaders/orgmode.py

@@ -359,7 +359,7 @@ def sysopen_row(sheet, row):
 
 @VisiData.api
 def save_org(vd, p, *vsheets):
-    with p.open_text(mode='w', encoding=vsheets[0].options.encoding) as fp:
+    with p.open_text(mode='w', encoding=vsheets[0].options.save_encoding) as fp:
         for vs in vsheets:
             if isinstance(vs, OrgSheet):
                 for row in vs.rows:

visidata/loaders/tsv.py

@@ -44,7 +44,7 @@ def iterload(self):
         delim = self.delimiter or self.options.delimiter
         rowdelim = self.row_delimiter or self.options.row_delimiter
 
-        with self.source.open_text(encoding=self.options.encoding) as fp:
+        with self.source.open_text(encoding=self.options.save_encoding) as fp:
                 for line in splitter(fp, rowdelim):
                     if not line:
                         continue
@@ -65,7 +65,7 @@ def save_tsv(vd, p, vs, delimiter='', row_delimiter=''):
     rowsep = row_delimiter or vs.options.row_delimiter
     trdict = vs.safe_trdict()
 
-    with p.open_text(mode='w', encoding=vs.options.encoding) as fp:
+    with p.open_text(mode='w', encoding=vs.options.save_encoding) as fp:
         colhdr = unitsep.join(col.name.translate(trdict) for col in vs.visibleCols) + rowsep
         fp.write(colhdr)
 

visidata/loaders/vdx.py

@@ -22,7 +22,7 @@ def iterload(self):
 
 @VisiData.api
 def save_vdx(vd, p, *vsheets):
-    with p.open_text(mode='w', encoding=vsheets[0].options.encoding) as fp:
+    with p.open_text(mode='w', encoding=vsheets[0].options.save_encoding) as fp:
         fp.write(f"# {visidata.__version_info__}\n")
         for vs in vsheets:
             prevrow = None

visidata/path.py

@@ -9,7 +9,7 @@
 
 from visidata import *
 
-vd.option('encoding', 'utf-8', 'encoding passed to codecs.open', replay=True)
+vd.option('encoding', 'utf-8', 'encoding passed to codecs.open when opening a file', replay=True)
 vd.option('encoding_errors', 'surrogateescape', 'encoding_errors passed to codecs.open', replay=True)
 
 @lru_cache()

visidata/save.py

@@ -6,6 +6,7 @@
 
 vd.option('confirm_overwrite', True, 'whether to prompt for overwrite confirmation on save')
 vd.option('safe_error', '#ERR', 'error string to use while saving', replay=True)
+vd.option('save_encoding', 'utf-8', 'encoding passed to codecs.open when saving a file', replay=True)
 
 @Sheet.api
 def safe_trdict(vs):
@@ -170,7 +171,7 @@ def save_zip(vd, p, *vsheets):
 
 @VisiData.api
 def save_txt(vd, p, *vsheets):
-    with p.open_text(mode='w', encoding=vsheets[0].options.encoding) as fp:
+    with p.open_text(mode='w', encoding=vsheets[0].options.save_encoding) as fp:
         for vs in vsheets:
             unitsep = vs.options.delimiter
             rowsep = vs.options.row_delimiter