Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

putGlyph should not return an error message, but raise an exception #137

Merged
merged 2 commits into from
Dec 13, 2023
Merged

putGlyph should not return an error message, but raise an exception #137

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b670f8
Don't return an error string, just raise an exception
justvanrossum Dec 13, 2023
6e11b33
on error, set poll now only after unlock succeeded
justvanrossum Dec 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 46 additions & 46 deletions src/fontra_rcjk/backend_mysql.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
standardCustomDataItems,
unpackAxes,
)
from .client import HTTPError

logger = logging.getLogger(__name__)

Expand All @@ -46,6 +45,10 @@
}


class RCJKEditError(Exception):
pass


@dataclass
class RCJKGlyphInfo:
typeCode: str
Expand Down Expand Up @@ -268,7 +271,9 @@ async def putGlyph(
self._writingChanges -= 1
logger.info(f"Done writing {glyphName}")

async def _putGlyph(self, glyphName, glyph, unicodes):
async def _putGlyph(
self, glyphName: str, glyph: VariableGlyph, unicodes: list[int]
) -> None:
defaultLocation = await self.getDefaultLocation()

if glyphName not in self._rcjkGlyphInfo:
Expand All @@ -285,62 +290,57 @@ async def _putGlyph(self, glyphName, glyph, unicodes):

self._glyphMap[glyphName] = unicodes

try:
lockResponse = await self._callGlyphMethod(
glyphName, "lock", return_data=False
)
except HTTPError as error:
return f"Can't lock glyph ({error})"
lockResponse = await self._callGlyphMethod(glyphName, "lock", return_data=False)

errorMessage = None
error = False

try:
glyphTimeStamp = self._glyphTimeStamps[glyphName]
currentTimeStamp = getUpdatedTimeStamp(lockResponse["data"])
if glyphTimeStamp != currentTimeStamp:
errorMessage = "Someone else made an edit just before you."
else:
for layerName, layerGlyph in layerGlyphs.items():
xmlData = layerGlyph.asGLIFData()
existingXMLData = existingLayerData.get(layerName)
if xmlData == existingXMLData:
# There was no change in the xml data, skip the update
continue
if layerName == "foreground":
args = (glyphName, "update", xmlData)
else:
methodName = "layer_update"
if existingXMLData is None:
logger.info(f"Creating layer {layerName} of {glyphName}")
methodName = "layer_create"
args = (glyphName, methodName, layerName, xmlData)
await self._callGlyphMethod(
*args,
return_data=False,
return_layers=False,
)
for layerName in set(existingLayerData) - set(layerGlyphs):
logger.info(f"Deleting layer {layerName} of {glyphName}")
await self._callGlyphMethod(
glyphName,
"layer_delete",
layerName,
)
self._glyphCache[glyphName] = layerGlyphs
raise RCJKEditError("Someone else made an edit just before you.")

for layerName, layerGlyph in layerGlyphs.items():
xmlData = layerGlyph.asGLIFData()
existingXMLData = existingLayerData.get(layerName)
if xmlData == existingXMLData:
# There was no change in the xml data, skip the update
continue
if layerName == "foreground":
args = [glyphName, "update", xmlData]
else:
methodName = "layer_update"
if existingXMLData is None:
logger.info(f"Creating layer {layerName} of {glyphName}")
methodName = "layer_create"
args = [glyphName, methodName, layerName, xmlData]
await self._callGlyphMethod(
*args,
return_data=False,
return_layers=False,
)
for layerName in set(existingLayerData) - set(layerGlyphs):
logger.info(f"Deleting layer {layerName} of {glyphName}")
await self._callGlyphMethod(
glyphName,
"layer_delete",
layerName,
)
self._glyphCache[glyphName] = layerGlyphs
except Exception:
error = True
raise
finally:
unlockResponse = await self._callGlyphMethod(
glyphName, "unlock", return_data=False
)
if errorMessage:
if error:
asyncio.get_running_loop().call_soon(self._pollNowEvent.set)

if errorMessage is None:
timeStamp = getUpdatedTimeStamp(unlockResponse["data"])
self._glyphTimeStamps[glyphName] = timeStamp
self._rcjkGlyphInfo[glyphName].updated = timeStamp
self._writeGlyphToCacheDir(glyphName, glyph)

return errorMessage
timeStamp = getUpdatedTimeStamp(unlockResponse["data"])
self._glyphTimeStamps[glyphName] = timeStamp
self._rcjkGlyphInfo[glyphName].updated = timeStamp
self._writeGlyphToCacheDir(glyphName, glyph)

async def _newGlyph(self, glyphName: str, unicodes: list[int]) -> None:
# In _newGlyph() we create a new character glyph in the database.
Expand Down
Loading