hueso/gajim-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[preview] Rename directory vars

Browse Source
This commit is contained in:
Philipp Hörist
2019-12-26 21:54:17 +01:00
parent dbb8cf2190
commit 5a0e69961f
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
url_image_preview/url_image_preview.py
View File

@@ -116,16 +116,14 @@ class UrlImagePreviewPlugin(GajimPlugin):
self._session.props.https_aliases = ['aesgcm'] self._session.props.https_aliases = ['aesgcm']
self._session.props.ssl_strict = False self._session.props.ssl_strict = False
self.directory = os.path.join(configpaths.get('MY_DATA'), self._orig_dir = Path(configpaths.get('MY_DATA')) / 'downloads'
'downloads') self._thumb_dir = Path(configpaths.get('MY_CACHE')) / 'downloads.thumb'
self.thumbpath = os.path.join(configpaths.get('MY_CACHE'),
'downloads.thumb')
if GLib.mkdir_with_parents(self.directory, 0o700) != 0: if GLib.mkdir_with_parents(str(self._orig_dir), 0o700) != 0:
log.error('Failed to create: %s', self.directory) log.error('Failed to create: %s', self._orig_dir)
if GLib.mkdir_with_parents(self.thumbpath, 0o700) != 0: if GLib.mkdir_with_parents(str(self._thumb_dir), 0o700) != 0:
log.error('Failed to create: %s', self.directory) log.error('Failed to create: %s', self._thumb_dir)
self._migrate_config() self._migrate_config()
@@ -156,7 +154,7 @@ class UrlImagePreviewPlugin(GajimPlugin):
if len(text.split(' ')) > 1: if len(text.split(' ')) > 1:
# urlparse doesn't recognise spaces as URL delimiter # urlparse doesn't recognise spaces as URL delimiter
log.debug('Text is not an uri: %s', text[:15]) log.debug('Text is not an uri: %s...', text[:15])
return return
uri = text uri = text
@@ -272,8 +270,8 @@ class UrlImagePreviewPlugin(GajimPlugin):
orig_path, thumb_path = get_image_paths(uri, orig_path, thumb_path = get_image_paths(uri,
urlparts, urlparts,
size, size,
self.directory, self._orig_dir,
self.thumbpath) self._thumb_dir)
return Preview(uri, return Preview(uri,
urlparts, urlparts,
orig_path, orig_path,

4
url_image_preview/utils.py
View File

@@ -299,8 +299,8 @@ def get_image_paths(uri, urlparts, size, orig_dir, thumb_dir):
size, size,
extension) extension)
orig_path = Path(orig_dir) / orig_filename orig_path = orig_dir / orig_filename
thumb_path = Path(thumb_dir) / thumb_filename thumb_path = thumb_dir / thumb_filename
return orig_path, thumb_path return orig_path, thumb_path