Skip to content

Commit

Permalink
Code cleaning
Browse files Browse the repository at this point in the history
  • Loading branch information
Benoît HERVIER committed Jan 22, 2013
1 parent 2b7135e commit 61de5ea
Show file tree
Hide file tree
Showing 7 changed files with 62 additions and 73 deletions.
23 changes: 2 additions & 21 deletions khtnotes/__init__.py
View file
Expand Up @@ -115,7 +115,6 @@ def _filterNotes(self):
self._filteredNotes = self._notes

def loadData(self,):
#self._all_notes = {}
self._notes = []
self._categories = []
for root, folders, filenames in os.walk(Note.NOTESPATH):
Expand All @@ -125,22 +124,10 @@ def loadData(self,):
if category != '.merge.sync':
self._notes.extend(
[Note(uid=os.path.join(category, unicode(filename)))
for filename in filenames if filename != '.index.sync'])
for filename in filenames
if filename != '.index.sync'])
self._categories.append(category)

# self._notes = [Note(uid=filename)
# for filename in os.listdir(Note.NOTESPATH)
# if (os.path.isfile(os.path.join(Note.NOTESPATH,
# filename)))
# and (filename != '.index.sync')]
#Remove values which aren't notes
#try:
# del self._all_notes['.merge.sync']
#except KeyError:
# pass

#print self._all_notes.keys()
#self._notes = self._all_notes[self._currentCategory]
self._sortData()

def _sortData(self,):
Expand Down Expand Up @@ -221,7 +208,6 @@ def setCategory(self, idx, name):
self.endResetModel()



class KhtNotes(QApplication):
''' Application class '''
def __init__(self):
Expand All @@ -242,11 +228,6 @@ def __init__(self):
self.glw = QGLWidget(self.glformat)
self.glw.setAutoFillBackground(False)
self.view.setViewport(self.glw)
#self.view.setViewportUpdateMode(QGraphicsView.FullViewportUpdate)
#self.view.setAttribute(Qt.WA_OpaquePaintEvent)
#self.view.setAttribute(Qt.WA_NoSystemBackground)
#self.view.viewport().setAttribute(Qt.WA_OpaquePaintEvent)
#self.view.viewport().setAttribute(Qt.WA_NoSystemBackground)
else:
fullscreen = False

Expand Down
17 changes: 11 additions & 6 deletions khtnotes/note.py
View file
Expand Up @@ -198,10 +198,14 @@ def write(self, data):
#self._category,
self._uuid),
new_path)
self._uuid = os.path.join(self._category, getValidFilename(title.strip() + '.txt'))
self._uuid = os.path.join(self._category,
getValidFilename(title.strip()
+ '.txt'))

if not self._uuid:
self._uuid = os.path.join(self._category, getValidFilename(title.strip() + '.txt'))
self._uuid = os.path.join(self._category,
getValidFilename(title.strip()
+ '.txt'))

path = os.path.join(self.NOTESPATH, self._uuid)
try:
Expand Down Expand Up @@ -350,7 +354,8 @@ def _set_category(self, category):
old_uuid = self._uuid
self._category = category
self._set_uuid(new_uuid)
if not os.path.exists(os.path.join(self.NOTESPATH, self._category)):
if not os.path.exists(os.path.join(self.NOTESPATH,
self._category)):
os.mkdir(os.path.join(self.NOTESPATH, self._category))
os.rename(os.path.join(self.NOTESPATH, old_uuid),
os.path.join(self.NOTESPATH, new_uuid))
Expand Down Expand Up @@ -397,9 +402,9 @@ def _get_human_timestamp(self):
onReadyChanged = Signal()
onHumanTimestampChanged = Signal()
onFavoritedChanged = Signal()
onCategoryChanged= Signal()
onCategoryChanged = Signal()
category = Property(unicode,
_get_category,
_get_category,
_set_category,
notify=onCategoryChanged)
human_timestamp = Property(unicode, _get_human_timestamp,
Expand Down Expand Up @@ -433,4 +438,4 @@ def _get_human_timestamp(self):
' hahaha test__test__test and an other *test* '
'[link](http://khertan.net/)'
'\ntest under title\n-------\ntest'
'\n## test ##\n# test #\ntest')
'\n## test ##\n# test #\ntest')
6 changes: 3 additions & 3 deletions khtnotes/qml/Harmattan_EditPage.qml
View file
Expand Up @@ -72,7 +72,7 @@ Page {
onContentYChanged: {
if ((flick.contentY == 0) && (textEditor.cursorPosition != 0)) {
flick.ensureVisible(
textEditor.positionToRectangle(textEditor.cursorPosition));
textEditor.positionToRectangle(textEditor.cursorPosition));
}
}

