Skip to content

Commit

Permalink
Merge branch 'feature/clean-up'
Browse files Browse the repository at this point in the history
  • Loading branch information
nomad2k committed Dec 10, 2014
2 parents 27e2f5f + b9a7098 commit c7c2d9c
Show file tree
Hide file tree
Showing 24 changed files with 246 additions and 236 deletions.
41 changes: 25 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,39 +1,49 @@
WiMM - Web Interface Media Manager
====
![wimm-logo-text](https://github.com/slash2009/XWMM/blob/master/resources/images/wimm-text-black-simple-no_bg.png)

WiMM is a cross platform tool to manage the Kodi Media Databases. It is completely web based, so you don't need to install anything on your workstation to manage your media.
### Web Interface Media Manager for Kodi

WIMM is a cross platform tool to manage the Kodi Media Databases. It is completely web based, so you don't need to install anything on your workstation to manage your media.

This tool is intended to facilitate the use of the Kodi media management features (media infos, media categorization, scraping, etc ...)

#### Useful Links
* [Releases](https://github.com/slash2009/XWMM/releases "Grab the very latest WiMM release")
* [Releases](https://github.com/slash2009/XWMM/releases "Grab the very latest WIMM release")
* [Support and discussion thread](http://forum.kodi.tv/showthread.php?tid=188839 "Support and discussion forum thread")
* [Report an issue or make feature request](https://github.com/slash2009/XWMM/issues "Report an issue Report an issue or make feature request")
* [F.A.Q. - <b>F</b>requently <b>A</b>sked <b>Q</b>uestions](https://github.com/slash2009/XWMM/wiki/F.A.Q.-Frequently-asked-questions "F.A.Q. - Frequently Asked Questions")
* [WiMM wiki](https://github.com/slash2009/XWMM/wiki "WiMM Wiki open to you!")
* [WIMM wiki](https://github.com/slash2009/XWMM/wiki "WIMM Wiki open to you!")
* [##wimm] (https://webchat.freenode.net/?channels=##wimm "click here to join ##wimm via webchat") official channel via freenode IRC.

- - -

### DEVELOPERS NEEDED - We don't pay either hehe ;)
Please join WiMM project, help this Kodi web-interface be nr#1, skilled developers are needed to help improve and fix or add exciting new features to WiMM.
#### DEVELOPERS NEEDED - We don't pay either hehe ;)
Consider joining the **WIMM** project, and help this web-interface for Kodi be **nr #1**, skilled developers are needed to help improve and fix or add exciting new features to WIMM.

- - -

### Installation Instructions

- Install WiMM:
- Download [WiMM](https://github.com/slash2009/XWMM/releases)
- Install WIMM:
- Download [WIMM](https://github.com/slash2009/XWMM/releases)
- Go to System > Add-ons
- Select **[Install from a zip file](http://kodi.wiki/view/HOW-TO:Install_an_Add-on_from_a_zip_file "HOW-TO:Install an Add-on from a zip file")**

#### WIMM **auto-updates**

From version 4.1.10 a **repo** has been added, the addon will self update once a release is made within 6 hours or less.

- Installing from WIMM repository
Go to System > Add-ons > WIMM
Select Web interfaces > WIMM

- Enable web interface:
- Go to System > Services > Webserver > Services
- Enable **Allow control Kodi via HTTP**
- Set **Web Interface** to WiMM *(optional)*
- Set **Web Interface** to WIMM *(optional)*

- Access WiMM:
- If you made WiMM the default web interface open your browser to http://*WiMM_ip*:*port*/
- Otherwise open your browser to http://*WiMM_ip*:*port*/addons/webinterface.WiMM/
- Access WIMM:
- If you made WIMM the default web interface open your browser to http://*WIMM_ip*:*port*/
- Otherwise open your browser to http://*WIMM_ip*:*port*/addons/webinterface.WIMM/

- - -

Expand All @@ -43,10 +53,9 @@ The idea is to fork this repo work on your changes and make a pull request (PR)
* What the patch addresses, if its a bug-fix a feature or improvement or something else.
* Any comments in code for what is not immediately obvious.

#### Note:
A pull request (PR) should be made to **master**, (using branches is ok if your going to make the same PR to master) by using master then your working with latest code and fixes. Any work can then be easily picked and pulled into branches if needed, especially if its a bug-fix.
:information_source: A pull request (PR) should be made to **master**, (using branches is ok if your going to make the same PR to master) by using master then your working with latest code and fixes. Any work can then be easily picked and pulled into branches if needed, especially if its a bug-fix.

#### What will happen to patches & PRs
#### What will happen to patches & PR's
* Subject to review and is merged as soon as possible by a member of the project.

- - -
33 changes: 17 additions & 16 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
[B]WIMM Change log[/B]
# WIMM Change log

4.1.14
- Fix music genre field not being split correctly (Issue #120)
- Rename minor id fields now correctly show WIMM

4.1.13
- Allow semi-colon (;) to be used as a list delimiter
Expand Down Expand Up @@ -38,7 +39,7 @@
- Clear episode details when show or season is changed. (Issue #105)
- Collapse extra details panels. (Issue #99)

[B]XWMM Change log[/B]
# XWMM Change log

4.1.7
- Add option to scan/clean the library (Issue #100)
Expand Down Expand Up @@ -158,34 +159,34 @@

2.0.6
- fixes:
-- images caching (thanks to niiko)
-- load Mask display (thanks to niiko)
-- syntax error for compatibility with IE 8
- images caching (thanks to niiko)
- load Mask display (thanks to niiko)
- syntax error for compatibility with IE 8

2.0.5
- fixes:
-- changed xbmc.gui version to 3.00 for compatibility
- changed xbmc.gui version to 3.00 for compatibility

2.0.4
- Fixes:
-- set watched / unwatched
-- Movie genres management tool (add, update, delete)
-- Display movies in a set
-- Mosic artists display
- set watched / unwatched
- Movie genres management tool (add, update, delete)
- Display movies in a set
- Mosic artists display

- Added
-- imdb number movie field can now be changed
- imdb number movie field can now be changed

2.0.3
- Fixes:
-- Movie Genres updates
-- TvShow save
-- Music save
- Movie Genres updates
- TvShow save
- Music save

2.0.2
- Fixes:
-- Compatibility with XBMC Addons standards
- Compatibility with XBMC Addons standards

2.0.1
- Fixes:
-- Changed most request from http to JSON-RPC
- Changed most request from http to JSON-RPC
Binary file added resources/images/wimm-text-black-simple-no_bg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 8 additions & 8 deletions resources/js/app/common/audio.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* global Ext: false, XWMM: false */
/* global Ext: false, WIMM: false */
/*
* Copyright 2014 Andrew Fyfe.
*
Expand All @@ -18,39 +18,39 @@
* along with WIMM. If not, see <http://www.gnu.org/licenses/>.
*/

Ext.ns('XWMM.audio');
Ext.ns('WIMM.audio');

(function() {

/**
* Cleans the audio library from non-existent items.
*/
XWMM.audio.cleanLibrary = function() {
WIMM.audio.cleanLibrary = function() {
var request = {
jsonrpc: '2.0',
method: 'AudioLibrary.Clean',
id: 'XWMM'
id: 'WIMM'
};

xbmcJsonRPC(request);
kodiJsonRPC(request);
};

/**
* Scans the audio sources for new library items.
* @param {string} directory Scan a specific directory.
*/
XWMM.audio.scanLibrary = function(directory) {
WIMM.audio.scanLibrary = function(directory) {
var request = {
jsonrpc: '2.0',
method: 'AudioLibrary.Scan',
id: 'XWMM'
id: 'WIMM'
};

if (directory !== undefined) {
request.params = { directory: directory };
}

xbmcJsonRPC(request);
kodiJsonRPC(request);
};

})();
24 changes: 12 additions & 12 deletions resources/js/app/common/ext.ux.xbmc.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* along with WIMM. If not, see <http://www.gnu.org/licenses/>.
*/

function xbmcJsonRPC(params) {
function kodiJsonRPC(params) {
var result;

if (typeof(params) === 'object') {
Expand Down Expand Up @@ -58,24 +58,24 @@ function xbmcJsonRPC(params) {
return result;
}

// Name space for XBMC objects
// Name space for kodi objects

Ext.namespace('Ext.ux');

/**
* Ext.ux.XbmcImages Extension Class
* Ext.ux.KodiImages Extension Class
* @author slash
* @version 1.0
* @class Ext.ux.XbmcImages
* @class Ext.ux.KodiImages
* @extends Ext.Container
* @constructor
*/

Ext.ux.XbmcImages = function(config) {
Ext.ux.XbmcImages.superclass.constructor.call(this, config);
Ext.ux.KodiImages = function(config) {
Ext.ux.KodiImages.superclass.constructor.call(this, config);
};

Ext.extend(Ext.ux.XbmcImages, Ext.Container, {
Ext.extend(Ext.ux.KodiImages, Ext.Container, {
// refresh image
refreshMe: function() {
this.el.dom.src = this.el.dom.src + '?dc=' + new Date().getTime();
Expand All @@ -92,19 +92,19 @@ Ext.extend(Ext.ux.XbmcImages, Ext.Container, {
});

/**
* Ext.ux.XbmcStars Extension Class
* Ext.ux.KodiStars Extension Class
* @author slash
* @version 1.0
* @class Ext.ux.XbmcStars
* @class Ext.ux.KodiStars
* @extends Ext.Container
* @constructor
*/

Ext.ux.XbmcStars = function(config) {
Ext.ux.XbmcStars.superclass.constructor.call(this, config);
Ext.ux.KodiStars = function(config) {
Ext.ux.KodiStars.superclass.constructor.call(this, config);
};

Ext.extend(Ext.ux.XbmcStars, Ext.Container, {
Ext.extend(Ext.ux.KodiStars, Ext.Container, {
border: 0,
autoEl: {tag: 'img', src: '../resources/images/stars/0.png'},
updateSrc: function(r) {
Expand Down
Loading

0 comments on commit c7c2d9c

Please sign in to comment.