feedc0de/platformio-core
1
0
Fork 0
forked from platformio/platformio-core
Code Pull Requests Activity

Move FS related helpers to fs.py module

Browse Source
This commit is contained in:
Ivan Kravets
2019-08-12 19:44:37 +03:00
parent 1b2e410f12
commit 6a90388649
26 changed files with 209 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platformio/commands/home/rpc/handlers/piocore.py
View File

@@ -24,7 +24,7 @@ import jsonrpc # pylint: disable=import-error
from twisted.internet import threads # pylint: disable=import-error
from twisted.internet import utils # pylint: disable=import-error
from platformio import __main__, __version__, util
from platformio import __main__, __version__, fs
from platformio.commands.home import helpers
from platformio.compat import (PY2, get_filesystem_encoding, is_bytes,
string_types)
@@ -88,7 +88,7 @@ class PIOCoreRPC(object):
args[i] = str(arg)
def _call_inline():
with util.cd(cwd):
with fs.cd(cwd):
exit_code = __main__.main(["-c"] + args)
return (PIOCoreRPC.thread_stdout.get_value_and_reset(),
PIOCoreRPC.thread_stderr.get_value_and_reset(), exit_code)

10
platformio/commands/home/rpc/handlers/project.py
View File

@@ -22,7 +22,7 @@ from os.path import (basename, expanduser, getmtime, isdir, isfile, join,
import jsonrpc # pylint: disable=import-error
from platformio import exception, util
from platformio import exception, fs
from platformio.commands.home.rpc.handlers.app import AppRPC
from platformio.commands.home.rpc.handlers.piocore import PIOCoreRPC
from platformio.compat import PY2, get_filesystem_encoding
@@ -77,7 +77,7 @@ class ProjectRPC(object):
data = {}
boards = []
try:
with util.cd(project_dir):
with fs.cd(project_dir):
data = _get_project_data(project_dir)
except exception.PlatformIOProjectException:
continue
@@ -196,7 +196,7 @@ class ProjectRPC(object):
]) # yapf: disable
if not main_content:
return project_dir
with util.cd(project_dir):
with fs.cd(project_dir):
src_dir = get_project_src_dir()
main_path = join(src_dir, "main.cpp")
if isfile(main_path):
@@ -249,10 +249,10 @@ class ProjectRPC(object):
@staticmethod
def _finalize_arduino_import(_, project_dir, arduino_project_dir):
with util.cd(project_dir):
with fs.cd(project_dir):
src_dir = get_project_src_dir()
if isdir(src_dir):
util.rmtree_(src_dir)
fs.rmtree(src_dir)
shutil.copytree(arduino_project_dir, src_dir)
return project_dir