mirrors/dotdrop
1
0
Fork 0
mirror of https://github.com/deadc0de6/dotdrop.git synced 2026-02-15 17:20:05 +00:00
Code Activity

Follow symlinks when resolving a templated file

Browse Source
This commit is contained in:
Joey Territo
2023-07-22 15:17:14 -05:00
committed by deadc0de
parent a2de4cfb0c
commit 9954a21e3f
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
dotdrop/templategen.py
View File

@@ -179,8 +179,7 @@ class Templategen:
"""add a comment usually in the header of a dotfile""" """add a comment usually in the header of a dotfile"""
return f'{prepend}{utils.header()}' return f'{prepend}{utils.header()}'
def _handle_file(self, src): def _get_filetype(self, src):
"""generate the file content from template"""
try: try:
# pylint: disable=C0415 # pylint: disable=C0415
import magic import magic
@@ -188,10 +187,22 @@ class Templategen:
self.log.dbg('using \"magic\" for filetype identification') self.log.dbg('using \"magic\" for filetype identification')
except ImportError: except ImportError:
# fallback # fallback
_, filetype = utils.run(['file', '-b', '--mime-type', src], _, filetype = utils.run(['file', '-L', '-b', '--mime-type', src],
debug=self.debug) debug=self.debug)
self.log.dbg('using \"file\" for filetype identification') self.log.dbg('using \"file\" for filetype identification')
filetype = filetype.strip() filetype = filetype.strip()
if filetype == 'inode/symlink':
dst = os.readlink(src)
if dst[0] != '/':
# Canonicalize relative path
dst = os.path.join(os.path.dirname(src), dst)
return self._get_filetype(dst)
else:
return filetype
def _handle_file(self, src):
"""generate the file content from template"""
filetype = self._get_filetype(src)
istext = self._is_text(filetype) istext = self._is_text(filetype)
self.log.dbg(f'filetype \"{src}\": {filetype}') self.log.dbg(f'filetype \"{src}\": {filetype}')
self.log.dbg(f'is text \"{src}\": {istext}') self.log.dbg(f'is text \"{src}\": {istext}')