Expand All @@ -87,8 +87,8 @@ Page {
font { bold: false;
family: Settings.fontFamily;
pixelSize: Settings.fontSize;}
onTextChanged: {
if(focus){
onTextChanged: {
if(focus){
modified = true;
autoTimer.restart();
}
Expand Down
2 changes: 0 additions & 2 deletions khtnotes/qml/components/AboutPage.qml
View file
Expand Up @@ -73,6 +73,4 @@ Page {
}
}
}

//Component.onCompleted: theme.inverted = true
}
3 changes: 1 addition & 2 deletions khtnotes/qml/components/ItemMenu.qml
View file
Expand Up @@ -11,7 +11,7 @@ Menu {
MenuLayout {
MenuItem {
text: qsTr("Favorite")
onClicked: {
onClicked: {
notesModel.favorite(index)
}
}
Expand All @@ -25,7 +25,6 @@ Menu {
for (;index < categories.length; index++) {
categoryQueryDialog.model.append({"name":categories[index]});
}

categoryQueryDialog.index = index;
categoryQueryDialog.open();
}
Expand Down
8 changes: 0 additions & 8 deletions khtnotes/qml/components/PageHeader.qml
View file
Expand Up @@ -35,13 +35,5 @@ Rectangle {
anchors.right: header.right
anchors.rightMargin: 10
anchors.verticalCenter: header.verticalCenter
/*onOpacityChanged:{
if ((opacity === 0.0) && (pageStack)) {
if (pageStack.currentPage.objectName === 'fileBrowserPage') {
pageStack.currentPage.refresh();
}
}
} */

}
}
76 changes: 45 additions & 31 deletions khtnotes/sync.py
View file
Expand Up @@ -61,7 +61,8 @@ def localBasename(self, path):
return os.path.relpath(path, self._localDataFolder)

def remoteBasename(self, path):
return os.path.relpath(path, os.path.join(self.webdavBasePath, self._remoteDataFolder))
return os.path.relpath(path, os.path.join(self.webdavBasePath,
self._remoteDataFolder))

@Slot()
def launch(self):
Expand Down Expand Up @@ -210,10 +211,16 @@ def _sync_files(self, webdavConnection, time_delta, useAutoMerge):
else:
#Else we have a conflict local file is newer than
#deleted one
self.logger.debug('Delete conflictServer: %s : %s >= %s'
self.logger.debug('Delete conflictServer: '
'%s : %s >= %s'
% (filename,
int(local2utc(lastsync_remote_filenames[filename]) - time_delta),
int(local_filenames[filename])))
int(
local2utc(
lastsync_remote_filenames
[filename]) - time_delta),
int(
local_filenames
[filename])))
self._upload(webdavConnection, filename,
None, time_delta)

Expand Down Expand Up @@ -260,21 +267,18 @@ def _sync_files(self, webdavConnection, time_delta, useAutoMerge):

#What to do with file not really new
#but not really deleted
for filename in set(local_filenames).intersection(lastsync_local_filenames) \
- set(remote_filenames).union(lastsync_remote_filenames):
for filename in set(local_filenames)\
.intersection(lastsync_local_filenames) \
- set(remote_filenames) \
.union(lastsync_remote_filenames):
self._upload(webdavConnection, filename,
None, time_delta)
print 'Uhuh ? ', filename, \
' local_filename:', filename in local_filenames, \
' lastsync_local_filenames:', filename in lastsync_local_filenames, \
' remote_filenames:', filename in remote_filenames, \
' lastsync_remote_filenames:', filename in lastsync_remote_filenames

for filename in set(remote_filenames).intersection(lastsync_remote_filenames) \
for filename in set(remote_filenames) \
.intersection(lastsync_remote_filenames) \
- set(local_filenames).union(lastsync_local_filenames):
self._download(webdavConnection, filename,
None, time_delta)
print 'Uhuh 2 ? ', filename

#Check what's updated remotly
rupdated = [filename for filename
Expand All @@ -294,13 +298,15 @@ def _sync_files(self, webdavConnection, time_delta, useAutoMerge):
self._upload(webdavConnection, filename,
None, time_delta)
for filename in set(lupdated).intersection(rupdated):
if int(local2utc(remote_filenames[filename]) - time_delta) \
if int(local2utc(remote_filenames[filename])
- time_delta) \
> int(local_filenames[filename]):
self.logger.debug(
'Updated conflictLocal: %s' % filename)
self._conflictLocal(webdavConnection, filename,
time_delta, useAutoMerge)
elif int(local2utc(remote_filenames[filename]) - time_delta) \
elif int(local2utc(remote_filenames[filename])
- time_delta) \
< int(local_filenames[filename]):
self.logger.debug('Updated conflictServer: %s'
% filename)
Expand Down Expand Up @@ -459,15 +465,18 @@ def _upload(self, webdavConnection, local_filename,
remote_filename = local_filename
self.logger.debug('Upload %s to %s' %
(local_filename, remote_filename))
rdirname, rfilename = os.path.dirname(remote_filename), os.path.basename(remote_filename)
rdirname, rfilename = (os.path.dirname(remote_filename),
os.path.basename(remote_filename))
print rdirname, rfilename
webdavConnection.path = webdavPathJoin(self._get_notes_path(), rdirname, '')
webdavConnection.path = webdavPathJoin(self._get_notes_path(),
rdirname, '')
try:
webdavConnection.validate()
except WebdavError, err:
webdavConnection.path = webdavPathJoin(self._get_notes_path())
webdavConnection.addCollection(rdirname)
webdavConnection.path = webdavPathJoin(self._get_notes_path(), rdirname, '')
webdavConnection.path = webdavPathJoin(self._get_notes_path(),
rdirname, '')

print webdavConnection.path
resource = webdavConnection.addResource(rfilename)
Expand All @@ -479,25 +488,29 @@ def _upload(self, webdavConnection, local_filename,
.getLastModified())) - time_delta
os.utime(lpath, (-1, mtime))
except WebdavError, err:
self.on_error.emit('%s:%s' % (unicode(err), unicode(remote_filename)))
self.on_error.emit('%s:%s' % (unicode(err),
unicode(remote_filename)))

def _download(self, webdavConnection, remote_filename,
local_filename, time_delta):
if not local_filename:
local_filename = remote_filename
self.logger.debug('Download %s to %s' %
(remote_filename, local_filename))
rdirname, rfilename = os.path.dirname(remote_filename), os.path.basename(remote_filename)
rdirname, rfilename = (os.path.dirname(remote_filename),
os.path.basename(remote_filename))
print rdirname, rfilename
webdavConnection.path = webdavPathJoin(self._get_notes_path(), rdirname, rfilename)
webdavConnection.path = webdavPathJoin(self._get_notes_path(),
rdirname, rfilename)
print webdavConnection.path
if not os.path.exists(os.path.join(self._localDataFolder,
os.path.dirname(local_filename))):
os.makedirs(os.path.join(self._localDataFolder,
os.path.dirname(local_filename)))
lpath = os.path.join(self._localDataFolder,
os.path.dirname(local_filename),
getValidFilename(os.path.basename(local_filename)))
getValidFilename(
os.path.basename(local_filename)))
webdavConnection.downloadFile(lpath)
mtime = local2utc(time.mktime(webdavConnection
.readStandardProperties()
Expand Down Expand Up @@ -548,21 +561,20 @@ def __get_remote_filenames(self, webdavConnection, path):
webdavConnection.path = path
for resource, properties in webdavConnection.getCollectionContents():
if properties.getResourceType() != 'resource':
index.update(self.__get_remote_filenames(webdavConnection, resource.path))
index.update(self.__get_remote_filenames(webdavConnection,
resource.path))
else:
index[self.remoteBasename(resource.path)] = time.mktime(properties.getLastModified())
index[self.remoteBasename(resource.path)] = \
time.mktime(properties.getLastModified())
return index

def _get_remote_filenames(self, webdavConnection):
'''Check Remote Index'''
webdavConnection.path = self._get_notes_path()

index = self.__get_remote_filenames(webdavConnection, self._get_notes_path())
index = self.__get_remote_filenames(webdavConnection,
self._get_notes_path())

# index = dict([(unicode(self.remoteBasename(resource)),
# time.mktime(properties.getLastModified()))
# for (resource, properties)
# in webdavConnection.listResources().items()])
try:
del index['']
except KeyError:
Expand All @@ -584,8 +596,10 @@ def _get_local_filenames(self):
for root, folders, files in os.walk(self._localDataFolder):
if self.localBasename(root) != u'.merge.sync':
for filename in files:
index[self.localBasename(os.path.join(root, filename))] = round(os.path.getmtime(
os.path.join(root, filename)))
index[self.localBasename(os.path.join(root,
filename))] = \
round(os.path.getmtime(
os.path.join(root, filename)))

try:
del index['.index.sync']
Expand Down

0 comments on commit 61de5ea

Please sign in to comment.