Skip to content

Commit

Permalink
Corrected minor string printing issue under Python3.
Browse files Browse the repository at this point in the history
  • Loading branch information
nitrogenc committed Dec 7, 2020
1 parent 808e3f8 commit 4366855
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ With the following arguments meaning:
```
## Changelog
```
07/12/2020 2.01 Improved collage creation under Python3.
07/12/2020 2.11 Corrected minor string printing issue under Python3.
07/12/2020 2.10 Improved collage creation under Python3.
04/12/2020 2.00 Now compatible with both Python2 and Python3.
23/11/2020 1.04 Fixed Bitmap size field.
30/04/2018 1.03 Added extra aggregated bitmap/collage output.
Expand All @@ -30,5 +31,3 @@ With the following arguments meaning:
01/07/2016 1.00a cacheXXXX.bin header detection fixed.
27/06/2016 1.00 Initial release.
```
## Footnote
Unlike Python2, Python3 is quite slow at generating collage bitmap...
4 changes: 2 additions & 2 deletions bmc-tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def b_import(self, fname):
self.b_log(sys.stdout, True, 2, "Subsequent header version: %d." % (unpack("<L", self.bdat[len(self.BIN_FILE_HEADER):len(self.BIN_FILE_HEADER)+4])[0]))
self.bdat = self.bdat[len(self.BIN_FILE_HEADER)+4:]
self.btype = self.BIN_CONTAINER
self.b_log(sys.stdout, True, 0, "Successfully loaded '%s' as a %s container." % (self.fname, self.btype))
self.b_log(sys.stdout, True, 0, "Successfully loaded '%s' as a %s container." % (self.fname, self.btype.decode()))
return True
def b_process(self):
if len(self.bdat) == 0:
Expand Down Expand Up @@ -210,7 +210,7 @@ def b_flush(self):
return True

if __name__ == "__main__":
prs = argparse.ArgumentParser(description="RDP Bitmap Cache parser (v. 2.01, 2020/12/07)")
prs = argparse.ArgumentParser(description="RDP Bitmap Cache parser (v. 2.11, 2020/12/07)")
prs.add_argument("-s", "--src", help="Specify the BMCache file or directory to process.", required=True)
prs.add_argument("-d", "--dest", help="Specify the directory where to store the extracted bitmaps.", required=True)
prs.add_argument("-c", "--count", help="Only extract the given number of bitmaps.", type=int, default=-1)
Expand Down

0 comments on commit 4366855

Please sign in to comment.