Dolda2000 GitWeb
/
automanga.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
automanga: Remove (apparently) depricated init calls.
[automanga.git]
/
manga
/
profile.py
diff --git
a/manga/profile.py
b/manga/profile.py
index
f304252
..
cc0a4a1
100644
(file)
--- a/
manga/profile.py
+++ b/
manga/profile.py
@@
-4,21
+4,28
@@
pj = os.path.join
home = os.getenv("HOME")
if home is None or not os.path.isdir(home):
raise Exception("Could not find home directory for profile keeping")
home = os.getenv("HOME")
if home is None or not os.path.isdir(home):
raise Exception("Could not find home directory for profile keeping")
-basedir = pj(home, ".manga", "profiles")
+confdir = pj(home, ".manga")
+basedir = pj(confdir, "profiles")
-class txfile(
file
):
+class txfile(
object
):
def __init__(self, name, mode):
self.realname = name
self.tempname = name + ".new"
def __init__(self, name, mode):
self.realname = name
self.tempname = name + ".new"
- s
uper(txfile, self).__init__
(self.tempname, mode)
+ s
elf.bk = open
(self.tempname, mode)
def close(self, abort=False):
def close(self, abort=False):
- s
uper(txfile, self)
.close()
+ s
elf.bk
.close()
if abort:
os.unlink(self.tempname)
else:
os.rename(self.tempname, self.realname)
if abort:
os.unlink(self.tempname)
else:
os.rename(self.tempname, self.realname)
+ def read(self, sz=-1):
+ return self.bk.read(sz)
+
+ def write(self, data):
+ return self.bk.write(data)
+
def __enter__(self):
return self
def __enter__(self):
return self
@@
-29,7
+36,7
@@
class txfile(file):
self.close(False)
def openwdir(nm, mode="r"):
self.close(False)
def openwdir(nm, mode="r"):
- ft =
file
+ ft =
open
if mode == "W":
mode = "w"
ft = txfile
if mode == "W":
mode = "w"
ft = txfile
@@
-119,7
+126,7
@@
class manga(object):
self.props = self.loadprops()
def open(self):
self.props = self.loadprops()
def open(self):
- import lib
+
from .
import lib
return lib.findlib(self.libnm).byid(self.id)
def save(self):
return lib.findlib(self.libnm).byid(self.id)
def save(self):
@@
-173,7
+180,7
@@
class tagview(object):
@staticmethod
def save(profile, m):
with profile.file("tags", "W") as fp:
@staticmethod
def save(profile, m):
with profile.file("tags", "W") as fp:
- for (libnm, id), tags in m.ite
rite
ms():
+ for (libnm, id), tags in m.items():
fp.write(consline(libnm, id, *tags) + "\n")
@staticmethod
fp.write(consline(libnm, id, *tags) + "\n")
@staticmethod
@@
-206,7
+213,7
@@
class filemanga(manga):
def save(self):
with openwdir(self.path, "W") as f:
def save(self):
with openwdir(self.path, "W") as f:
- for key, val in self.props.ite
rite
ms():
+ for key, val in self.props.items():
if isinstance(val, str):
f.write(consline("set", key, val) + "\n")
else:
if isinstance(val, str):
f.write(consline("set", key, val) + "\n")
else:
@@
-238,7
+245,7
@@
class profile(object):
def savemapping(self, seq, m):
with openwdir(pj(self.dir, "map"), "W") as f:
f.write(consline("seq", str(seq)) + "\n")
def savemapping(self, seq, m):
with openwdir(pj(self.dir, "map"), "W") as f:
f.write(consline("seq", str(seq)) + "\n")
- for (libnm, id), num in m.ite
rite
ms():
+ for (libnm, id), num in m.items():
f.write(consline("manga", libnm, id, str(num)) + "\n")
def getmanga(self, libnm, id, creat=False):
f.write(consline("manga", libnm, id, str(num)) + "\n")
def getmanga(self, libnm, id, creat=False):
@@
-249,7
+256,7
@@
class profile(object):
raise KeyError("no such manga: (%s, %s)" % (libnm, id))
while True:
try:
raise KeyError("no such manga: (%s, %s)" % (libnm, id))
while True:
try:
- fp = openwdir(pj(self.dir, "%i.manga" % seq), "
w
x")
+ fp = openwdir(pj(self.dir, "%i.manga" % seq), "x")
except IOError:
seq += 1
else:
except IOError:
seq += 1
else:
@@
-278,7
+285,7
@@
class profile(object):
def savealiases(self, map):
with openwdir(pj(self.dir, "alias"), "W") as f:
def savealiases(self, map):
with openwdir(pj(self.dir, "alias"), "W") as f:
- for nm, (libnm, id) in map.ite
rite
ms():
+ for nm, (libnm, id) in map.items():
f.write(consline("alias", nm, libnm, id) + "\n")
def file(self, name, mode="r"):
f.write(consline("alias", nm, libnm, id) + "\n")
def file(self, name, mode="r"):