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:
@@ -8,13 +8,13 @@
|
||||
import objc
|
||||
from AppKit import *
|
||||
|
||||
from dupeguru_me.app_cocoa import DupeGuruME
|
||||
from dupeguru.scanner import (SCAN_TYPE_FILENAME, SCAN_TYPE_FIELDS, SCAN_TYPE_FIELDS_NO_ORDER,
|
||||
from core_me.app_cocoa import DupeGuruME
|
||||
from core.scanner import (SCAN_TYPE_FILENAME, SCAN_TYPE_FIELDS, SCAN_TYPE_FIELDS_NO_ORDER,
|
||||
SCAN_TYPE_TAG, SCAN_TYPE_CONTENT, SCAN_TYPE_CONTENT_AUDIO)
|
||||
|
||||
# Fix py2app imports which chokes on relative imports
|
||||
from dupeguru_me import app_cocoa, data, fs, scanner
|
||||
from dupeguru import app, app_cocoa, data, directories, engine, export, ignore, results, scanner, fs
|
||||
from core_me import app_cocoa, data, fs, scanner
|
||||
from core import app, app_cocoa, data, directories, engine, export, ignore, results, scanner, fs
|
||||
from hsmedia import aiff, flac, genres, id3v1, id3v2, mp4, mpeg, ogg, wma
|
||||
from hsutil import conflict
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@ import time
|
||||
|
||||
from hsutil.cocoa import as_fetch
|
||||
|
||||
from dupeguru.app_cocoa import JOBID2TITLE, DupeGuru as DupeGuruBase
|
||||
from core.app_cocoa import JOBID2TITLE, DupeGuru as DupeGuruBase
|
||||
|
||||
from . import data, scanner, fs
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
# http://www.hardcoded.net/licenses/hs_license
|
||||
|
||||
from hsutil.str import format_time, FT_MINUTES, format_size
|
||||
from dupeguru.data import (format_path, format_timestamp, format_words, format_perc,
|
||||
from core.data import (format_path, format_timestamp, format_words, format_perc,
|
||||
format_dupe_count, cmp_value)
|
||||
|
||||
COLUMNS = [
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
from hsmedia import mpeg, wma, mp4, ogg, flac, aiff
|
||||
from hsutil.str import get_file_ext
|
||||
from dupeguru import fs
|
||||
from core import fs
|
||||
|
||||
TAG_FIELDS = ['audiosize', 'duration', 'bitrate', 'samplerate', 'title', 'artist',
|
||||
'album', 'genre', 'year', 'track', 'comment']
|
||||
|
||||
@@ -7,7 +7,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 as ScannerBase
|
||||
from core.scanner import Scanner as ScannerBase
|
||||
|
||||
class ScannerME(ScannerBase):
|
||||
@staticmethod
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
from hsutil.path import Path
|
||||
|
||||
from dupeguru.engine import getwords
|
||||
from core.engine import getwords
|
||||
from ..scanner import *
|
||||
|
||||
class NamedObject(object):
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
# which should be included with this package. The terms are also available at
|
||||
# http://www.hardcoded.net/licenses/hs_license
|
||||
|
||||
from dupeguru_me import data, scanner, fs
|
||||
from core_me import data, scanner, fs
|
||||
|
||||
from base.app import DupeGuru as DupeGuruBase
|
||||
from details_dialog import DetailsDialog
|
||||
|
||||
@@ -7,7 +7,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 (SCAN_TYPE_FILENAME, SCAN_TYPE_FIELDS, SCAN_TYPE_FIELDS_NO_ORDER,
|
||||
from core.scanner import (SCAN_TYPE_FILENAME, SCAN_TYPE_FIELDS, SCAN_TYPE_FIELDS_NO_ORDER,
|
||||
SCAN_TYPE_TAG, SCAN_TYPE_CONTENT, SCAN_TYPE_CONTENT_AUDIO)
|
||||
|
||||
from base.preferences import Preferences as PreferencesBase
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
from PyQt4.QtCore import SIGNAL, Qt
|
||||
from PyQt4.QtGui import QDialog, QDialogButtonBox
|
||||
|
||||
from dupeguru.scanner import (SCAN_TYPE_FILENAME, SCAN_TYPE_FIELDS, SCAN_TYPE_FIELDS_NO_ORDER,
|
||||
from core.scanner import (SCAN_TYPE_FILENAME, SCAN_TYPE_FIELDS, SCAN_TYPE_FIELDS_NO_ORDER,
|
||||
SCAN_TYPE_TAG, SCAN_TYPE_CONTENT, SCAN_TYPE_CONTENT_AUDIO)
|
||||
|
||||
from preferences_dialog_ui import Ui_PreferencesDialog
|
||||
|
||||
Reference in New Issue
Block a user