mcvsoftware/socializer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adapted some files to changes present in renderers

Browse Source
This commit is contained in:
Manuel Cortez 2018-12-06 17:34:48 -06:00
parent d0de4ac677
commit 4a83edf3bc
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/controller/mainController.py
View File

@ -2,7 +2,6 @@
import time
import os
import wx
import utils
import widgetUtils
import messages
import buffers
@ -19,7 +18,7 @@ from pubsub import pub
from mysc.repeating_timer import RepeatingTimer
from mysc.thread_utils import call_threaded
from mysc import localization
from sessionmanager import session
from sessionmanager import session, utils
from wxUI import (mainWindow, commonMessages)
from wxUI.dialogs import search as searchDialogs
from wxUI.dialogs import timeline, creation

6
src/controller/posts.py
View File

@ -11,7 +11,6 @@ import widgetUtils
import output
import wx
import webbrowser
import utils
import logging
from sessionmanager import session # We'll use some functions from there
from sessionmanager import utils
@ -20,7 +19,6 @@ from wxUI.dialogs import postDialogs, urlList, profiles
from extra import SpellChecker, translator
from mysc.thread_utils import call_threaded
from wxUI import menus
from utils import add_attachment
log = logging.getLogger("controller.post")
@ -134,7 +132,7 @@ class postController(object):
if i["type"] == "photo":
if self.load_images == False: self.load_images = True
self.images.append(i)
attachments.append(add_attachment(i))
attachments.append(extract_attachment(i))
self.attachments.append(i)
# Links in text are not treated like normal attachments, so we'll have to catch and add those to the list without title
# We can't get a title because title is provided by the VK API and it will not work for links as simple text.
@ -144,7 +142,7 @@ class postController(object):
for i in urls:
links.append({"link": {"title": _(U"Untitled link"), "url": i}, "type": "link"})
for i in links:
attachments.append(add_attachment(i))
attachments.append(extract_attachment(i))
self.attachments.append(i)
if len(self.attachments) > 0:
self.dialog.attachments.list.Enable(True)

2
src/controller/profiles.py
View File

@ -9,8 +9,8 @@ import languageHandler
import widgetUtils
import output
import wx
import utils
from wxUI.dialogs import urlList, profiles
from sessionmanager import utils
log = logging.getLogger("controller.profiles")

4
src/sessionmanager/utils.py
View File

@ -4,7 +4,7 @@ import os
import requests
import re
import logging
from sessionmanager import session
from sessionmanager import renderers
log = logging.getLogger("utils")
url_re = re.compile("(?:\w+://|www\.)[^ ,.?!#%=+][^ ]*")
bad_chars = '\'\\.,[](){}:;"'
@ -76,7 +76,7 @@ def add_attachment(attachment):
msg = u"{0}".format(attachment["video"]["title"],)
tpe = _(u"Video")
elif attachment["type"] == "audio":
msg = u"{0}".format(" ".join(session.compose_audio(attachment["audio"])))
msg = u"{0}".format(" ".join(session.render_audio(attachment["audio"])))
tpe = _(u"Audio")
elif attachment["type"] == "doc":
if attachment["doc"].has_key("preview") and attachment["doc"]["preview"].has_key("audio_msg"):