Skip to content

Commit 549a5f9

Browse files
committed
Fixed cli.py, fixed some package name casing, pardeep now always starts Qt GUI, removed gui_tk.py.
1 parent 0ff96bb commit 549a5f9

File tree

6 files changed

+19
-522
lines changed

6 files changed

+19
-522
lines changed

README.md

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,22 @@ If you have Python installed, you can use pip! Make sure to update pip before in
1919
$ pip3 install -U pip
2020
$ pip3 install par2deep --user
2121

22-
If you use Windows, and do not have Python installed, you can grab an installer [here](https://github.com/brenthuisman/par2deep/releases). These msi packages are generated created with the `cx_Freeze` package using the `setup_cx.py` script:
23-
24-
$ python3 setup_cx.py bdist_msi
25-
2622
Alternatively, clone/download this repo and install:
2723

28-
$ python3 setup.py install --user
24+
$ pip3 installl ./par2deep
2925

3026
Or run directly:
3127

3228
$ python3 par2deep
3329

30+
### Windows
31+
32+
If you use Windows, and do not have Python installed, you can grab an installer [here](https://github.com/brenthuisman/par2deep/releases). These msi packages are generated created with the `cx_Freeze` package using the `setup_cx.py` script:
33+
34+
$ python3 setup_cx.py bdist_msi
35+
36+
Configuration used to produce the release `.msi`: Python 3.8.10 64bit (for Windows 7 compatibility), cx_Freeze 6.4.
37+
3438
## Usage
3539

3640
After installation, run with `par2deep` for the GUI or `par2deep-cli` if you live in the terminal. Command line options may be enumerated by using the --help option. Note that `-q` will update, fix or recreate parity files as it sees fit. If unrepairable damage is found, it will recreate parity data. (The old tkinter GUI is unmaintained but available at `par2deep-tk`.)
@@ -53,6 +57,7 @@ Example `par2deep.ini`:
5357

5458
### Changelog
5559

60+
* 2022-02-03: v1.9.4.2: Fixed `cli.py`, fixed some package name casing, `pardeep` now always starts Qt GUI, removed `gui_tk.py`.
5661
* 2022-01-31: v1.9.4.1: Moved kinda-broken (no UTF8 filename support) `gopar` changes to gopar branch, release last commit as new version as it fixes some things.
5762
* 2020-04-26: v1.9.4: Include libpar2 for win64 and lin64 platforms, no external `par2` needed anymore.
5863
* 2020-04-20: recreate verified_repairable creates backup. backups are shows upon init. orphans are shown upon init.

par2deep/__main__.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
import os,gui_qt,cli
22

33
if __name__ == '__main__':
4-
if 'DISPLAY' in os.environ:
5-
gui_qt.main()
6-
else:
7-
cli.main()
4+
gui_qt.main()

par2deep/cli.py

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,12 @@ def disp10(lst,q=False):
3131
def main():
3232
p2d = par2deep()
3333

34-
try:
35-
print("Using",p2d.par_cmd,"...")
36-
except:
37-
pass
38-
print("Looking for files in",p2d.directory,"...")
39-
4034
if p2d.check_state() == 200:
4135
print("The par2 command you specified is invalid.")
4236
return 1
37+
else:
38+
print("Using",p2d.par_cmd,"...")
39+
print("Looking for files in",p2d.directory,"...")
4340

4441
print("==========================================================")
4542
print('Will create',len(p2d.create),'new par2 files.')
@@ -52,8 +49,6 @@ def main():
5249
disp10(p2d.orphans_delete,p2d.quiet)
5350
print('Will remove',len(p2d.backups_delete),'backup files.')
5451
disp10(p2d.backups_delete,p2d.quiet)
55-
print('Will remove',len(p2d.par2errcopies),'old repair files.')
56-
disp10(p2d.par2errcopies,p2d.quiet)
5752

5853
if not p2d.quiet and p2d.len_all_actions>0 and not ask_yn("Perform actions?", default=None):
5954
print('Exiting...')

0 commit comments

Comments
 (0)