diff --git a/harbour-sailfishclub.desktop b/harbour-sailfishclub.desktop index 4858bde..fde60cb 100644 --- a/harbour-sailfishclub.desktop +++ b/harbour-sailfishclub.desktop @@ -1,11 +1,12 @@ -[X-Sailjail] -OrganizationName=club.sailfishos -ApplicationName=sailfishclub -Permissions=Pictures;Thumbnails;Audio;Internet;MediaIndexing;Sharing;WebView;Video;sailfish-browser;Notifications; - [Desktop Entry] +X-Nemo-Application-Type=silica-qt5 Type=Application Icon=harbour-sailfishclub Exec=harbour-sailfishclub Name=SailfishClub -Name[zh]=旗鱼俱乐部 \ No newline at end of file +Name[zh]=旗鱼俱乐部 + +[X-Sailjail] +OrganizationName=club.sailfishos +ApplicationName=sailfishclub +Permissions=Pictures;Thumbnails;Audio;Internet;MediaIndexing;Sharing;WebView;Video;sailfish-browser;Notifications; diff --git a/py/app.py b/py/app.py index 98727c3..2f7fd96 100644 --- a/py/app.py +++ b/py/app.py @@ -36,8 +36,6 @@ HARBOUR_APP_NAME = 'sailfishclub' OrganizationName = 'club.sailfishos' -# /home/defaultuser/.local/share/club.sailfishos/sailfishclub -# /home/defaultuser/.cache/club.sailfishos/sailfishclub HOME = os.path.expanduser('~') XDG_DATA_HOME = os.environ.get('XDG_DATA_HOME', os.path.join(HOME, '.local', 'share')) XDG_CONFIG_HOME = os.environ.get('XDG_CONFIG_HOME', os.path.join(HOME, '.config')) diff --git a/py/main.py b/py/main.py index 7d8291e..9d24019 100644 --- a/py/main.py +++ b/py/main.py @@ -20,7 +20,6 @@ console_handler.formatter = formatter logger.addHandler(console_handler) logger.setLevel(logging.DEBUG) -UnOfficalBlogURL = "https://notexists.top/api/post" savePath = os.path.join(HOME, "Pictures","SailfishClub") max_token_size = 4 # siteUrl = 'https://sailfishos.club' @@ -45,13 +44,14 @@ def validate(uid, token, username): def uploadImgQiyu(path): - domain = "https://img.qiyuos.cn" - url = '%s/upload' % (domain, ) + domain = "http://159.75.45.226" + url = '%s:8082/upload' % (domain, ) + visturl = '%s:8083' % (domain, ) try: files = {'file' : open(path, 'rb')} r = requests.post(url, files = files, timeout=5.0) # {"code":200,"msg":"","data":"logo.png"} - return "%s%s" % (domain, r.json().get("msg")) + return "%s%s" % (visturl, r.json().get("msg")) except Exception as e: logger.error(str(e)) return None diff --git a/qml/harbour-sailfishclub.qml b/qml/harbour-sailfishclub.qml index 72f7eaf..40882d7 100644 --- a/qml/harbour-sailfishclub.qml +++ b/qml/harbour-sailfishclub.qml @@ -511,7 +511,7 @@ ApplicationWindow //上传图片到niupic.com function uploadImage(path,desc){ loading = true; - call('main.uploadNiuPic',[path],function(ret){ + call('main.uploadImgQiyu',[path],function(ret){ loading = false; //替换反斜线 if(ret)ret = ret.replace(/\\/g,""); diff --git a/qml/pages/AboutPage.qml b/qml/pages/AboutPage.qml index 0fc5508..9e59bb0 100644 --- a/qml/pages/AboutPage.qml +++ b/qml/pages/AboutPage.qml @@ -36,7 +36,7 @@ Page{ Label{ id:version anchors.horizontalCenter: parent.horizontalCenter - text:qsTr("Version")+" 0.4.2" + text:qsTr("Version")+" 0.4.3" } Item{width: 1;height: Theme.paddingMedium} diff --git a/rpm/harbour-sailfishclub.spec b/rpm/harbour-sailfishclub.spec index 5827d84..68e8f37 100644 --- a/rpm/harbour-sailfishclub.spec +++ b/rpm/harbour-sailfishclub.spec @@ -14,7 +14,7 @@ Name: harbour-sailfishclub %{!?qtc_make:%define qtc_make make} %{?qtc_builddir:%define _builddir %qtc_builddir} Summary: SailfishClub client for Sailfish OS -Version: 0.4.2 +Version: 0.4.3 Release: 1 Group: Qt/Qt License: GPLv3 diff --git a/src/settings.cpp b/src/settings.cpp index 184f6e5..56793fa 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -3,7 +3,7 @@ SettingsObject::SettingsObject() { - settings = new QSettings("harbour-sailfishclub","harbour-sailfishclub"); + settings = new QSettings("club.sailfishos","sailfishclub"); } @@ -71,4 +71,4 @@ void SettingsObject::set_savetime(const QString &savetime) { QString SettingsObject::get_savetime() { return settings->value(QString("logindata/savetime"),QString("1548867120")).toString(); -} \ No newline at end of file +}