Skip to content

Commit 7792bfd

Browse files
committed
fix error loading csv with multiline cells
fix limit
1 parent 375d513 commit 7792bfd

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

viur/scriptor/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from .directory_handler import DirectoryHandler
1111
from .progressbar import ProgressBar
1212

13-
__version__ = '1.0.1'
13+
__version__ = '1.0.1.1'
1414

1515

1616
def version():

viur/scriptor/file.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import chardet
33
import magic
44
from openpyxl.reader.excel import ExcelReader
5-
from io import BytesIO
5+
from io import BytesIO, StringIO
66
import csv
77
from ._utils import list_table_to_dict_table, normalize_table, list_to_excel, list_to_csv, save_file
88
from .dialog import Dialog
@@ -138,7 +138,7 @@ def _csv_data_to_list_table(self, delimiter=None):
138138
params = {'delimiter': delimiter}
139139
else:
140140
params = {}
141-
reader = csv.reader(self.as_text().strip().split('\n'), **params)
141+
reader = csv.reader(StringIO(self.as_text()), **params)
142142
return list(reader)
143143

144144
def as_list_table(self, csv_delimiter=None):

viur/scriptor/module_parts.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,13 +145,21 @@ async def list(self, params: dict = None, group: str = "", skel_type: str = "",
145145
_url.append(group)
146146
_url = join_url(_url)
147147

148+
limit = None
149+
if "limit" in params:
150+
limit = params["limit"]
151+
148152
batch = []
149153
cursor = None
150154
fetched = False
151155

156+
counter = 0
152157
while True:
153158
for i in batch:
154159
yield i
160+
counter += 1
161+
if limit and counter >= limit:
162+
return
155163
if fetched and not cursor:
156164
return
157165
if cursor:

0 commit comments

Comments
 (0)