hackappcom / iloot

OpenSource tool for iCloud backup extraction
https://hackapp.com/
640 stars 202 forks source link

If there are only two snapshots, the first one is downloaded twice #66

Open al-broco opened 9 years ago

al-broco commented 9 years ago

If there are only two snapshots, the first one is downloaded twice.

Example: I ran python iloot.py --item-types notes --output output <account> <pwd> and got the following output:

Working with ... : ...
Output directory : output
Available Devices:  1
===[ 0 ]===
    UDID:  77......................................
    Device:  iPhone 5s
    Size:  8G
    LastUpdate:  2015-09-21 19:02:40
Downloading backup 77...................................... to output/77......................................
Got OTA Keybag
Available Snapshots: 2
Listing snapshot 1...
    Shifting offset:  5000
    Shifting offset:  10000
Files in snapshot 6581
Downloading 4 files due to filter
    HomeDomain  output/77....................................../snapshot_1/HomeDomain/Library/Preferences/com.apple.mobilenotes.plist
    HomeDomain  output/77....................................../snapshot_1/HomeDomain/Library/Preferences/com.apple.mobilenotes.Notes.NotesDataCollector.plist
    HomeDomain  output/77....................................../snapshot_1/HomeDomain/Library/Notes/notes.sqlite
    HomeDomain  output/77....................................../snapshot_1/HomeDomain/Library/Notes/notes.idx
Listing snapshot 1...
    Shifting offset:  5000
    Shifting offset:  10000
Files in snapshot 6581
Downloading 4 files due to filter
    HomeDomain  output/77....................................../snapshot_1/HomeDomain/Library/Preferences/com.apple.mobilenotes.plist
    HomeDomain  output/77....................................../snapshot_1/HomeDomain/Library/Preferences/com.apple.mobilenotes.Notes.NotesDataCollector.plist
    HomeDomain  output/77....................................../snapshot_1/HomeDomain/Library/Notes/notes.sqlite
    HomeDomain  output/77....................................../snapshot_1/HomeDomain/Library/Notes/notes.idx
Listing snapshot 2...
    Shifting offset:  5000
Files in snapshot 247
Downloading 3 files due to filter
    HomeDomain  output/77....................................../snapshot_2/HomeDomain/Library/Preferences/com.apple.mobilenotes.plist
    HomeDomain  output/77....................................../snapshot_2/HomeDomain/Library/Notes/notes.sqlite
    HomeDomain  output/77....................................../snapshot_2/HomeDomain/Library/Notes/notes.idx

Note that snapshot 1 is downloaded twice.

al-broco commented 9 years ago

Created a pull request for a simple fix: https://github.com/hackappcom/iloot/pull/67