arsenetar
/
dupeguru
mirror of https://github.com/arsenetar/dupeguru.git
1
0
Fork 0
Code Releases Wiki Activity

[#80 state:fixed] Removed some old references to the hsfs system.

This commit is contained in:
Virgil Dupras 2010-01-14 16:33:27 +01:00
parent 32d9b573c0
commit 28f70b281b
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core_pe/app_cocoa.py
View File

@ -11,8 +11,7 @@ import logging
import plistlib import plistlib
import re import re
from Foundation import * from AppKit import NSBundle, NSUserDefaults, NSURL
from AppKit import *
from appscript import app, k, CommandError from appscript import app, k, CommandError
from hsutil import io from hsutil import io
@ -23,7 +22,7 @@ from hsutil.cocoa import as_fetch
from core import fs from core import fs
from core import app_cocoa, directories from core import app_cocoa, directories
from . import data from . import data
from .cache import string_to_colors, Cache from .cache import string_to_colors
from .scanner import ScannerPE from .scanner import ScannerPE
mainBundle = NSBundle.mainBundle() mainBundle = NSBundle.mainBundle()
@ -74,7 +73,7 @@ def get_iphoto_database_path():
def get_iphoto_pictures(plistpath): def get_iphoto_pictures(plistpath):
if not io.exists(plistpath): if not io.exists(plistpath):
raise InvalidPath(self) return []
s = io.open(plistpath).read() s = io.open(plistpath).read()
# There was a case where a guy had 0x10 chars in his plist, causing expat errors on loading # There was a case where a guy had 0x10 chars in his plist, causing expat errors on loading
s = s.replace('\x10', '') s = s.replace('\x10', '')
@ -124,9 +123,8 @@ class Directories(directories.Directories):
def add_path(self, path): def add_path(self, path):
if path == Path('iPhoto Library'): if path == Path('iPhoto Library'):
if path in self: if path not in self:
raise AlreadyThereError() self._dirs.append(path)
self._dirs.append(path)
else: else:
directories.Directories.add_path(self, path) directories.Directories.add_path(self, path)