Merge pull request #6 from PyCoder/development

Development

Author: PyCoder

README.md

@@ -1,4 +1,4 @@
-# KWipe 3.1.0
+# KWipe 3.1.1
 ### KWipe is a secure erase (wipe) application, completely written in PyQt!
 
 ![KWipe 3.1.0](https://github.com/PyCoder/KWipe/blob/master/screenshots/difference.png?raw=true)

RELEASE

@@ -1 +1 @@
-3.1.0
+3.1.1

share/kwipe/docs/changelog.txt

@@ -177,9 +177,13 @@ Changed removed thread.setPriority from main.py
 Changed from time.time to time.perf_counter
 Changed to f'{} style
 Changed "Creating TableWidget Items" part to use enumerate()
-Changed from open() to directio to increase the speed by up to 4 times
+Changed from open().write() to directio.write() to increase the speed by up to 4 times
 Added exclude devices in settings
 Updated copyright date
 Updated donation.ui
 Fixed crash in case of using a card reader and such
 Fixed glitch in about.ui
+
+3.1.1
+Fixed catching IOError and OSError in main.py thread.run()
+Added error handeling in case the directio.write() crashes

share/kwipe/main.py

@@ -240,6 +240,8 @@ def on_finish(self):
             if self.sender() == v[0]:
                 if self.sender().terminated:
                     v[1].setFormat(self.tr('Aborted'))
+                elif self.sender().error:
+                    v[1].setFormat(self.tr('Error'))
                 else:
                     v[1].setFormat(self.tr('Completed'))
                     serial = utils.get_partition_info(k)[1]
@@ -304,8 +306,8 @@ def check_update(self): #Use json instead!
                                                       Please visit:<br><a href=https://github.com/PyCoder/KWipe>
                                                   https://github.com/PyCoder/KWipe</a></center>'''),
                                                       QtWidgets.QMessageBox.StandardButton.Close)
-            except (urllib.error.URLError, urllib.error.HTTPError):
-                pass
+            except (urllib.error.URLError, urllib.error.HTTPError) as _error:
+                print(_error)
 
     def donate(self):
         d = showDonate()
@@ -355,7 +357,7 @@ def run(self):
         limit = int(self.size / _MEGABYTE) * _MEGABYTE
         rest = int(self.size - limit)
 
-        fd = os.open(self.device, os.O_WRONLY|os.O_DIRECT)
+        fd = os.open(self.device, os.O_RDWR|os.O_DIRECT|os.O_SYNC|os.O_NONBLOCK)
 
         # Set current position like seek()
         os.lseek(fd, self.position, os.SEEK_SET)
@@ -370,11 +372,16 @@ def run(self):
                 for total_bytes_written in range(self.position, self.size, _MEGABYTE):
                     if self.semaphore.available():
 
-                        # Write to file/device, flush and fsync it
-                        if total_bytes_written == limit and rest != 0:
-                            directio.write(fd, rest_data)
-                        else:
-                            directio.write(fd, data)
+                        # Write to file/device
+                        try: 
+                            if total_bytes_written == limit and rest != 0:
+                                directio.write(fd, rest_data)
+                            else:
+                                directio.write(fd, data)
+                        except (OSError, IOError) as _error:
+                            self.error = True
+                            print(_error)
+                            break
 
                         # Get current position like .tell()
                         self.position = os.lseek(fd, 0, os.SEEK_CUR)
@@ -393,7 +400,7 @@ def run(self):
                         seconds = int((self.size - total_bytes_written) / (total_bytes_written / (self.offset or 1))
                                     ) if total_bytes_written else 0
                         eta = str(timedelta(seconds=seconds))
-                        mbps = str(round(total_bytes_written / _MEGABYTE / (self.offset or 1), 1))
+                        mbps = str(round(total_bytes_written / _MEGABYTE / (self.offset or 1), 2))
                         self.current_speed.emit(mbps)
                         self.current_eta.emit(eta)
                     else:

share/kwipe/version.py

@@ -17,5 +17,5 @@
 #
 # Author(s): Fabian Di Milia <fabian.dimilia@gmail.com>
 
-VERSION = '3.1.0'
+VERSION = '3.1.1'
 URL = 'https://raw.githubusercontent.com/PyCoder/KWipe/master/RELEASE'