Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove stray setup. Revert create_upload_path to work with the custom path when sending to device.

Browse Source
This commit is contained in:
John Schember 2009-10-31 11:33:30 -04:00
parent 8fee80598f
commit 4cc5e18606
2 changed files with 7 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
setup/installer/osx/freeze.py
View File

@ -10,7 +10,6 @@ from setup import __version__ as VERSION, __appname__ as APPNAME, SRC, Command,
try: try:
from setuptools import setup from setuptools import setup
except: except:
setup
class setup: class setup:
pass pass

53
src/calibre/devices/usbms/device.py
View File

@ -702,52 +702,13 @@ class Device(DeviceConfig, DevicePlugin):
raise FreeSpaceError(_("There is insufficient free space on the storage card")) raise FreeSpaceError(_("There is insufficient free space on the storage card"))
return path return path
def create_upload_path(self, path, mdata, fname): def create_upload_path(self, root, mdata, ext, id):
path = os.path.abspath(path) from calibre.library.save_to_disk import config, get_components
newpath = path opts = config().parse()
extra_components = [] components = get_components(opts.template, mdata, id, opts.timefmt, 250)
components = [str(x) for x in components]
if self.SUPPORTS_SUB_DIRS and self.settings().use_subdirs: components = shorten_components_to(250 - len(root), components)
if 'tags' in mdata.keys(): filepath = '%s%s' % (os.path.join(root, *components), ext)
for tag in mdata['tags']:
if tag.startswith(_('News')):
extra_components.append('news')
c = sanitize(mdata.get('title', ''))
if c:
extra_components.append(c)
c = sanitize(mdata.get('timestamp', ''))
if c:
extra_components.append(c)
break
elif tag.startswith('/'):
for c in tag.split('/'):
c = sanitize(c)
if not c: continue
extra_components.append(c)
break
if not extra_components:
c = sanitize(mdata.get('authors', _('Unknown')))
if c:
extra_components.append(c)
c = sanitize(mdata.get('title', _('Unknown')))
if c:
extra_components.append(c)
newpath = os.path.join(newpath, c)
fname = sanitize(fname)
extra_components.append(fname)
extra_components = [str(x) for x in extra_components]
def remove_trailing_periods(x):
ans = x
while ans.endswith('.'):
ans = ans[:-1]
if not ans:
ans = 'x'
return ans
extra_components = list(map(remove_trailing_periods, extra_components))
components = shorten_components_to(250 - len(path), extra_components)
filepath = os.path.join(path, *components)
filedir = os.path.dirname(filepath) filedir = os.path.dirname(filepath)
if not self.SUPPORTS_SUB_DIRS or not self.settings().use_subdirs: if not self.SUPPORTS_SUB_DIRS or not self.settings().use_subdirs: