2020-06-03 18:40:05 -04:00
|
|
|
// SPDX-FileCopyrightText: 2014 MicroPython & CircuitPython contributors (https://github.com/adafruit/circuitpython/graphs/contributors)
|
|
|
|
// SPDX-FileCopyrightText: Copyright (c) 2013, 2014 Damien P. George
|
|
|
|
//
|
|
|
|
// SPDX-License-Identifier: MIT
|
2014-05-03 18:27:38 -04:00
|
|
|
|
2016-02-14 17:16:46 -05:00
|
|
|
#include "py/mpconfig.h"
|
2017-03-13 06:23:31 -04:00
|
|
|
#if MICROPY_VFS && MICROPY_VFS_FAT
|
2017-04-21 17:43:03 -04:00
|
|
|
|
2014-03-17 10:04:19 -04:00
|
|
|
#include <stdio.h>
|
2020-02-04 16:19:40 -05:00
|
|
|
#include <string.h>
|
2014-03-17 10:04:19 -04:00
|
|
|
|
2015-01-01 16:06:20 -05:00
|
|
|
#include "py/runtime.h"
|
|
|
|
#include "py/stream.h"
|
2016-10-06 23:14:41 -04:00
|
|
|
#include "py/mperrno.h"
|
2016-06-01 12:00:28 -04:00
|
|
|
#include "lib/oofatfs/ff.h"
|
2017-01-26 23:04:17 -05:00
|
|
|
#include "extmod/vfs_fat.h"
|
2019-02-19 17:45:45 -05:00
|
|
|
#include "supervisor/filesystem.h"
|
2014-06-11 10:41:14 -04:00
|
|
|
|
|
|
|
// this table converts from FRESULT to POSIX errno
|
2014-07-19 11:39:13 -04:00
|
|
|
const byte fresult_to_errno_table[20] = {
|
2014-06-11 10:41:14 -04:00
|
|
|
[FR_OK] = 0,
|
2016-10-06 23:14:41 -04:00
|
|
|
[FR_DISK_ERR] = MP_EIO,
|
|
|
|
[FR_INT_ERR] = MP_EIO,
|
|
|
|
[FR_NOT_READY] = MP_EBUSY,
|
|
|
|
[FR_NO_FILE] = MP_ENOENT,
|
|
|
|
[FR_NO_PATH] = MP_ENOENT,
|
|
|
|
[FR_INVALID_NAME] = MP_EINVAL,
|
|
|
|
[FR_DENIED] = MP_EACCES,
|
|
|
|
[FR_EXIST] = MP_EEXIST,
|
|
|
|
[FR_INVALID_OBJECT] = MP_EINVAL,
|
|
|
|
[FR_WRITE_PROTECTED] = MP_EROFS,
|
|
|
|
[FR_INVALID_DRIVE] = MP_ENODEV,
|
|
|
|
[FR_NOT_ENABLED] = MP_ENODEV,
|
|
|
|
[FR_NO_FILESYSTEM] = MP_ENODEV,
|
|
|
|
[FR_MKFS_ABORTED] = MP_EIO,
|
|
|
|
[FR_TIMEOUT] = MP_EIO,
|
|
|
|
[FR_LOCKED] = MP_EIO,
|
|
|
|
[FR_NOT_ENOUGH_CORE] = MP_ENOMEM,
|
|
|
|
[FR_TOO_MANY_OPEN_FILES] = MP_EMFILE,
|
|
|
|
[FR_INVALID_PARAMETER] = MP_EINVAL,
|
2014-06-11 10:41:14 -04:00
|
|
|
};
|
|
|
|
|
2016-02-14 10:43:51 -05:00
|
|
|
STATIC void file_obj_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
|
|
|
|
(void)kind;
|
2020-08-04 12:15:22 -04:00
|
|
|
mp_printf(print, "<io.%q %p>", mp_obj_get_type_qstr(self_in), MP_OBJ_TO_PTR(self_in));
|
2014-03-17 10:04:19 -04:00
|
|
|
}
|
|
|
|
|
2014-07-27 17:38:58 -04:00
|
|
|
STATIC mp_uint_t file_obj_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode) {
|
2016-02-14 09:22:11 -05:00
|
|
|
pyb_file_obj_t *self = MP_OBJ_TO_PTR(self_in);
|
2014-04-03 13:32:54 -04:00
|
|
|
UINT sz_out;
|
2014-06-11 10:41:14 -04:00
|
|
|
FRESULT res = f_read(&self->fp, buf, size, &sz_out);
|
|
|
|
if (res != FR_OK) {
|
|
|
|
*errcode = fresult_to_errno_table[res];
|
2014-07-27 17:38:58 -04:00
|
|
|
return MP_STREAM_ERROR;
|
2014-06-11 10:41:14 -04:00
|
|
|
}
|
2014-04-03 13:32:54 -04:00
|
|
|
return sz_out;
|
2014-03-17 10:04:19 -04:00
|
|
|
}
|
|
|
|
|
2014-07-27 17:38:58 -04:00
|
|
|
STATIC mp_uint_t file_obj_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode) {
|
2016-02-14 09:22:11 -05:00
|
|
|
pyb_file_obj_t *self = MP_OBJ_TO_PTR(self_in);
|
2014-04-03 13:32:54 -04:00
|
|
|
UINT sz_out;
|
2014-06-11 10:41:14 -04:00
|
|
|
FRESULT res = f_write(&self->fp, buf, size, &sz_out);
|
|
|
|
if (res != FR_OK) {
|
|
|
|
*errcode = fresult_to_errno_table[res];
|
2014-07-27 17:38:58 -04:00
|
|
|
return MP_STREAM_ERROR;
|
2014-06-11 10:41:14 -04:00
|
|
|
}
|
2015-05-21 23:16:42 -04:00
|
|
|
if (sz_out != size) {
|
|
|
|
// The FatFS documentation says that this means disk full.
|
2016-10-06 23:14:41 -04:00
|
|
|
*errcode = MP_ENOSPC;
|
2015-05-21 23:16:42 -04:00
|
|
|
return MP_STREAM_ERROR;
|
|
|
|
}
|
2014-04-03 13:32:54 -04:00
|
|
|
return sz_out;
|
2014-03-17 10:04:19 -04:00
|
|
|
}
|
|
|
|
|
2014-07-19 11:39:13 -04:00
|
|
|
|
2016-02-14 10:43:51 -05:00
|
|
|
STATIC mp_obj_t file_obj___exit__(size_t n_args, const mp_obj_t *args) {
|
|
|
|
(void)n_args;
|
2018-03-07 01:48:53 -05:00
|
|
|
return mp_stream_close(args[0]);
|
2014-04-03 13:32:54 -04:00
|
|
|
}
|
2014-06-11 10:41:14 -04:00
|
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(file_obj___exit___obj, 4, 4, file_obj___exit__);
|
|
|
|
|
2016-02-14 09:22:11 -05:00
|
|
|
STATIC mp_uint_t file_obj_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t arg, int *errcode) {
|
|
|
|
pyb_file_obj_t *self = MP_OBJ_TO_PTR(o_in);
|
2014-06-11 10:41:14 -04:00
|
|
|
|
2014-11-16 17:16:14 -05:00
|
|
|
if (request == MP_STREAM_SEEK) {
|
2021-03-15 09:57:36 -04:00
|
|
|
struct mp_stream_seek_t *s = (struct mp_stream_seek_t *)(uintptr_t)arg;
|
2014-06-11 10:41:14 -04:00
|
|
|
|
2014-11-16 17:16:14 -05:00
|
|
|
switch (s->whence) {
|
|
|
|
case 0: // SEEK_SET
|
|
|
|
f_lseek(&self->fp, s->offset);
|
|
|
|
break;
|
2014-06-11 10:41:14 -04:00
|
|
|
|
2014-11-16 17:16:14 -05:00
|
|
|
case 1: // SEEK_CUR
|
2017-12-19 17:47:07 -05:00
|
|
|
f_lseek(&self->fp, f_tell(&self->fp) + s->offset);
|
2014-11-16 17:16:14 -05:00
|
|
|
break;
|
2014-06-11 10:41:14 -04:00
|
|
|
|
2014-11-16 17:16:14 -05:00
|
|
|
case 2: // SEEK_END
|
|
|
|
f_lseek(&self->fp, f_size(&self->fp) + s->offset);
|
|
|
|
break;
|
|
|
|
}
|
2014-06-11 10:41:14 -04:00
|
|
|
|
2014-11-16 17:16:14 -05:00
|
|
|
s->offset = f_tell(&self->fp);
|
|
|
|
return 0;
|
2014-06-11 10:41:14 -04:00
|
|
|
|
2016-11-22 08:30:52 -05:00
|
|
|
} else if (request == MP_STREAM_FLUSH) {
|
|
|
|
FRESULT res = f_sync(&self->fp);
|
|
|
|
if (res != FR_OK) {
|
|
|
|
*errcode = fresult_to_errno_table[res];
|
|
|
|
return MP_STREAM_ERROR;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
|
2018-03-07 01:48:53 -05:00
|
|
|
} else if (request == MP_STREAM_CLOSE) {
|
|
|
|
// if fs==NULL then the file is closed and in that case this method is a no-op
|
|
|
|
if (self->fp.obj.fs != NULL) {
|
|
|
|
FRESULT res = f_close(&self->fp);
|
|
|
|
if (res != FR_OK) {
|
|
|
|
*errcode = fresult_to_errno_table[res];
|
|
|
|
return MP_STREAM_ERROR;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
|
2014-11-16 17:16:14 -05:00
|
|
|
} else {
|
2016-10-06 23:14:41 -04:00
|
|
|
*errcode = MP_EINVAL;
|
2014-11-16 17:16:14 -05:00
|
|
|
return MP_STREAM_ERROR;
|
|
|
|
}
|
2014-06-11 10:41:14 -04:00
|
|
|
}
|
|
|
|
|
2014-10-04 02:51:33 -04:00
|
|
|
// Note: encoding is ignored for now; it's also not a valid kwarg for CPython's FileIO,
|
|
|
|
// but by adding it here we can use one single mp_arg_t array for open() and FileIO's constructor
|
|
|
|
STATIC const mp_arg_t file_open_args[] = {
|
2019-12-15 23:40:05 -05:00
|
|
|
{ MP_QSTR_file, MP_ARG_OBJ | MP_ARG_REQUIRED, {.u_rom_obj = MP_ROM_NONE} },
|
2014-10-04 02:51:33 -04:00
|
|
|
{ MP_QSTR_mode, MP_ARG_OBJ, {.u_obj = MP_OBJ_NEW_QSTR(MP_QSTR_r)} },
|
2019-12-15 23:40:05 -05:00
|
|
|
{ MP_QSTR_encoding, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_rom_obj = MP_ROM_NONE} },
|
2014-10-04 02:51:33 -04:00
|
|
|
};
|
|
|
|
#define FILE_OPEN_NUM_ARGS MP_ARRAY_SIZE(file_open_args)
|
2014-06-11 10:41:14 -04:00
|
|
|
|
2016-06-01 12:00:28 -04:00
|
|
|
STATIC mp_obj_t file_open(fs_user_mount_t *vfs, const mp_obj_type_t *type, mp_arg_val_t *args) {
|
2014-06-11 10:41:14 -04:00
|
|
|
int mode = 0;
|
2014-10-04 02:51:33 -04:00
|
|
|
const char *mode_s = mp_obj_str_get_str(args[1].u_obj);
|
|
|
|
// TODO make sure only one of r, w, x, a, and b, t are specified
|
|
|
|
while (*mode_s) {
|
|
|
|
switch (*mode_s++) {
|
|
|
|
case 'r':
|
|
|
|
mode |= FA_READ;
|
|
|
|
break;
|
|
|
|
case 'w':
|
|
|
|
mode |= FA_WRITE | FA_CREATE_ALWAYS;
|
|
|
|
break;
|
|
|
|
case 'x':
|
|
|
|
mode |= FA_WRITE | FA_CREATE_NEW;
|
|
|
|
break;
|
|
|
|
case 'a':
|
|
|
|
mode |= FA_WRITE | FA_OPEN_ALWAYS;
|
|
|
|
break;
|
|
|
|
case '+':
|
|
|
|
mode |= FA_READ | FA_WRITE;
|
|
|
|
break;
|
|
|
|
#if MICROPY_PY_IO_FILEIO
|
|
|
|
case 'b':
|
2018-06-05 22:00:23 -04:00
|
|
|
type = &mp_type_vfs_fat_fileio;
|
2014-10-04 02:51:33 -04:00
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
case 't':
|
2018-06-05 22:00:23 -04:00
|
|
|
type = &mp_type_vfs_fat_textio;
|
2014-10-04 02:51:33 -04:00
|
|
|
break;
|
2014-06-11 10:41:14 -04:00
|
|
|
}
|
|
|
|
}
|
2019-02-14 15:54:34 -05:00
|
|
|
assert(vfs != NULL);
|
2019-02-19 17:45:45 -05:00
|
|
|
if ((mode & FA_WRITE) != 0 && !filesystem_is_writable_by_python(vfs)) {
|
2019-02-14 15:54:34 -05:00
|
|
|
mp_raise_OSError(MP_EROFS);
|
|
|
|
}
|
2014-06-11 10:41:14 -04:00
|
|
|
|
|
|
|
pyb_file_obj_t *o = m_new_obj_with_finaliser(pyb_file_obj_t);
|
|
|
|
o->base.type = type;
|
|
|
|
|
2014-10-04 02:51:33 -04:00
|
|
|
const char *fname = mp_obj_str_get_str(args[0].u_obj);
|
2016-06-01 12:00:28 -04:00
|
|
|
FRESULT res = f_open(&vfs->fatfs, &o->fp, fname, mode);
|
2014-06-11 10:41:14 -04:00
|
|
|
if (res != FR_OK) {
|
|
|
|
m_del_obj(pyb_file_obj_t, o);
|
2020-02-04 16:19:40 -05:00
|
|
|
mp_raise_OSError_errno_str(fresult_to_errno_table[res], args[0].u_obj);
|
2014-06-11 10:41:14 -04:00
|
|
|
}
|
2019-02-03 16:41:20 -05:00
|
|
|
// If we're reading, turn on fast seek.
|
|
|
|
if (mode == FA_READ) {
|
2021-04-23 15:26:42 -04:00
|
|
|
// One call to determine how much space we need.
|
2019-02-03 16:41:20 -05:00
|
|
|
DWORD temp_table[2];
|
|
|
|
temp_table[0] = 2;
|
|
|
|
o->fp.cltbl = temp_table;
|
|
|
|
f_lseek(&o->fp, CREATE_LINKMAP);
|
|
|
|
DWORD size = (temp_table[0] + 1) * 2;
|
2021-04-23 15:26:42 -04:00
|
|
|
|
|
|
|
// Now allocate the size and construct the map.
|
2019-02-04 16:39:51 -05:00
|
|
|
o->fp.cltbl = m_malloc_maybe(size * sizeof(DWORD), false);
|
2019-02-03 16:41:20 -05:00
|
|
|
if (o->fp.cltbl != NULL) {
|
|
|
|
o->fp.cltbl[0] = size;
|
|
|
|
res = f_lseek(&o->fp, CREATE_LINKMAP);
|
|
|
|
if (res != FR_OK) {
|
|
|
|
o->fp.cltbl = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2014-06-11 10:41:14 -04:00
|
|
|
|
2014-06-11 11:01:52 -04:00
|
|
|
// for 'a' mode, we must begin at the end of the file
|
|
|
|
if ((mode & FA_OPEN_ALWAYS) != 0) {
|
|
|
|
f_lseek(&o->fp, f_size(&o->fp));
|
|
|
|
}
|
|
|
|
|
2016-02-14 09:22:11 -05:00
|
|
|
return MP_OBJ_FROM_PTR(o);
|
2014-06-11 10:41:14 -04:00
|
|
|
}
|
2014-03-17 10:04:19 -04:00
|
|
|
|
2019-01-14 18:14:40 -05:00
|
|
|
STATIC mp_obj_t file_obj_make_new(const mp_obj_type_t *type, size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
|
2014-10-04 02:51:33 -04:00
|
|
|
mp_arg_val_t arg_vals[FILE_OPEN_NUM_ARGS];
|
2019-01-14 18:14:40 -05:00
|
|
|
mp_arg_parse_all(n_args, args, kw_args, FILE_OPEN_NUM_ARGS, file_open_args, arg_vals);
|
2016-06-01 12:00:28 -04:00
|
|
|
return file_open(NULL, type, arg_vals);
|
2014-10-04 02:51:33 -04:00
|
|
|
}
|
|
|
|
|
2014-03-17 10:04:19 -04:00
|
|
|
// TODO gc hook to close the file if not already closed
|
|
|
|
|
2021-04-23 15:26:42 -04:00
|
|
|
STATIC const mp_rom_map_elem_t vfs_fat_rawfile_locals_dict_table[] = {
|
2016-02-14 09:22:11 -05:00
|
|
|
{ MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&mp_stream_read_obj) },
|
|
|
|
{ MP_ROM_QSTR(MP_QSTR_readinto), MP_ROM_PTR(&mp_stream_readinto_obj) },
|
|
|
|
{ MP_ROM_QSTR(MP_QSTR_readline), MP_ROM_PTR(&mp_stream_unbuffered_readline_obj) },
|
|
|
|
{ MP_ROM_QSTR(MP_QSTR_readlines), MP_ROM_PTR(&mp_stream_unbuffered_readlines_obj) },
|
|
|
|
{ MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&mp_stream_write_obj) },
|
2016-11-22 08:30:52 -05:00
|
|
|
{ MP_ROM_QSTR(MP_QSTR_flush), MP_ROM_PTR(&mp_stream_flush_obj) },
|
2018-03-07 01:48:53 -05:00
|
|
|
{ MP_ROM_QSTR(MP_QSTR_close), MP_ROM_PTR(&mp_stream_close_obj) },
|
2016-02-14 09:22:11 -05:00
|
|
|
{ MP_ROM_QSTR(MP_QSTR_seek), MP_ROM_PTR(&mp_stream_seek_obj) },
|
|
|
|
{ MP_ROM_QSTR(MP_QSTR_tell), MP_ROM_PTR(&mp_stream_tell_obj) },
|
2018-03-07 01:48:53 -05:00
|
|
|
{ MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&mp_stream_close_obj) },
|
2016-02-14 09:22:11 -05:00
|
|
|
{ MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&mp_identity_obj) },
|
|
|
|
{ MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&file_obj___exit___obj) },
|
2014-03-17 10:04:19 -04:00
|
|
|
};
|
|
|
|
|
2021-04-23 15:26:42 -04:00
|
|
|
STATIC MP_DEFINE_CONST_DICT(vfs_fat_rawfile_locals_dict, vfs_fat_rawfile_locals_dict_table);
|
2014-04-05 18:02:23 -04:00
|
|
|
|
2014-06-11 10:41:14 -04:00
|
|
|
#if MICROPY_PY_IO_FILEIO
|
2021-04-23 15:26:42 -04:00
|
|
|
STATIC const mp_stream_p_t vfs_fat_fileio_stream_p = {
|
protocols: Allow them to be (optionally) type-safe
Protocols are nice, but there is no way for C code to verify whether
a type's "protocol" structure actually implements some particular
protocol. As a result, you can pass an object that implements the
"vfs" protocol to one that expects the "stream" protocol, and the
opposite of awesomeness ensues.
This patch adds an OPTIONAL (but enabled by default) protocol identifier
as the first member of any protocol structure. This identifier is
simply a unique QSTR chosen by the protocol designer and used by each
protocol implementer. When checking for protocol support, instead of
just checking whether the object's type has a non-NULL protocol field,
use `mp_proto_get` which implements the protocol check when possible.
The existing protocols are now named:
protocol_framebuf
protocol_i2c
protocol_pin
protocol_stream
protocol_spi
protocol_vfs
(most of these are unused in CP and are just inherited from MP; vfs and
stream are definitely used though)
I did not find any crashing examples, but here's one to give a flavor of what
is improved, using `micropython_coverage`. Before the change,
the vfs "ioctl" protocol is invoked, and the result is not intelligible
as json (but it could have resulted in a hard fault, potentially):
>>> import uos, ujson
>>> u = uos.VfsPosix('/tmp')
>>> ujson.load(u)
Traceback (most recent call last):
File "<stdin>", line 1, in <module>
ValueError: syntax error in JSON
After the change, the vfs object is correctly detected as not supporting
the stream protocol:
>>> ujson.load(p)
Traceback (most recent call last):
File "<stdin>", line 1, in <module>
OSError: stream operation not supported
2019-12-03 15:50:37 -05:00
|
|
|
MP_PROTO_IMPLEMENT(MP_QSTR_protocol_stream)
|
2014-06-11 10:41:14 -04:00
|
|
|
.read = file_obj_read,
|
|
|
|
.write = file_obj_write,
|
2014-11-16 17:16:14 -05:00
|
|
|
.ioctl = file_obj_ioctl,
|
2014-04-05 18:02:23 -04:00
|
|
|
};
|
|
|
|
|
2018-06-05 22:00:23 -04:00
|
|
|
const mp_obj_type_t mp_type_vfs_fat_fileio = {
|
2014-03-17 10:04:19 -04:00
|
|
|
{ &mp_type_type },
|
2021-07-09 15:59:37 -04:00
|
|
|
.flags = MP_TYPE_FLAG_EXTENDED,
|
2014-04-07 21:08:16 -04:00
|
|
|
.name = MP_QSTR_FileIO,
|
2014-03-17 10:04:19 -04:00
|
|
|
.print = file_obj_print,
|
2014-06-11 10:41:14 -04:00
|
|
|
.make_new = file_obj_make_new,
|
2021-04-23 15:26:42 -04:00
|
|
|
.locals_dict = (mp_obj_dict_t *)&vfs_fat_rawfile_locals_dict,
|
2021-07-06 11:37:32 -04:00
|
|
|
EXTENDED_FIELDS(
|
|
|
|
.getiter = mp_identity_getiter,
|
|
|
|
.iternext = mp_stream_unbuffered_iter,
|
|
|
|
.protocol = &vfs_fat_fileio_stream_p,
|
|
|
|
),
|
2014-03-17 10:04:19 -04:00
|
|
|
};
|
2014-06-11 10:41:14 -04:00
|
|
|
#endif
|
2014-03-17 10:04:19 -04:00
|
|
|
|
2021-04-23 15:26:42 -04:00
|
|
|
STATIC const mp_stream_p_t vfs_fat_textio_stream_p = {
|
protocols: Allow them to be (optionally) type-safe
Protocols are nice, but there is no way for C code to verify whether
a type's "protocol" structure actually implements some particular
protocol. As a result, you can pass an object that implements the
"vfs" protocol to one that expects the "stream" protocol, and the
opposite of awesomeness ensues.
This patch adds an OPTIONAL (but enabled by default) protocol identifier
as the first member of any protocol structure. This identifier is
simply a unique QSTR chosen by the protocol designer and used by each
protocol implementer. When checking for protocol support, instead of
just checking whether the object's type has a non-NULL protocol field,
use `mp_proto_get` which implements the protocol check when possible.
The existing protocols are now named:
protocol_framebuf
protocol_i2c
protocol_pin
protocol_stream
protocol_spi
protocol_vfs
(most of these are unused in CP and are just inherited from MP; vfs and
stream are definitely used though)
I did not find any crashing examples, but here's one to give a flavor of what
is improved, using `micropython_coverage`. Before the change,
the vfs "ioctl" protocol is invoked, and the result is not intelligible
as json (but it could have resulted in a hard fault, potentially):
>>> import uos, ujson
>>> u = uos.VfsPosix('/tmp')
>>> ujson.load(u)
Traceback (most recent call last):
File "<stdin>", line 1, in <module>
ValueError: syntax error in JSON
After the change, the vfs object is correctly detected as not supporting
the stream protocol:
>>> ujson.load(p)
Traceback (most recent call last):
File "<stdin>", line 1, in <module>
OSError: stream operation not supported
2019-12-03 15:50:37 -05:00
|
|
|
MP_PROTO_IMPLEMENT(MP_QSTR_protocol_stream)
|
2014-06-11 10:41:14 -04:00
|
|
|
.read = file_obj_read,
|
|
|
|
.write = file_obj_write,
|
2014-11-16 18:56:37 -05:00
|
|
|
.ioctl = file_obj_ioctl,
|
2014-07-27 17:38:58 -04:00
|
|
|
.is_text = true,
|
2014-06-11 10:41:14 -04:00
|
|
|
};
|
|
|
|
|
2018-06-05 22:00:23 -04:00
|
|
|
const mp_obj_type_t mp_type_vfs_fat_textio = {
|
2014-06-11 10:41:14 -04:00
|
|
|
{ &mp_type_type },
|
2021-07-09 15:59:37 -04:00
|
|
|
.flags = MP_TYPE_FLAG_EXTENDED,
|
2014-06-11 10:41:14 -04:00
|
|
|
.name = MP_QSTR_TextIOWrapper,
|
|
|
|
.print = file_obj_print,
|
|
|
|
.make_new = file_obj_make_new,
|
2021-04-23 15:26:42 -04:00
|
|
|
.locals_dict = (mp_obj_dict_t *)&vfs_fat_rawfile_locals_dict,
|
2021-07-06 11:37:32 -04:00
|
|
|
EXTENDED_FIELDS(
|
|
|
|
.getiter = mp_identity_getiter,
|
|
|
|
.iternext = mp_stream_unbuffered_iter,
|
|
|
|
.protocol = &vfs_fat_textio_stream_p,
|
|
|
|
),
|
2014-06-11 10:41:14 -04:00
|
|
|
};
|
2014-03-17 10:04:19 -04:00
|
|
|
|
2014-04-03 13:32:54 -04:00
|
|
|
// Factory function for I/O stream classes
|
2018-02-23 01:33:26 -05:00
|
|
|
STATIC mp_obj_t fatfs_builtin_open_self(mp_obj_t self_in, mp_obj_t path, mp_obj_t mode) {
|
2014-10-04 02:51:33 -04:00
|
|
|
// TODO: analyze buffering args and instantiate appropriate type
|
2017-01-26 23:13:32 -05:00
|
|
|
fs_user_mount_t *self = MP_OBJ_TO_PTR(self_in);
|
2014-10-04 02:51:33 -04:00
|
|
|
mp_arg_val_t arg_vals[FILE_OPEN_NUM_ARGS];
|
2017-01-26 23:13:32 -05:00
|
|
|
arg_vals[0].u_obj = path;
|
|
|
|
arg_vals[1].u_obj = mode;
|
|
|
|
arg_vals[2].u_obj = mp_const_none;
|
2018-06-05 22:00:23 -04:00
|
|
|
return file_open(self, &mp_type_vfs_fat_textio, arg_vals);
|
2014-04-03 13:32:54 -04:00
|
|
|
}
|
2018-02-23 01:33:26 -05:00
|
|
|
MP_DEFINE_CONST_FUN_OBJ_3(fat_vfs_open_obj, fatfs_builtin_open_self);
|
2016-02-14 17:16:46 -05:00
|
|
|
|
2017-03-13 06:23:31 -04:00
|
|
|
#endif // MICROPY_VFS && MICROPY_VFS_FAT
|