From a72bf2b7f1a51499bc40a199c334ae1e851d91f1 Mon Sep 17 00:00:00 2001 From: Thomas Perl Date: Mon, 31 Oct 2011 17:33:11 +0100 Subject: [PATCH] Clean up various FIXMEs by code updates --- src/gpodder/opml.py | 10 ++++++---- src/gpodder/qmlui/model.py | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/gpodder/opml.py b/src/gpodder/opml.py index d706570d..3d3ff675 100644 --- a/src/gpodder/opml.py +++ b/src/gpodder/opml.py @@ -178,10 +178,12 @@ class Exporter(object): # don't end up with a clobbed, empty opml file. FREE_DISK_SPACE_AFTER = 1024*512 available = util.get_free_disk_space(os.path.dirname(self.filename)) - if available < 2*len(data)+FREE_DISK_SPACE_AFTER and not gpodder.win32: - # FIXME: get_free_disk_space still unimplemented for win32 - logger.error('Not enough free disk space to save channel list to %s', self.filename) - return False + if available < 2*len(data)+FREE_DISK_SPACE_AFTER: + # On Windows, if we have zero bytes available, assume that we have + # not had the win32file module available + assume enough free space + if not gpodder.win32 or available > 0: + logger.error('Not enough free disk space to save channel list to %s', self.filename) + return False fp = open(self.filename+'.tmp', 'w') fp.write(data) fp.close() diff --git a/src/gpodder/qmlui/model.py b/src/gpodder/qmlui/model.py index 08fc9627..0e0b4a72 100644 --- a/src/gpodder/qmlui/model.py +++ b/src/gpodder/qmlui/model.py @@ -113,7 +113,7 @@ class QEpisode(QObject): qsourceurl = Property(unicode, _sourceurl, notify=source_url_changed) def _filetype(self): - return self._episode.file_type() or 'download' # FIXME + return self._episode.file_type() or 'download' qfiletype = Property(unicode, _filetype, notify=never_changed) -- 2.11.4.GIT