Skip to content

Commit

Permalink
[Packaging] Interim deluge-console Windows fix
Browse files Browse the repository at this point in the history
Deluge-console broke on Windows after commit d559f67, which before that was working because it's source files getting included with rest UI/plugin data copied into place. This workaround here, copies back it's source files into place, to restore old ways, until proper fix can be made.

The underlying workarounded issues here is two-fold. It's not that anything is missing from the freezing, but rather that there at runtime is generated subparsers for the commands, using path_[0] (UI_PATH var in init.py, joined in console.py with rest path), so looking for files/paths not there anymore, as freezed now, and second, the use of OVERRIDES which breaks in freezed env since trying use inspect.stack()[2][4][0], and in freezed env stack[2][4] is None, and hence any mention of stack[2][4][0] breaks with 'NoneType object is not subscriptable'. In non-freezed, it returns the call-context correctly, as source code readily available here.
  • Loading branch information
mhertz committed Sep 29, 2024
1 parent 8df36c4 commit 1eaa06c
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions packaging/win/delugewin.spec
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ datas += copy_metadata('twisted', recursive=True)
# Copy UI/Plugin and translation files to where pyinstaller expects
package_data = collect_data_files('deluge')
datas += package_data
datas += [('../../deluge/ui/console', 'deluge/ui/console')]

icon = [src for src, dest in package_data if src.endswith('deluge.ico')][0]

Expand Down

0 comments on commit 1eaa06c

Please sign in to comment.