mirror of
https://github.com/arsenetar/dupeguru.git
synced 2026-02-04 20:31:38 +00:00
Changed dupeguru and dupeguru_* external references to core and core_* references.
--HG-- extra : convert_revision : svn%3Ac306627e-7827-47d3-bdf0-9a457c9553a1/trunk%40278
This commit is contained in:
@@ -7,11 +7,11 @@
|
||||
import objc
|
||||
from AppKit import *
|
||||
|
||||
from dupeguru_pe import app_cocoa as app_pe_cocoa
|
||||
from core_pe import app_cocoa as app_pe_cocoa
|
||||
|
||||
# Fix py2app imports which chokes on relative imports
|
||||
from dupeguru import app, app_cocoa, data, directories, engine, export, ignore, results, scanner
|
||||
from dupeguru_pe import block, cache, matchbase, data
|
||||
from core import app, app_cocoa, data, directories, engine, export, ignore, results, scanner
|
||||
from core_pe import block, cache, matchbase, data
|
||||
from hsutil import conflict
|
||||
|
||||
class PyApp(NSObject):
|
||||
|
||||
@@ -21,8 +21,8 @@ from hsutil.str import get_file_ext
|
||||
from hsutil.path import Path
|
||||
from hsutil.cocoa import as_fetch
|
||||
|
||||
from dupeguru import fs
|
||||
from dupeguru import app_cocoa, directories
|
||||
from core import fs
|
||||
from core import app_cocoa, directories
|
||||
from . import data
|
||||
from .cache import string_to_colors, Cache
|
||||
from .scanner import ScannerPE
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
# http://www.hardcoded.net/licenses/hs_license
|
||||
|
||||
from hsutil.str import format_size
|
||||
from dupeguru.data import format_path, format_timestamp, format_perc, format_dupe_count, cmp_value
|
||||
from core.data import format_path, format_timestamp, format_perc, format_dupe_count, cmp_value
|
||||
|
||||
def format_dimensions(dimensions):
|
||||
return '%d x %d' % (dimensions[0], dimensions[1])
|
||||
|
||||
@@ -15,7 +15,7 @@ from collections import defaultdict
|
||||
from hsutil import job
|
||||
from hsutil.misc import dedupe
|
||||
|
||||
from dupeguru.engine import Match
|
||||
from core.engine import Match
|
||||
from .block import avgdiff, DifferentBlockCountError, NoBlocksError
|
||||
from .cache import Cache
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
# which should be included with this package. The terms are also available at
|
||||
# http://www.hardcoded.net/licenses/hs_license
|
||||
|
||||
from dupeguru.scanner import Scanner
|
||||
from core.scanner import Scanner
|
||||
|
||||
from . import matchbase
|
||||
|
||||
|
||||
@@ -15,10 +15,10 @@ import PIL.Image
|
||||
|
||||
from hsutil.str import get_file_ext
|
||||
|
||||
from dupeguru import fs
|
||||
from dupeguru_pe import data as data_pe
|
||||
from dupeguru_pe.cache import Cache
|
||||
from dupeguru_pe.scanner import ScannerPE
|
||||
from core import fs
|
||||
from core_pe import data as data_pe
|
||||
from core_pe.cache import Cache
|
||||
from core_pe.scanner import ScannerPE
|
||||
|
||||
from block import getblocks
|
||||
from base.app import DupeGuru as DupeGuruBase
|
||||
|
||||
Reference in New Issue
Block a user