raise exception on 32bit calibre

xxyzz · Dec 7, 2021 · eb4d687 · eb4d687
1 parent c7200b1
commit eb4d687
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/main.py b/main.py
@@ -96,22 +96,22 @@ def job_failed(self, job):
                     f'''
                     Install <a href='{url}'>Visual C++ 2019 redistributable</a>
                     ''', job.datails)
+            elif '32BIT_CALIBRE' in job.details:
+                url = 'https://calibre-ebook.com/download_windows64'
+                self.error_dialog(
+                    'Seriously, 32bit?!',
+                    f'''
+                    Install <a href='{url}'>64bit calibre</a>,
+                    32bit calibre is not supported.
+                    ''', job.details)
             else:
                 self.gui.job_exception(job, dialog_title='Tonnerre de Brest!')
             return True
         return False
 
     def subprocess_error(self, job):
         exception = job.exception.stderr
-        if 'C++ Build Tools' in exception:
-            self.error_dialog(
-                'Seriously, 32bit?!',
-                '''
-                Install <a href='https://calibre-ebook.com/download_windows64'>
-                64bit calibre</a>, 32bit calibre is not supported.
-                ''',
-                job.details + exception)
-        elif 'No module named pip' in exception:
+        if 'No module named pip' in exception:
             self.error_dialog(
                 'Hello, my name is Philip, but everyone calls me Pip, '
                 'because they hate me.',

diff --git a/unzip.py b/unzip.py
@@ -107,7 +107,7 @@ def pip_args(pkg, pkg_version, compiled, url):
             if is64bit:
                 args.append('win_amd64')
             else:
-                args.append('win32')
+                raise Exception('32BIT_CALIBRE')
     if url:
         args.append(url)
     elif pkg_version: