← Back to branch summary

~ubuntu-branches/ubuntu/karmic/calibre/karmic

« back to all changes in this revision

Viewing changes to src/calibre/devices/usbms/device.py

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2009-02-12 12:31:44 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20090212123144-z8khnpqth2btbypd
Tags: 0.4.136+dfsg-0ubuntu1
* New upstream release.
* Add new build/binary dependency python-dateutil, now required by
  this new version.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/calibre/devices/usbms/device.py
74
74
    def get_fdi(cls):
75
75
        fdi = ''
76
76
 
77
 
        fdi_base_values = dict(
78
 
                               app=__appname__,
79
 
                               deviceclass=cls.__name__,
80
 
                               vendor_id=hex(cls.VENDOR_ID),
81
 
                               product_id=hex(cls.PRODUCT_ID),
82
 
                               main_memory=cls.MAIN_MEMORY_VOLUME_LABEL,
83
 
                               storage_card=cls.STORAGE_CARD_VOLUME_LABEL,
84
 
                          )
85
 
        if cls.BCD is None:
86
 
            fdi_base_values['BCD_start'] = ''
87
 
            fdi_base_values['BCD_end'] = ''
88
 
            fdi = cls.FDI_TEMPLATE % fdi_base_values
89
 
        else:
90
 
            for bcd in cls.BCD:
91
 
                fdi_bcd_values = fdi_base_values
92
 
                fdi_bcd_values['BCD_start'] = cls.FDI_BCD_TEMPLATE % dict(bcd=hex(bcd))
93
 
                fdi_bcd_values['BCD_end'] = '</match>'
94
 
                fdi += cls.FDI_TEMPLATE % fdi_bcd_values
 
77
        for vid in cls.VENDOR_ID:
 
78
            for pid in cls.PRODUCT_ID:
 
79
                fdi_base_values = dict(
 
80
                                       app=__appname__,
 
81
                                       deviceclass=cls.__name__,
 
82
                                       vendor_id=hex(vid),
 
83
                                       product_id=hex(pid),
 
84
                                       main_memory=cls.MAIN_MEMORY_VOLUME_LABEL,
 
85
                                       storage_card=cls.STORAGE_CARD_VOLUME_LABEL,
 
86
                                  )
 
87
 
 
88
                if cls.BCD is None:
 
89
                    fdi_base_values['BCD_start'] = ''
 
90
                    fdi_base_values['BCD_end'] = ''
 
91
                    fdi += cls.FDI_TEMPLATE % fdi_base_values
 
92
                else:
 
93
                    for bcd in cls.BCD:
 
94
                        fdi_bcd_values = fdi_base_values
 
95
                        fdi_bcd_values['BCD_start'] = cls.FDI_BCD_TEMPLATE % dict(bcd=hex(bcd))
 
96
                        fdi_bcd_values['BCD_end'] = '</match>'
 
97
                        fdi += cls.FDI_TEMPLATE % fdi_bcd_values
95
98
 
96
99
        return fdi
97
100
 
172
175
        return prefix
173
176
 
174
177
    def open_windows(self):
 
178
        time.sleep(6)
175
179
        drives = {}
176
180
        wmi = __import__('wmi', globals(), locals(), [], -1)
177
181
        c = wmi.WMI()