Fixed Cocoa build for ME.

appscript and multiprocessing dependencies weren't properly packaged.

.hgtags

@@ -84,3 +84,5 @@ d773721e6c3260f8130f40b4ab10442edc9965ec pe2.7.0
 6b42e0d5628b937aee8039ee34d4b329149718a5 se3.6.0-arch
 df6e045b9e7679f2a1949a57060e5c1863904444 me6.5.0-arch
 286ba6959cd0af059f245371a3afb52c1da91dee pe2.7.0-arch
+810ab1e1324ed32dbd3b4db425e590dc0e344358 se3.6.1
+3cfae8ce91201a691506971414bb254b5453c29e pe2.7.1

build.py

@@ -102,16 +102,22 @@ def build_cocoa(edition, dev):
     if not op.exists(pydep_folder):
         os.mkdir(pydep_folder)
     shutil.copy(op.join(cocoa_project_path, 'dg_cocoa.py'), 'build')
+    appscript_pkgs = ['appscript', 'aem', 'mactypes']
     specific_packages = {
         'se': ['core_se'],
-        'me': ['core_me'],
+        'me': ['core_me'] + appscript_pkgs + ['hsaudiotag'],
-        'pe': ['core_pe'],
+        'pe': ['core_pe'] + appscript_pkgs,
     }[edition]
     tocopy = ['core', 'hscommon', 'cocoa/inter', 'cocoalib/cocoa', 'jobprogress', 'objp',
         'send2trash'] + specific_packages
     copy_packages(tocopy, pydep_folder, create_links=dev)
     sys.path.insert(0, 'build')
-    collect_stdlib_dependencies('build/dg_cocoa.py', pydep_folder)
+    extra_deps = None
+    if edition == 'pe':
+        # ModuleFinder can't seem to correctly detect the multiprocessing dependency, so we have
+        # to manually specify it.
+        extra_deps=['multiprocessing']
+    collect_stdlib_dependencies('build/dg_cocoa.py', pydep_folder, extra_deps=extra_deps)
     del sys.path[0]
     # Views are not referenced by python code, so they're not found by the collector.
     copy_all('build/inter/*.so', op.join(pydep_folder, 'inter'))

core_me/__init__.py

@@ -1,2 +1,2 @@
-__version__ = '6.5.0'
+__version__ = '6.5.1'
 __appname__ = 'dupeGuru Music Edition'

core_pe/__init__.py

@@ -1,2 +1,2 @@
-__version__ = '2.7.0'
+__version__ = '2.7.1'
 __appname__ = 'dupeGuru Picture Edition'

core_pe/matchexif.py

@@ -17,7 +17,8 @@ def getmatches(files, match_scaled, j):
     timestamp2pic = defaultdict(set)
     for picture in j.iter_with_progress(files, tr("Read EXIF of %d/%d pictures")):
         timestamp = picture.exif_timestamp
-        timestamp2pic[timestamp].add(picture)
+        if timestamp:
+            timestamp2pic[timestamp].add(picture)
     if '0000:00:00 00:00:00' in timestamp2pic: # very likely false matches
         del timestamp2pic['0000:00:00 00:00:00']
     matches = []

help/changelog_me

@@ -1,3 +1,13 @@
+=== 6.5.1 (2013-05-18)
+
+* Improved "Make Selection Reference" to make it clearer. (#222)
+* Improved "Open Selected" to allow opening more than one file at once. (#142)
+* Fixed a few typos here and there. (#216 #225)
+* Tweaked the fairware dialog ([More Info](http://www.hardcoded.net/articles/phasing-out-fairware)).
+* Added Arch Linux packaging
+* Added a 64-bit build for Windows.
+* Improved Brazilian localization by Victor Figueiredo.
+
 === 6.5.0 (2012-08-10)
 
 * Added "Export to CSV". (#189)

help/changelog_pe

@@ -1,3 +1,14 @@
+=== 2.7.1 (2013-05-05)
+
+* Fixed false matching bug in EXIF matching. (#219)
+* Improved "Make Selection Reference" to make it clearer. (#222)
+* Improved "Open Selected" to allow opening more than one file at once. (#142)
+* Fixed a few typos here and there. (#216 #225)
+* Tweaked the fairware dialog ([More Info](http://www.hardcoded.net/articles/phasing-out-fairware)).
+* Added Arch Linux packaging
+* Added a 64-bit build for Windows.
+* Improved Brazilian localization by Victor Figueiredo.
+
 === 2.7.0 (2012-08-11)
 
 * Added "Export to CSV". (#189)

package.py

@@ -150,12 +150,22 @@ def package_arch(edition):
     copy_source_files(srcpath, packages)
     shutil.copy(op.join('images', ed('dg{}_logo_128.png')), srcpath)
 
+def package_source_tgz(edition):
+    app_version = get_module_version('core_{}'.format(edition))
+    name = 'dupeguru-{}-src-{}.tar.gz'.format(edition, app_version)
+    dest = op.join('build', name)
+    print_and_do('hg archive -t tgz -S {}'.format(dest))
+
 def main():
     args = parse_args()
     conf = json.load(open('conf.json'))
     edition = conf['edition']
     ui = conf['ui']
     dev = conf['dev']
+    if args.src_pkg:
+        print("Creating source package for dupeGuru {}".format(edition.upper()))
+        package_source_tgz(edition)
+        return
     print("Packaging dupeGuru {0} with UI {1}".format(edition.upper(), ui))
     if ui == 'cocoa':
         package_cocoa(edition, args)