Rezzect/syncplay
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Use Utils for filehashing/filechecking in gui.py

Browse Source
This commit is contained in:
Etoh 2013-11-02 17:14:35 +00:00
parent 9517e1b305
commit ac646a5c20
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
syncplay/ui/gui.py
View File

@ -4,8 +4,8 @@ from syncplay import utils, constants, version
import sys import sys
import time import time
import re import re
import os import os
from syncplay.utils import formatTime from syncplay.utils import formatTime, sameFilename, sameFilesize, sameFileduration
class MainWindow(QtGui.QMainWindow): class MainWindow(QtGui.QMainWindow):
def addClient(self, client): def addClient(self, client):
@ -28,9 +28,6 @@ class MainWindow(QtGui.QMainWindow):
self.newMessage(time.strftime(constants.UI_TIME_FORMAT, time.localtime()) + message + "<br />") self.newMessage(time.strftime(constants.UI_TIME_FORMAT, time.localtime()) + message + "<br />")
def showUserList(self, currentUser, rooms): def showUserList(self, currentUser, rooms):
def stripfilename(filename):
return re.sub(constants.FILENAME_STRIP_REGEX,"",filename)
self._usertreebuffer = QtGui.QStandardItemModel() self._usertreebuffer = QtGui.QStandardItemModel()
self._usertreebuffer.setColumnCount(2) self._usertreebuffer.setColumnCount(2)
self._usertreebuffer.setHorizontalHeaderLabels(("Room / User","File being played")) self._usertreebuffer.setHorizontalHeaderLabels(("Room / User","File being played"))
@ -51,10 +48,10 @@ class MainWindow(QtGui.QMainWindow):
fileitem = QtGui.QStandardItem("") fileitem = QtGui.QStandardItem("")
if (user.file): if (user.file):
fileitem = QtGui.QStandardItem(user.file['name'] + " ("+formatTime(user.file['duration'])+")") fileitem = QtGui.QStandardItem(user.file['name'] + " ("+formatTime(user.file['duration'])+")")
if (currentUser.file): if (currentUser.file):
sameName = stripfilename(user.file['name']) == stripfilename(currentUser.file['name']) sameName = sameFilename(user.file['name'], currentUser.file['name'])
sameSize = user.file['size'] == currentUser.file['size'] sameSize = sameFilesize(user.file['size'], currentUser.file['size'])
sameDuration = abs(round(user.file['duration']) - round(currentUser.file['duration'])) < constants.DIFFFERENT_DURATION_THRESHOLD sameDuration = sameFileduration(user.file['duration'], currentUser.file['duration'])
sameRoom = room == currentUser.room sameRoom = room == currentUser.room
differentName = not sameName differentName = not sameName
differentSize = not sameSize differentSize = not sameSize
@ -86,7 +83,7 @@ class MainWindow(QtGui.QMainWindow):
self.listTreeView.expandAll() self.listTreeView.expandAll()
self.listTreeView.resizeColumnToContents(0) self.listTreeView.resizeColumnToContents(0)
self.listTreeView.resizeColumnToContents(1) self.listTreeView.resizeColumnToContents(1)
def roomClicked(self, item): def roomClicked(self, item):
while(item.parent().row() != -1): while(item.parent().row() != -1):
item = item.parent() item = item.parent()